[App Service]: Added support to use Id for Restore-AzDeletedWebApp. (#12256)

* Git #11895 and #5983

* Fix for #12015- Set-AzWebAppSlot incorrectly formats serverFarmId causing Service Plan not found error

* Updated ChangeLog.md

* Fix for #12015- Set-AzWebAppSlot incorrectly formats serverFarmId causing Service Plan not found error

* fix #11862 - Added support to use Id for Restore-AzDeletedWebApp.

Author: Kotasudhakarreddy

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

@@ -27,6 +27,8 @@
 * Fixed bug to get SiteConfig when -Name is not given for Get-AzWebApp
 * Added a support to create ASP for Linux Apps
 * Added exceptions for clone across resource groups
+* Added support to perform operations for Slots not in the same resource group as the App Service Plan
+* Added support to use Id for Restore-AzDeletedWebApp.
 
 ## Version 1.9.0
 * Fixed typo on help of `Update-AzWebAppAccessRestrictionConfig`.

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

@@ -19,6 +19,7 @@ namespace Microsoft.Azure.Commands.WebApps.Cmdlets.WebApps
 {
     public class PSAzureDeletedWebApp
     {
+        public string Id { get; private set; }
         public int DeletedSiteId { get; set; }
 
         public string SubscriptionId { get; set; }
@@ -35,6 +36,7 @@ public class PSAzureDeletedWebApp
 
         public PSAzureDeletedWebApp(DeletedSite ds, string subscriptionId)
         {
+            Id = ds.Id;
             DeletedSiteId = ds.DeletedSiteId.Value;
             DeletionTime = DateTime.Parse(ds.DeletedTimestamp, System.Globalization.CultureInfo.InvariantCulture);
             SubscriptionId = subscriptionId;

src/Websites/Websites/ChangeLog.md

@@ -49,6 +49,9 @@ public class RestoreAzureDeletedWebApp : WebAppBaseClientCmdLet
         [Parameter(ParameterSetName = FromDeletedResourceNameParameterSet, Mandatory = false, HelpMessage = "The location of the deleted Azure Web App.")]
         public string Location { get; set; }
 
+        [Parameter(ParameterSetName = FromDeletedResourceNameParameterSet, Mandatory = false, HelpMessage = "The Resource ID of the deleted web app.")]
+        public string DeletedId { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "The resource group containing the new Azure Web App.")]
         public string TargetResourceGroupName { get; set; }
 
@@ -77,7 +80,7 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            string deletedSiteId = GetDeletedSiteResourceId();
+            string deletedSiteId = string.IsNullOrEmpty(DeletedId) ? GetDeletedSiteResourceId() : DeletedId;
             ResolveTargetParameters();
 
             DeletedAppRestoreRequest restoreReq = new DeletedAppRestoreRequest()

src/Websites/Websites/Cmdlets/BackupRestore/PSAzureDeletedWebApp.cs

@@ -15,16 +15,17 @@ Restores a deleted web app to a new or existing web app.
 ### FromDeletedResourceName (Default)
 ```
 Restore-AzDeletedWebApp [-ResourceGroupName] <String> [-Name] <String> [[-Slot] <String>] [-Location <String>]
- [-TargetResourceGroupName <String>] [-TargetName <String>] [-TargetSlot <String>]
+ [-DeletedId <String>] [-TargetResourceGroupName <String>] [-TargetName <String>] [-TargetSlot <String>]
  [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-UseDisasterRecovery] [-Force] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### FromDeletedApp
 ```
-Restore-AzDeletedWebApp [-TargetResourceGroupName <String>] [-TargetName <String>] [-TargetSlot <String>]
- [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-UseDisasterRecovery] [-Force] [-AsJob]
- [-DefaultProfile <IAzureContextContainer>] [-InputObject] <PSAzureDeletedWebApp> [-WhatIf] [-Confirm]
+Restore-AzDeletedWebApp [-TargetResourceGroupName <String>] [-DeletedId <String>] [-TargetName <String>] 
+ [-TargetSlot <String>] [-TargetAppServicePlanName <String>] [-RestoreContentOnly] [-UseDisasterRecovery] 
+ [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>] [-InputObject] <PSAzureDeletedWebApp> 
+ [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
@@ -49,6 +50,13 @@ Restores the Staging slot of a deleted app named ContosoApp belonging to the res
 
 ###Example 3
 ```powershell
+PS C:\> Restore-AzDeletedWebApp -ResourceGroupName Default-Web-WestUS -Name ContosoApp -DeletedId /subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Web/locations/location/deletedSites/1234 -TargetAppServicePlanName ContosoPlan
+```
+
+In case there are 2 deleted apps with same name(ContosoApp), then we get details of both the sites and restore the app named ContosoRestore with the app of our choice by calling restore with Id.
+
+###Example 4
+```powershell
 PS C:\> $deletedSite = Get-AzDeletedWebApp -ResourceGroupName Default-Web-WestUS -Name ContosoApp
 PS C:\> Restore-AzDeletedWebApp -TargetResourceGroupName Default-Web-EastUS -TargetName ContosoRestore -TargetAppServicePlanName ContosoPlan -InputObject $deletedSite[0]
 ```
@@ -87,6 +95,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DeletedId
+The Id of the deleted Azure Web App.
+
+```yaml
+Type: System.String
+Parameter Sets: FromDeletedResourceName
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Force
 Do the restore without prompting for confirmation.