Skip to content

Commit 29ff833

Browse files
authored
Fixing SQL AG restore, removing the container name check (#13744)
1 parent 4b2b765 commit 29ff833

File tree

5 files changed

+3
-28
lines changed

5 files changed

+3
-28
lines changed

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,6 @@ Please contact Microsoft for further assistance.</value>
610610
<data name="TargetVaultStorageRedundancy" xml:space="preserve">
611611
<value>Are you sure you want to copy items to the {0} whose storage redundancy is {1}</value>
612612
</data>
613-
<data name="ContainerNameIsInvalid" xml:space="preserve">
614-
<value>container name is invalid.</value>
615-
</data>
616613
<data name="TargetResourcegroupNotSupported" xml:space="preserve">
617614
<value>Target ResourceGroup is not applicable and restore will proceed as unmanaged disk restore since this is unmanaged VM</value>
618615
</data>

src/RecoveryServices/RecoveryServices.Backup.Providers/AzureWorkloadProviderHelper.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,7 @@ public void ValidateSQLSchedulePolicy(CmdletModel.SchedulePolicyBase policy)
279279
// call validation
280280
policy.Validate();
281281
}
282-
283-
public void ValidateContainerName(String containerName)
284-
{
285-
if (!containerName.Contains(";"))
286-
{
287-
throw new ArgumentException(
288-
string.Format(
289-
Resources.ContainerNameIsInvalid));
290-
}
291-
}
292-
282+
293283
public void ValidateLongTermRetentionPolicy(CmdletModel.RetentionPolicyBase policy, string backupManagementType = "")
294284
{
295285
if (policy == null || policy.GetType() != typeof(CmdletModel.LongTermRetentionPolicy))

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class AzureWorkloadPsBackupProvider : IPsBackupProvider
3737
Dictionary<Enum, object> ProviderData { get; set; }
3838
ServiceClientAdapter ServiceClientAdapter { get; set; }
3939
AzureWorkloadProviderHelper AzureWorkloadProviderHelper { get; set; }
40+
4041
/// <summary>
4142
/// Initializes the provider with the data received from the cmdlet layer
4243
/// </summary>
@@ -404,9 +405,6 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
404405

405406
if (wLRecoveryConfig.RecoveryPoint.ContainerName != null && wLRecoveryConfig.FullRP == null)
406407
{
407-
// validate container name to be a full name
408-
AzureWorkloadProviderHelper.ValidateContainerName(wLRecoveryConfig.RecoveryPoint.ContainerName);
409-
410408
AzureWorkloadSQLRestoreRequest azureWorkloadSQLRestoreRequest =
411409
new AzureWorkloadSQLRestoreRequest();
412410

src/RecoveryServices/RecoveryServices/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020
## Upcoming Release
2121
* Enabled softdelete feature for SQL.
22+
* Fixing SQL AG restore, removing the container name check.
2223

2324
## Version 3.1.0
2425
* Made help text and parameter set name changes to `Restore-AzRecoveryServicesBackupItem` cmdlet.

0 commit comments

Comments
 (0)