Merge pull request #3056 from k8s-infra-cherrypick-robot/cherry-pick-3053-to-release-1.35

[release-1.35] fix: createFolderIfNotExist does not work when using NFS protocol

Author: k8s-ci-robot

pkg/azurefile/azurefile.go

@@ -881,7 +881,13 @@ func (d *Driver) GetAccountInfo(ctx context.Context, volumeID string, secrets, r
 	}
 	if protocol == nfs && fileShareName != "" {
 		// nfs protocol does not need account key, return directly
-		return rgName, accountName, accountKey, fileShareName, diskName, subsID, tenantID, tokenFilePath, err
+		// unless createFolderIfNotExist is set with a folderName, which requires account key for data plane API
+		needAccountKey := strings.EqualFold(getValueInMap(reqContext, createFolderIfNotExistField), trueValue)
+		hasFolder := getValueInMap(reqContext, folderNameField) != ""
+		if !needAccountKey || !hasFolder {
+			return rgName, accountName, accountKey, fileShareName, diskName, subsID, tenantID, tokenFilePath, err
+		}
+		klog.V(2).Infof("NFS protocol with createFolderIfNotExist may require an account key for data plane API access")
 	}
 
 	if secretNamespace == "" {

pkg/azurefile/azurefile_test.go

@@ -810,6 +810,24 @@ func TestGetAccountInfo(t *testing.T) {
 			expectFileShareName: "test_sharename",
 			expectDiskName:      "",
 		},
+		{
+			volumeID: "uniqe-volumeid-nfs-createfolder",
+			rgName:   "vol_nfs",
+			secrets:  emptySecret,
+			reqContext: map[string]string{
+				resourceGroupField:          "vol_nfs",
+				storageAccountField:         "test_accountname",
+				shareNameField:              "test_sharename",
+				protocolField:               "nfs",
+				createFolderIfNotExistField: "true",
+				folderNameField:             "testfolder",
+			},
+			expectErr:           false,
+			err:                 nil,
+			expectAccountName:   "test_accountname",
+			expectFileShareName: "test_sharename",
+			expectDiskName:      "",
+		},
 		{
 			volumeID: "invalid_getLatestAccountKey_value##",
 			rgName:   "vol_2",
@@ -858,9 +876,10 @@ func TestGetAccountInfo(t *testing.T) {
 		mockStorageAccountsClient := mock_accountclient.NewMockInterface(ctrl)
 		d.cloud.ComputeClientFactory = mock_azclient.NewMockClientFactory(ctrl)
 		d.cloud.ComputeClientFactory.(*mock_azclient.MockClientFactory).EXPECT().GetAccountClient().Return(mockStorageAccountsClient).AnyTimes()
+		d.cloud.ComputeClientFactory.(*mock_azclient.MockClientFactory).EXPECT().GetAccountClientForSub(gomock.Any()).Return(mockStorageAccountsClient, nil).AnyTimes()
 		d.kubeClient = clientSet
 		d.cloud.Environment = &azclient.Environment{StorageEndpointSuffix: "abc"}
-		mockStorageAccountsClient.EXPECT().ListKeys(gomock.Any(), gomock.Any(), test.rgName).Return(key, nil).AnyTimes()
+		mockStorageAccountsClient.EXPECT().ListKeys(gomock.Any(), gomock.Any(), gomock.Any()).Return(key, nil).AnyTimes()
 		rgName, accountName, _, fileShareName, diskName, _, _, _, err := d.GetAccountInfo(context.Background(), test.volumeID, test.secrets, test.reqContext)
 		if test.expectErr && err == nil {
 			t.Errorf("Unexpected non-error")