diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs index c1d75372d06a..7419c44bfa99 100644 --- a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs +++ b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs @@ -1560,16 +1560,5 @@ public static string TargetVaultStorageRedundancy return ResourceManager.GetString("TargetVaultStorageRedundancy", resourceCulture); } } - - /// - /// Looks up a localized string similar to container name is invalid. - /// - public static string ContainerNameIsInvalid - { - get - { - return ResourceManager.GetString("ContainerNameIsInvalid", resourceCulture); - } - } } } diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx b/src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx index 3794328ed795..5718d387f5d4 100644 --- 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. Are you sure you want to copy items to the {0} whose storage redundancy is {1} - - container name is invalid. - Target ResourceGroup is not applicable and restore will proceed as unmanaged disk restore since this is unmanaged VM diff --git a/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs index a6d10d80e7de..e9b527cc5b9f 100644 --- 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/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs b/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs index a2b038821215..7e79b79b39cf 100644 --- a/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs +++ b/src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs @@ -37,6 +37,7 @@ public class AzureWorkloadPsBackupProvider : IPsBackupProvider Dictionary ProviderData { get; set; } ServiceClientAdapter ServiceClientAdapter { get; set; } AzureWorkloadProviderHelper AzureWorkloadProviderHelper { get; set; } + /// /// Initializes the provider with the data received from the cmdlet layer /// @@ -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 index b29cf9b35c69..fbe3258bfb2d 100644 --- 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.