Merge pull request #9493 from andyzhangx/IsSmbOAuthEnabled

feat: add IsSmbOAuthEnabled parameter in storage account creation

Author: andyzhangx

pkg/provider/storage/azure_storageaccount.go

@@ -77,6 +77,7 @@ type AccountOptions struct {
 	RequireInfrastructureEncryption         *bool
 	AllowSharedKeyAccess                    *bool
 	IsMultichannelEnabled                   *bool
+	IsSmbOAuthEnabled                       *bool
 	KeyName                                 *string
 	KeyVersion                              *string
 	KeyVaultURI                             *string
@@ -605,6 +606,18 @@ func (az *AccountRepo) EnsureStorageAccount(ctx context.Context, accountOptions
 			}
 		}
 
+		if accountOptions.IsSmbOAuthEnabled != nil {
+			klog.V(2).Infof("set IsSmbOAuthEnabled(%v) for storage account(%s)", *accountOptions.IsSmbOAuthEnabled, accountName)
+			if cp.Properties.AzureFilesIdentityBasedAuthentication == nil {
+				cp.Properties.AzureFilesIdentityBasedAuthentication = &armstorage.AzureFilesIdentityBasedAuthentication{
+					DirectoryServiceOptions: to.Ptr(armstorage.DirectoryServiceOptionsNone),
+				}
+			}
+			cp.Properties.AzureFilesIdentityBasedAuthentication.SmbOAuthSettings = &armstorage.SmbOAuthSettings{
+				IsSmbOAuthEnabled: accountOptions.IsSmbOAuthEnabled,
+			}
+		}
+
 		if _, rerr := storageAccountClient.Create(ctx, resourceGroup, accountName, cp); rerr != nil {
 			return "", "", fmt.Errorf("failed to create storage account %s, error: %w", accountName, rerr)
 		}

pkg/provider/storage/azure_storageaccount_test.go

@@ -423,6 +423,7 @@ func TestEnsureStorageAccount(t *testing.T) {
 		accessTier                      string
 		storageType                     Type
 		requireInfrastructureEncryption *bool
+		isSmbOAuthEnabled               *bool
 		keyVaultURL                     *string
 		sourceAccountName               string
 		accountName                     string
@@ -441,6 +442,7 @@ func TestEnsureStorageAccount(t *testing.T) {
 			storageType:                     StorageTypeBlob,
 			requireInfrastructureEncryption: ptr.To(true),
 			keyVaultURL:                     ptr.To("keyVaultURL"),
+			isSmbOAuthEnabled:               ptr.To(true),
 			resourceGroup:                   "rg",
 			accessTier:                      "AccessTierHot",
 			accountName:                     "",
@@ -565,20 +567,23 @@ func TestEnsureStorageAccount(t *testing.T) {
 			var testAccountOptions *AccountOptions
 			if test.setAccountOptions {
 				testAccountOptions = &AccountOptions{
-					ResourceGroup:             test.resourceGroup,
-					CreatePrivateEndpoint:     test.createPrivateEndpoint,
-					VNetLinkName:              test.vNetLinkName,
-					PublicNetworkAccess:       test.publicNetworkAccess,
-					Name:                      test.accountName,
-					CreateAccount:             test.createAccount,
-					SubscriptionID:            test.subscriptionID,
-					AccessTier:                test.accessTier,
-					StorageType:               test.storageType,
-					EnableBlobVersioning:      ptr.To(true),
-					SoftDeleteBlobs:           7,
-					SoftDeleteContainers:      7,
-					PickRandomMatchingAccount: test.pickRandomMatchingAccount,
-					SourceAccountName:         test.sourceAccountName,
+					ResourceGroup:                   test.resourceGroup,
+					CreatePrivateEndpoint:           test.createPrivateEndpoint,
+					VNetLinkName:                    test.vNetLinkName,
+					PublicNetworkAccess:             test.publicNetworkAccess,
+					Name:                            test.accountName,
+					CreateAccount:                   test.createAccount,
+					SubscriptionID:                  test.subscriptionID,
+					AccessTier:                      test.accessTier,
+					StorageType:                     test.storageType,
+					EnableBlobVersioning:            ptr.To(true),
+					IsSmbOAuthEnabled:               test.isSmbOAuthEnabled,
+					KeyVaultURI:                     test.keyVaultURL,
+					RequireInfrastructureEncryption: test.requireInfrastructureEncryption,
+					SoftDeleteBlobs:                 7,
+					SoftDeleteContainers:            7,
+					PickRandomMatchingAccount:       test.pickRandomMatchingAccount,
+					SourceAccountName:               test.sourceAccountName,
 				}
 			}