Merge pull request #6412 from panchagnula/sisirap-AppSettingWithIdentityFix

Set-AzureRmWebApp used with AppSettings and AssignIdentity parameters ignores the AppSettings #6294

Author: praries880

src/ResourceManager/Websites/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* `Set-AzureRmWebApp` is updated to not overwrite the AppSettings when using -AssignIdentity
+* `New-AzureRmWebAppSlot` is updated to honor AppServicePlan as an optional parameter
 
 ## Version 5.0.2
 * `New-AzureRMWebApp` is updated to use common algorithms from the Strategy library.

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebAppSlotTests.ps1

@@ -406,7 +406,7 @@ function Test-CreateNewWebAppSlot
 		Assert-AreEqual $serverFarm.Id $result.ServerFarmId
 
 		# Create deployment slot
-		$job = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName -AsJob
+		$job = New-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AsJob
 		$job | Wait-Job
 		$slot1 = $job | Receive-Job
 
@@ -528,15 +528,14 @@ function Test-SetWebAppSlot
         Assert-Null $webApp.Identity
 
 		# Change service plan & set properties
-		$job = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName2 -HttpsOnly $true -AssignIdentity $true -AsJob
+		$job = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName2 -HttpsOnly $true -AsJob
 		$job | Wait-Job
 		$slot = $job | Receive-Job
 
 		# Assert
 		Assert-AreEqual $appWithSlotName $slot.Name
 		Assert-AreEqual $serverFarm2.Id $slot.ServerFarmId
         Assert-AreEqual $true $slot.HttpsOnly
-		Assert-NotNull  $slot.Identity
 
 		# Set config properties
 		$slot.SiteConfig.HttpLoggingEnabled = $true
@@ -554,11 +553,16 @@ function Test-SetWebAppSlot
 		$appSettings = @{ "setting1" = "valueA"; "setting2" = "valueB"}
 		$connectionStrings = @{ connstring1 = @{ Type="MySql"; Value="string value 1"}; connstring2 = @{ Type = "SQLAzure"; Value="string value 2"}}
 
-		$slot = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -ConnectionStrings $connectionStrings -numberofworkers $numberOfWorkers
+		$slot = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -AssignIdentity $true
+
+        # Assert
+        Assert-NotNull  $slot.Identity
+        Assert-AreEqual ($appSettings.Keys.Count  + 1) $slot.SiteConfig.AppSettings.Count
+
+        $slot = Set-AzureRmWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -ConnectionStrings $connectionStrings -numberofworkers $numberOfWorkers
 
 		# Assert
 		Assert-AreEqual $appWithSlotName $slot.Name
-		Assert-AreEqual $appSettings.Keys.Count $slot.SiteConfig.AppSettings.Count
 		foreach($nvp in $slot.SiteConfig.AppSettings)
 		{
 			Assert-True { $appSettings.Keys -contains $nvp.Name }

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

@@ -598,15 +598,14 @@ function Test-SetWebApp
 		Assert-Null $webApp.Identity
 
 		# Change service plan & set site properties
-		$job = Set-AzureRmWebApp -ResourceGroupName $rgname -Name $webAppName -AppServicePlan $appServicePlanName2 -HttpsOnly $true -AssignIdentity $true -AsJob
+		$job = Set-AzureRmWebApp -ResourceGroupName $rgname -Name $webAppName -AppServicePlan $appServicePlanName2 -HttpsOnly $true -AsJob
 		$job | Wait-Job
 		$webApp = $job | Receive-Job
 
 		# Assert
 		Assert-AreEqual $webAppName $webApp.Name
 		Assert-AreEqual $serverFarm2.Id $webApp.ServerFarmId
 		Assert-AreEqual $true $webApp.HttpsOnly
-		Assert-NotNull  $webApp.Identity
 
 		# Set config properties
 		$webapp.SiteConfig.HttpLoggingEnabled = $true
@@ -621,21 +620,28 @@ function Test-SetWebApp
 		Assert-AreEqual $true $webApp.SiteConfig.HttpLoggingEnabled
 		Assert-AreEqual $true $webApp.SiteConfig.RequestTracingEnabled
 
-		# set app settings and connection strings
 		$appSettings = @{ "setting1" = "valueA"; "setting2" = "valueB"}
 		$connectionStrings = @{ connstring1 = @{ Type="MySql"; Value="string value 1"}; connstring2 = @{ Type = "SQLAzure"; Value="string value 2"}}
 
+        # set app settings and assign Identity
+        $webApp = Set-AzureRmWebApp -ResourceGroupName $rgname -Name $webAppName -AppSettings $appSettings -AssignIdentity $true
+
+        # Assert
+        Assert-NotNull  $webApp.Identity
+        # AssignIdentity adds an appsetting to handle enabling / disabling AssignIdentity
+        Assert-AreEqual ($appSettings.Keys.Count + 1) $webApp.SiteConfig.AppSettings.Count
+        Assert-NotNull  $webApp.Identity
+
+        # set app settings and connection strings
 		$webApp = Set-AzureRmWebApp -ResourceGroupName $rgname -Name $webAppName -AppSettings $appSettings -ConnectionStrings $connectionStrings -NumberofWorkers $capacity
 
 		# Assert
 		Assert-AreEqual $webAppName $webApp.Name
-		Assert-AreEqual $appSettings.Keys.Count $webApp.SiteConfig.AppSettings.Count
-		foreach($nvp in $webApp.SiteConfig.AppSettings)
+        foreach($nvp in $webApp.SiteConfig.AppSettings)
 		{
 			Assert-True { $appSettings.Keys -contains $nvp.Name }
 			Assert-True { $appSettings[$nvp.Name] -match $nvp.Value }
 		}
-
 		Assert-AreEqual $connectionStrings.Keys.Count $webApp.SiteConfig.ConnectionStrings.Count
 		foreach($connStringInfo in $webApp.SiteConfig.ConnectionStrings)
 		{

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestCreateNewWebAppSlot.json

@@ -90,7 +90,7 @@ public override void ExecuteCmdlet()
 
             var webApp = WebsitesClient.GetWebApp(ResourceGroupName, Name, null);
 
-            WriteObject(WebsitesClient.CreateWebApp(ResourceGroupName, Name, Slot, webApp.Location, AppServicePlan, cloningInfo, AseName, AseResourceGroupName));
+            WriteObject(WebsitesClient.CreateWebApp(ResourceGroupName, Name, Slot, webApp.Location, AppServicePlan==null?webApp.ServerFarmId : AppServicePlan, cloningInfo, AseName, AseResourceGroupName));
         }
     }
 }

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestSetWebAppSlot.json

@@ -135,6 +135,9 @@ public override void ExecuteCmdlet()
                     // Update web app configuration
                     WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, Slot, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings.ConvertToConnectionStringDictionary());
 
+                    //update reference to WebApp object after site configuration update
+                    WebApp = WebsitesClient.GetWebApp(ResourceGroupName, Name, Slot);
+
                     if (parameters.Any(p => CmdletHelpers.SiteParameters.Contains(p)))
                     {
 

src/ResourceManager/Websites/Commands.Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.WebAppSlotTests/TestWebAppSwapWithPreviewCompleteSlotSwap.json

@@ -143,6 +143,9 @@ public override void ExecuteCmdlet()
                     // Update web app configuration
                     WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings.ConvertToConnectionStringDictionary());
 
+                    //Update WebApp object after configuration update
+                    WebApp = WebsitesClient.GetWebApp(ResourceGroupName, Name, null);
+
                     if (parameters.Any(p => CmdletHelpers.SiteParameters.Contains(p)))
                     {