Merge pull request Azure#8989 from Nking92/WebAppsDisasterRecovery

Add -UseDisasterRecovery parameter to WebApps Restore cmdlets

Author: Maddie Clayton

src/Websites/Websites.Test/ScenarioTests/WebAppBackupRestoreTests.cs

@@ -31,7 +31,7 @@ public WebAppBackupRestoreTests(ITestOutputHelper output)
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -43,7 +43,7 @@ public void TestCreateNewWebAppBackup()
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -55,7 +55,7 @@ public void TestCreateNewWebAppBackupPiping()
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -67,7 +67,7 @@ public void TestGetWebAppBackup()
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -79,7 +79,7 @@ public void TestGetWebAppBackupList()
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -91,7 +91,7 @@ public void TestEditAndGetWebAppBackupConfiguration()
         }
 
 #if NETSTANDARD
-        [Fact(Skip = "Storage version out-of-date: Awaiting Storage.Management.Common")]
+        [Fact]
         [Trait(Category.RunType, Category.DesktopOnly)]
 #else
         [Fact]
@@ -116,21 +116,21 @@ public void TestRestoreWebAppSnapshot()
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-RestoreWebAppSnapshot");
         }
 
-        [Fact(Skip = "Failing test, Investigation needed")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetDeletedWebApp()
         {
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-GetDeletedWebApp");
         }
 
-        [Fact(Skip = "Needs re-recorded, Restore tests use prior webapp state on the subscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRestoreDeletedWebAppToExisting()
         {
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-RestoreDeletedWebAppToExisting");
         }
 
-        [Fact(Skip = "Failing test, Investigation needed")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRestoreDeletedWebAppToNew()
         {

src/Websites/Websites.Test/ScenarioTests/WebAppBackupRestoreTests.ps1

@@ -14,15 +14,15 @@
 
 # Snapshots require a Premium app to exist for several hours.
 # Deploy a Premium app and update these global variables to re-record the snapshots tests.
-$snapshotRgName = 'onesdksnapshots'
-$snapshotAppName = 'onesdkpremapp2'
+$snapshotRgName = 'web2'
+$snapshotAppName = 'nkprem'
 $snapshotAppSlot = 'staging'
 
 # Restoring a deleted web app requires an app to have a snapshot available.
 # Deploy a web app and wait at least an hour for a snapshot.
 # Update these global variables to re-record Test-RestoreDeletedWebApp.
-$undeleteRgName = 'ps8425'
-$undeleteAppName = 'ps1705'
+$undeleteRgName = 'nickingssltests'
+$undeleteAppName = 'nkundeletetest'
 $undeleteSlot = 'testslot'
 
 # !!! Storage keys and SAS URIs will be stored in the backup test recordings !!!
@@ -379,7 +379,7 @@ function Test-RestoreWebAppSnapshot
 	Restore-AzWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -InputObject $snapshot -Force -RecoverConfiguration
 
 	# Test restore to target slot
-	Restore-AzWebAppSnapshot $snapshotRgName $snapshotAppName $snapshotAppSlot $snapshot -RecoverConfiguration -Force
+	Restore-AzWebAppSnapshot $snapshotRgName $snapshotAppName $snapshotAppSlot $snapshot -RecoverConfiguration -UseDisasterRecovery -Force
 
 	# Test piping and background job
 	$job = $snapshot | Restore-AzWebAppSnapshot -Force -AsJob
@@ -482,7 +482,7 @@ function Test-RestoreDeletedWebAppToNew
 		New-AzAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Location  $location -Tier $tier
 		$deletedApp = Get-AzDeletedWebApp -ResourceGroupName $undeleteRgName -Name $undeleteAppName -Slot "Production"
 		# Test piping the deleted app
-		$job = $deletedApp | Restore-AzDeletedWebApp -TargetResourceGroupName $rgname -TargetAppServicePlanName $whpName -Force -AsJob
+		$job = $deletedApp | Restore-AzDeletedWebApp -TargetResourceGroupName $rgname -TargetAppServicePlanName $whpName -UseDisasterRecovery -Force -AsJob
 		$result = $job | Wait-Job
 		Assert-AreEqual "Completed" $result.State;
 

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestCreateNewWebAppBackup.json

@@ -60,6 +60,9 @@ public class RestoreAzureDeletedWebApp : WebAppBaseClientCmdLet
         [Parameter(Mandatory = false, HelpMessage = "Restore the web app's files, but do not restore the settings.")]
         public SwitchParameter RestoreContentOnly { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Use to recover a deleted app from a scale unit that is offline.")]
+        public SwitchParameter UseDisasterRecovery { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Do the restore without prompting for confirmation.")]
         public SwitchParameter Force { get; set; }
 
@@ -76,7 +79,8 @@ public override void ExecuteCmdlet()
             DeletedAppRestoreRequest restoreReq = new DeletedAppRestoreRequest()
             {
                 DeletedSiteId = deletedSiteId,
-                RecoverConfiguration = !this.RestoreContentOnly
+                RecoverConfiguration = !this.RestoreContentOnly,
+                UseDRSecondary = UseDisasterRecovery
             };
 
             Action restoreAction = () => WebsitesClient.RestoreDeletedWebApp(TargetResourceGroupName, TargetName, TargetSlot, restoreReq);

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestCreateNewWebAppBackupPiping.json

@@ -39,6 +39,9 @@ public class RestoreAzureWebAppSnapshot : WebAppOptionalSlotBaseCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Recover the web app's configuration in addition to files.", ValueFromPipelineByPropertyName = true)]
         public SwitchParameter RecoverConfiguration { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Use to recover a snapshot from a scale unit that is offline.")]
+        public SwitchParameter UseDisasterRecovery { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Allows the original web app to be overwritten without displaying a warning.", ValueFromPipelineByPropertyName = true)]
         public SwitchParameter Force { get; set; }
 
@@ -60,7 +63,8 @@ public override void ExecuteCmdlet()
                 SnapshotTime = this.InputObject.SnapshotTime.ToString("o"),
                 RecoverConfiguration = this.RecoverConfiguration,
                 IgnoreConflictingHostNames = true,
-                RecoverySource = source
+                RecoverySource = source,
+                UseDRSecondary = UseDisasterRecovery
             };
             Action recoverAction = () => WebsitesClient.RestoreSnapshot(ResourceGroupName, Name, Slot, recoveryReq);
             ConfirmAction(this.Force.IsPresent, "Web app contents will be overwritten with the contents of the snapshot.",

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestEditAndGetWebAppBackupConfiguration.json

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.Websites.dll-Help.xml
 Module Name: Az.Websites
 online version: https://docs.microsoft.com/en-us/powershell/module/az.websites/restore-azdeletedwebapp
@@ -16,14 +16,14 @@ Restores a deleted web app to a new or existing web app.
 ```
 Restore-AzDeletedWebApp [-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>]
  [-TargetResourceGroupName <String>] [-TargetName <String>] [-TargetSlot <String>]
- [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-Force] [-AsJob]
+ [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-UseDisasterRecovery] [-Force] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### FromDeletedApp
 ```
 Restore-AzDeletedWebApp [-TargetResourceGroupName <String>] [-TargetName <String>] [-TargetSlot <String>]
- [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-Force] [-AsJob]
+ [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-UseDisasterRecovery] [-Force] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-InputObject] <PSAzureDeletedWebApp> [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -229,6 +229,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UseDisasterRecovery
+Use to recover a deleted app from a scale unit that is offline.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.
 

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppBackupRestoreTests/TestEditAndGetWebAppBackupConfigurationPiping.json

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.Websites.dll-Help.xml
 Module Name: Az.Websites
 online version: https://docs.microsoft.com/en-us/powershell/module/az.websites/restore-azwebappsnapshot
@@ -14,14 +14,14 @@ Restores a web app snapshot.
 
 ### FromResourceName
 ```
-Restore-AzWebAppSnapshot [-RecoverConfiguration] [-Force] [-AsJob] [-ResourceGroupName] <String>
- [-Name] <String> [[-Slot] <String>] [-DefaultProfile <IAzureContextContainer>]
+Restore-AzWebAppSnapshot [-RecoverConfiguration] [-UseDisasterRecovery] [-Force] [-AsJob]
+ [-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>] [-DefaultProfile <IAzureContextContainer>]
  [-InputObject] <AzureWebAppSnapshot> [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### FromWebApp
 ```
-Restore-AzWebAppSnapshot [-RecoverConfiguration] [-Force] [-AsJob] [-WebApp] <PSSite>
+Restore-AzWebAppSnapshot [-RecoverConfiguration] [-UseDisasterRecovery] [-Force] [-AsJob] [-WebApp] <PSSite>
  [-DefaultProfile <IAzureContextContainer>] [-InputObject] <AzureWebAppSnapshot> [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -161,6 +161,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -UseDisasterRecovery
+Use to recover a snapshot from a scale unit that is offline.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WebApp
 The web app object