Merge pull request #9177 from Nking92/master

Az.Websites - Improvements for disaster recovery scenario cmdlets

Author: cormacpayne

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

@@ -116,21 +116,21 @@ public void TestRestoreWebAppSnapshot()
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-RestoreWebAppSnapshot");
         }
 
-        [Fact(Skip="Get-AzDeletedWebApp returning null in recorded tests #9191")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetDeletedWebApp()
         {
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-GetDeletedWebApp");
         }
 
-        [Fact(Skip="Get-AzDeletedWebApp returning null in recorded tests #9191")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRestoreDeletedWebAppToExisting()
         {
             WebsitesController.NewInstance.RunPsTest(_logger, "Test-RestoreDeletedWebAppToExisting");
         }
 
-        [Fact(Skip="Get-AzDeletedWebApp returning null in recorded tests #9191")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRestoreDeletedWebAppToNew()
         {

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

@@ -21,8 +21,8 @@ $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 = 'nickingssltests'
-$undeleteAppName = 'nkundeletetest'
+$undeleteRgName = 'web2'
+$undeleteAppName = 'undeletesrc'
 $undeleteSlot = 'testslot'
 
 # !!! Storage keys and SAS URIs will be stored in the backup test recordings !!!
@@ -343,7 +343,7 @@ function Test-EditAndGetWebAppBackupConfigurationPiping
 function Test-GetWebAppSnapshot
 {
 	# Test named parameters
-	$snapshots = Get-AzWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName
+	$snapshots = Get-AzWebAppSnapshot -ResourceGroupName $snapshotRgName -Name $snapshotAppName -UseDisasterRecovery
 	Assert-True { $snapshots.Length -gt 0 }
 	Assert-NotNull $snapshots[0]
 	Assert-NotNull $snapshots[0].SnapshotTime

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

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Adds -UseDisasterRecovery switch parameter to Get-AzWebAppSnapshot
 
 ## Version 1.2.2
 * fixes the issue where using  Set-AzWebApp and Set-AzWebAppSlot with -WebApp property was removing the tags

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

@@ -60,10 +60,6 @@ public override void ExecuteCmdlet()
                 }
             );
 
-            // Filter out deleted sites older than 30 days.
-            // They can't be restored and eventually will not be returned by the GetDeletedSites API.
-            deletedSites = deletedSites.Where(ds => ds.DeletionTime >= DateTime.UtcNow.AddDays(-30)).OrderBy(ds => ds.DeletionTime);
-
             if (!string.IsNullOrEmpty(ResourceGroupName))
             {
 

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

@@ -21,10 +21,14 @@ namespace Microsoft.Azure.Commands.WebApps.Cmdlets.BackupRestore
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "WebAppSnapshot"), OutputType(typeof(AzureWebAppSnapshot))]
     public class GetAzureWebAppSnapshot : WebAppOptionalSlotBaseCmdlet
     {
+
+        [Parameter(Mandatory = false, HelpMessage = "Read the snapshots from a secondary scale unit.")]
+        public SwitchParameter UseDisasterRecovery { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
-            var list = WebsitesClient.GetSiteSnapshots(ResourceGroupName, Name, Slot).Select(s => {
+            var list = WebsitesClient.GetSiteSnapshots(ResourceGroupName, Name, Slot, UseDisasterRecovery.IsPresent).Select(s => {
                 return new AzureWebAppSnapshot()
                 {
                     ResourceGroupName = this.ResourceGroupName,

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

@@ -51,7 +51,7 @@ public class RestoreAzureWebAppSnapshot : WebAppOptionalSlotBaseCmdlet
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
-            var sourceApp = new PSSite(WebsitesClient.GetWebApp(InputObject.ResourceGroupName, InputObject.Name, InputObject.Slot));
+            var sourceApp = ResourcesClient.GetAppResource(InputObject.Name, InputObject.Slot);
             SnapshotRecoverySource source = new SnapshotRecoverySource()
             {
                 Location = sourceApp.Location,

src/Websites/Websites/ChangeLog.md

@@ -20,6 +20,7 @@
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Internal.Resources.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
+using Microsoft.Rest.Azure.OData;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Newtonsoft.Json;
 using System;
@@ -114,6 +115,23 @@ private void WriteError(string error)
             }
         }
 
+        /// <summary>
+        /// Gets a web app resource from the ARM cache.
+        /// </summary>
+        public GenericResource GetAppResource(string name, string slot = null)
+        {
+            ODataQuery<GenericResourceFilter> query;
+            if (string.IsNullOrEmpty(slot) || string.Equals(slot, "production", StringComparison.InvariantCultureIgnoreCase))
+            {
+                query = new ODataQuery<GenericResourceFilter>($"resourceType eq 'Microsoft.Web/sites' and name eq '{name}'");
+            }
+            else
+            {
+                query = new ODataQuery<GenericResourceFilter>($"resourceType eq 'Microsoft.Web/sites/slots' and name eq '{name}/{slot}'");
+            }
+            return ResourceManagementClient.Resources.List(query).FirstOrDefault();
+        }
+
         public DeploymentExtended ProvisionDeploymentStatus(string resourceGroup, string deploymentName, Deployment deployment)
         {
             operations = new List<DeploymentOperation>();

src/Websites/Websites/Cmdlets/BackupRestore/GetAzureDeletedWebApp.cs

@@ -735,17 +735,33 @@ public void RestoreSite(string resourceGroupName, string webSiteName, string slo
             }
         }
 
-        public IList<Snapshot> GetSiteSnapshots(string resourceGroupName, string webSiteName, string slotName)
+        public IList<Snapshot> GetSiteSnapshots(string resourceGroupName, string webSiteName, string slotName, bool useDrSecondary)
         {
             string qualifiedSiteName;
             bool useSlot = CmdletHelpers.ShouldUseDeploymentSlot(webSiteName, slotName, out qualifiedSiteName);
             if (useSlot)
             {
-                return WrappedWebsitesClient.WebApps.ListSnapshotsSlot(resourceGroupName, webSiteName, slotName).ToList();
+                if (useDrSecondary)
+                {
+                    return WrappedWebsitesClient.WebApps.ListSnapshotsFromDRSecondarySlot(resourceGroupName, webSiteName, slotName).ToList();
+
+                }
+                else
+                {
+                    return WrappedWebsitesClient.WebApps.ListSnapshotsSlot(resourceGroupName, webSiteName, slotName).ToList();
+                }
             }
             else
             {
-                return WrappedWebsitesClient.WebApps.ListSnapshots(resourceGroupName, webSiteName).ToList();
+                if (useDrSecondary)
+                {
+                    return WrappedWebsitesClient.WebApps.ListSnapshotsFromDRSecondary(resourceGroupName, webSiteName).ToList();
+
+                }
+                else
+                {
+                    return WrappedWebsitesClient.WebApps.ListSnapshots(resourceGroupName, webSiteName).ToList();
+                }
             }
         }
 

src/Websites/Websites/Cmdlets/BackupRestore/GetAzureWebAppSnapshot.cs

@@ -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/get-azwebappsnapshot
@@ -14,13 +14,14 @@ Gets the snapshots available for a web app.
 
 ### FromResourceName
 ```
-Get-AzWebAppSnapshot [-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>]
+Get-AzWebAppSnapshot [-UseDisasterRecovery] [-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>]
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### FromWebApp
 ```
-Get-AzWebAppSnapshot [-WebApp] <PSSite> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+Get-AzWebAppSnapshot [-UseDisasterRecovery] [-WebApp] <PSSite> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -97,6 +98,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -UseDisasterRecovery
+Read the snapshots from a secondary scale unit.
+
+```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