Fixing SQL AG restore, removing the container name check (#13744)

Azure · Dec 16, 2020 · 29ff833 · 29ff833
1 parent 4b2b765
commit 29ff833
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 28 deletions.
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx
@@ -610,9 +610,6 @@ Please contact Microsoft for further assistance.</value>
   <data name="TargetVaultStorageRedundancy" xml:space="preserve">
     <value>Are you sure you want to copy items to the {0} whose storage redundancy is {1}</value>
   </data>
-  <data name="ContainerNameIsInvalid" xml:space="preserve">
-    <value>container name is invalid.</value>
-  </data>
   <data name="TargetResourcegroupNotSupported" xml:space="preserve">
     <value>Target ResourceGroup is not applicable and restore will proceed as unmanaged disk restore since this is unmanaged VM</value>
   </data>

diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs
@@ -279,17 +279,7 @@ public void ValidateSQLSchedulePolicy(CmdletModel.SchedulePolicyBase policy)
             // call validation
             policy.Validate();
         }
-
-        public void ValidateContainerName(String containerName)
-        {
-            if (!containerName.Contains(";"))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        Resources.ContainerNameIsInvalid));
-            }
-        }
-
+
         public void ValidateLongTermRetentionPolicy(CmdletModel.RetentionPolicyBase policy, string backupManagementType = "")
         {
             if (policy == null || policy.GetType() != typeof(CmdletModel.LongTermRetentionPolicy))

diff --git a/...veryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs b/...veryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs
@@ -37,6 +37,7 @@ public class AzureWorkloadPsBackupProvider : IPsBackupProvider
         Dictionary<Enum, object> ProviderData { get; set; }
         ServiceClientAdapter ServiceClientAdapter { get; set; }
         AzureWorkloadProviderHelper AzureWorkloadProviderHelper { get; set; }
+
         /// <summary>
         /// Initializes the provider with the data received from the cmdlet layer
         /// </summary>
@@ -404,9 +405,6 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
 
             if (wLRecoveryConfig.RecoveryPoint.ContainerName != null && wLRecoveryConfig.FullRP == null)
             {
-                // validate container name to be a full name
-                AzureWorkloadProviderHelper.ValidateContainerName(wLRecoveryConfig.RecoveryPoint.ContainerName);
-
                 AzureWorkloadSQLRestoreRequest azureWorkloadSQLRestoreRequest =
                     new AzureWorkloadSQLRestoreRequest();
 

diff --git a/src/RecoveryServices/RecoveryServices/ChangeLog.md b/src/RecoveryServices/RecoveryServices/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Enabled softdelete feature for SQL.
+* Fixing SQL AG restore, removing the container name check.
 
 ## Version 3.1.0
 * Made help text and parameter set name changes to `Restore-AzRecoveryServicesBackupItem` cmdlet.