[RecoveryServices.Backup]Added support for restoring multiple files/folders in AzureFileShare

src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs

@@ -71,7 +71,8 @@ public enum RestoreFSBackupItemParams
         SourceFileType,
         TargetStorageAccountName,
         TargetFileShareName,
-        TargetFolder
+        TargetFolder,
+        MultipleSourceFilePath
     }
     public enum RestoreWLBackupItemParams
     {

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -598,4 +598,7 @@ Please contact Microsoft for further assistance.</value>
   <data name="UnmanagedVMRestoreWarning" xml:space="preserve">
     <value>The disks of the managed VM will be restored as unmanaged since TargetResourceGroupName parameter is not provided. This will NOT leverage the instant restore functionality and hence can be significantly slow based on given storage account. To leverage instant restore, provide the TargetResourceGroupName parameter. Otherwise, provide the intent next time by passing the RestoreAsUnmanagedDisks parameter</value>
   </data>
+  <data name="AzureFileSourceFilePathRedundantException" xml:space="preserve">
+    <value>Both source file path and multiple source file paths provided. Please give only one option</value>
+  </data>
 </root>

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureFilesPsBackupProvider.cs

@@ -177,12 +177,14 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 (string)ProviderData[RestoreFSBackupItemParams.TargetFileShareName] : null;
             string targetFolder = ProviderData.ContainsKey(RestoreFSBackupItemParams.TargetFolder) ?
                 (string)ProviderData[RestoreFSBackupItemParams.TargetFolder] : null;
+            string[] multipleSourceFilePaths = ProviderData.ContainsKey(RestoreFSBackupItemParams.MultipleSourceFilePath) ?
+                (string[])ProviderData[RestoreFSBackupItemParams.MultipleSourceFilePath] : null;
 
             //validate file recovery request
-            ValidateFileRestoreRequest(sourceFilePath, sourceFileType);
+            ValidateFileRestoreRequest(sourceFilePath, sourceFileType, multipleSourceFilePaths);
 
             //validate alternate location restore request
-            ValidateLocationRestoreRequest(targetFileShareName, targetStorageAccountName);
+            ValidateLocationRestoreRequest(targetFileShareName, targetStorageAccountName, targetFolder);
 
             if (targetFileShareName != null && targetStorageAccountName != null && targetFolder == null)
             {
@@ -228,6 +230,31 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 restoreFileSpecs = new List<RestoreFileSpecs>();
                 restoreFileSpecs.Add(restoreFileSpec);
             }
+            else if(multipleSourceFilePaths != null)
+            {
+                restoreFileSpecs = new List<RestoreFileSpecs>();
+                foreach (string filepath in multipleSourceFilePaths)
+                {
+                    RestoreFileSpecs fileSpec = new RestoreFileSpecs();
+                    fileSpec.Path = filepath;
+                    fileSpec.FileSpecType = sourceFileType;
+                    restoreRequest.RestoreRequestType = RestoreRequestType.ItemLevelRestore;
+                    if(targetFolder != null)
+                    {
+                        fileSpec.TargetFolderPath = targetFolder;
+                        targetDetails = new TargetAFSRestoreInfo();
+                        targetDetails.Name = targetFileShareName;
+                        targetDetails.TargetResourceId = targetStorageAccountResource.Id;
+                        restoreRequest.RecoveryType = RecoveryType.AlternateLocation;
+                    }
+                    else
+                    {
+                        fileSpec.TargetFolderPath = null;
+                        restoreRequest.RecoveryType = RecoveryType.OriginalLocation;
+                    }
+                    restoreFileSpecs.Add(fileSpec);
+                }
+            }
             else
             {
                 restoreRequest.RestoreRequestType = RestoreRequestType.FullShareRestore;
@@ -884,19 +911,24 @@ private void ValidateAzureFilesModifyProtectionRequest(ItemBase itemBase,
             }
         }
 
-        private void ValidateFileRestoreRequest(string sourceFilePath, string sourceFileType)
+        private void ValidateFileRestoreRequest(string sourceFilePath, string sourceFileType,
+            string[] multipleSourceFilePaths)
         {
-            if (sourceFilePath == null && sourceFileType != null)
+            if (sourceFilePath == null && multipleSourceFilePaths == null && sourceFileType != null)
             {
                 throw new ArgumentException(string.Format(Resources.AzureFileSourceFilePathMissingException));
             }
             else if (sourceFilePath != null && sourceFileType == null)
             {
                 throw new ArgumentException(string.Format(Resources.AzureFileSourceFileTypeMissingException));
             }
+            else if(sourceFilePath != null && multipleSourceFilePaths != null)
+            {
+                throw new ArgumentException(string.Format(Resources.AzureFileSourceFilePathRedundantException));
+            }
         }
 
-        private void ValidateLocationRestoreRequest(string targetFileShareName, string targetStorageAccountName)
+        private void ValidateLocationRestoreRequest(string targetFileShareName, string targetStorageAccountName, string targetFolder)
         {
             if (targetFileShareName == null && targetStorageAccountName != null)
             {
@@ -906,6 +938,10 @@ private void ValidateLocationRestoreRequest(string targetFileShareName, string t
             {
                 throw new ArgumentException(string.Format(Resources.AzureFileTargetSANameMissingException));
             }
+            else if(targetFolder != null && targetFileShareName == null && targetStorageAccountName == null)
+            {
+                throw new ArgumentException(string.Format(Resources.AzureFileTargetSANameMissingException));
+            }
         }
 
         public List<PointInTimeBase> GetLogChains()

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/AzureFiles/ItemTests.ps1

@@ -24,6 +24,8 @@ $targetFileShareName = "fs1"
 $targetFolder = "pstestfolder3rty7d7s"
 $folderPath = "pstestfolder1bca8f8e"
 $filePath = "pstestfolder1bca8f8e/pstestfile1bca8f8e.txt"
+$file1 = "file1.txt"
+$file2 = "file2.txt"
 $skuName="Standard_LRS"
 $policyName = "afspolicy1"
 $newPolicyName = "NewAFSBackupPolicy"
@@ -314,6 +316,19 @@ function Test-AzureFSFullRestore
 			-ResolveConflict Overwrite `
 			-SourceFilePath $filePath } `
 			"Provide SourceFileType for File restore or remove SourceFilePath for file share restore"
+
+		# Multiple Files Restore
+		$files = ($file1, $file2)
+		$restoreJob = Restore-AzRecoveryServicesBackupItem `
+			-VaultId $vault.ID `
+			-VaultLocation $vault.Location `
+			-RecoveryPoint $recoveryPoint[0] `
+			-MultipleSourceFilePath $files `
+			-SourceFileType File `
+			-ResolveConflict Overwrite | `
+				Wait-AzRecoveryServicesBackupJob -VaultId $vault.ID
+
+		Assert-True { $restoreJob.Status -eq "Completed" }
 
 		# Test without storage account dependancy
 		# Item level restore at alternate location