Merge pull request Azure#9198 from panchagnula/sisirap-Tags-Fix

webapp: Set-AzWebapp removing tags when used with -WebApp property

Author: MiYanni

src/Websites/Websites.Test/ScenarioTests/WebAppTests.ps1

@@ -1357,4 +1357,8 @@ function Test-TagsNotRemovedBySetWebApp
 
 	Assert-notNull $webApp.Tags
 	Assert-notNull $slot.Tags
+
+	# Test - tags not removed after using Set-AzWebApp with WebApp parameter
+	$webapp =  Set-AzWebApp  -WebApp $getApp
+	Assert-notNull $webApp.Tags
 }

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppTests/TestTagsNotRemovedBySetWebApp.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* fixes the issue where using  Set-AzWebApp and Set-AzWebAppSlot with -WebApp property was removing the tags
 
 ## Version 1.2.1
 * "Kind" property will now be set for PSSite objects returned by Get-AzWebApp

src/Websites/Websites/ChangeLog.md

@@ -169,7 +169,7 @@ public override void ExecuteCmdlet()
                         siteConfig = WebApp.SiteConfig;
                     }
 
-                    //According to current implementation if AppSettings paramter is provided we are overriding existing AppSettings
+                    //According to current implementation if AppSettings parameter is provided we are overriding existing AppSettings
                     if (WebApp.SiteConfig.AppSettings != null && AppSettings == null)
                     {
                         foreach (var setting in WebApp.SiteConfig.AppSettings)
@@ -278,7 +278,8 @@ public override void ExecuteCmdlet()
                                 StringComparer.OrdinalIgnoreCase));
 
                     CmdletHelpers.TryParseAppServicePlanMetadataFromResourceId(WebApp.ServerFarmId, out rg, out servicePlanName);
-                    WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, Slot, servicePlanName);
+                    WebApp.AzureStoragePath = null; // the API to update site Object doesn't have the AzureStorage Path property
+                    WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, Slot, servicePlanName, WebApp);
                     break;
             }
 

src/Websites/Websites/Cmdlets/DeploymentSlots/SetAzureWebAppSlot.cs

@@ -288,7 +288,9 @@ public override void ExecuteCmdlet()
                                                         StringComparer.OrdinalIgnoreCase));
 
                     CmdletHelpers.TryParseAppServicePlanMetadataFromResourceId(WebApp.ServerFarmId, out rg, out servicePlanName);
-                    WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, servicePlanName);
+                    // AzureStorage path is not a part of the back end siteObject, but if the PSSite Object is given as an input, we will some value for this
+                    WebApp.AzureStoragePath = null;
+                    WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, servicePlanName, WebApp);
                     WebsitesClient.AddCustomHostNames(ResourceGroupName, location, Name, WebApp.HostNames.ToArray());
                     break;
             }