Second Commit#9895,Azure#10422,#Azure#10482

Author: ThejaChoudary

src/Websites/Websites.Test/ScenarioTests/AppServicePlanTests.ps1

@@ -24,14 +24,15 @@ function Test-CreateNewAppServicePlan
 	$location = Get-Location
 	$capacity = 2
 	$skuName = "S2"
+	$tags= @{"TagKey" = "TagValue"}
 
 	try
 	{
 		#Setup
 		New-AzResourceGroup -Name $rgname -Location $location
 
 		# Test
-		$job = New-AzAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Location  $location -Tier "Standard" -WorkerSize Medium -NumberOfWorkers $capacity -AsJob
+		$job = New-AzAppServicePlan -ResourceGroupName $rgname -Name  $whpName -Location  $location -Tier "Standard" -WorkerSize Medium -NumberOfWorkers $capacity -Tags $tags -AsJob
 		$job | Wait-Job
 		$createResult = $job | Receive-Job
 
@@ -40,6 +41,8 @@ function Test-CreateNewAppServicePlan
 		Assert-AreEqual "Standard" $createResult.Sku.Tier
 		Assert-AreEqual $skuName $createResult.Sku.Name
 		Assert-AreEqual $capacity $createResult.Sku.Capacity
+		Assert-AreEqual $tags.Keys $createResult.Tags.Keys
+		Assert-AreEqual $tags.Values $createResult.Tags.Values
 
 		# Assert
 
@@ -127,7 +130,7 @@ function Test-SetAppServicePlan
 	$newWorkerSize = "Medium"
 	$newCapacity = 2
 	$newPerSiteScaling = $true;
-
+	$tags= @{"TagKey" = "TagValue"}
 
 	try
 	{
@@ -173,6 +176,12 @@ function Test-SetAppServicePlan
 		Assert-AreEqual $skuName $newresult.Sku.Name
 		Assert-AreEqual $perSiteScaling $newresult.PerSiteScaling
 
+		#Set Tags
+		$tagsResult= Set-AzAppServicePlan  -ResourceGroupName $rgname -Name $whpName -Tags $tags
+
+		# Assert
+		Assert-AreEqual $tags.Keys $tagsResult.Tags.Keys
+		Assert-AreEqual $tags.Values $tagsResult.Tags.Values
 	}
 	finally
 	{

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

@@ -1064,10 +1064,12 @@ function Test-SetWebApp
 {
 	# Setup
 	$rgname = Get-ResourceGroupName
+	$rgname1 = Get-ResourceGroupName
 	$webAppName = Get-WebsiteName
 	$location = Get-WebLocation
 	$appServicePlanName1 = Get-WebHostPlanName
 	$appServicePlanName2 = Get-WebHostPlanName
+	$appServicePlanName3 = Get-WebHostPlanName
 	$tier1 = "Shared"
 	$tier2 = "Standard"
 	$apiversion = "2015-08-01"
@@ -1159,6 +1161,39 @@ function Test-SetWebApp
 		Assert-AreEqual "" $webApp.SiteConfig.PhpVersion
 		Assert-AreEqual "1.2" $webApp.SiteConfig.MinTlsVersion
 
+		## Create two Resource Groups.
+		New-AzResourceGroup -Name $rgname -Location $location
+		New-AzResourceGroup -Name $rgname1 -Location $location
+
+		## Create the App Service Plan in $rgname.
+		$asp = New-AzAppServicePlan -Location $location -Tier Standard -NumberofWorkers 1 -WorkerSize Small -ResourceGroupName $rgname -Name $appServicePlanName3
+
+		## Create a Web App in each Resource Group.
+		$app1 = $(Get-Random)
+		$app2 = $(Get-Random)
+		New-AzWebApp -ResourceGroupName $rgname -Name $app1 -Location $location -AppServicePlan $asp.Id
+		New-AzWebApp -ResourceGroupName $rgname1 -Name $app2 -Location $location -AppServicePlan $asp.Id
+
+		## Get the two Web Apps.
+		$wa1 = Get-AzWebApp -ResourceGroupName $rgname -Name $app1
+		$wa2 = Get-AzWebApp -ResourceGroupName $rgname1 -Name $app2
+
+		## Change a setting on the first Web App (which is in the same Resource Group as the App Service Plan).
+		$currentWa1ClientAffinityEnabled=$wa1.ClientAffinityEnabled
+		$wa1.ClientAffinityEnabled = !$wa1.ClientAffinityEnabled
+		$wa1 | Set-AzWebApp
+
+		#Assert
+		Assert-AreNotEqual $currentWa1ClientAffinityEnabled $wa1.ClientAffinityEnabled
+
+		## Change a setting on the Second Web App (which is in not the same Resource Group as the App Service Plan).
+		$currentWa2ClientAffinityEnabled=$wa2.ClientAffinityEnabled
+		$wa2.ClientAffinityEnabled = !$wa2.ClientAffinityEnabled
+		$wa2 | Set-AzWebApp
+
+		#Assert
+		Assert-AreNotEqual $currentWa2ClientAffinityEnabled $wa2.ClientAffinityEnabled
+
 	}
 	finally
 	{

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AppServicePlanTests/TestCreateNewAppServicePlan.json

@@ -18,7 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-
+*Adding Tag parameter for New-AzAppServicePlan and Set-AzAppServicePlan.
+*Stop cmdlt execution if an exception is thrown when adding a custom domain to a website.
+*Adding support to perform operations for App Services not in the same resource group as the App Service Plan.
+*Adding support to set custom hostnames for WebAppSlots
 ## Version 1.6.0
 * Set-AzWebapp and Set-AzWebappSlot supports AlwaysOn, MinTls and FtpsState properties
 * Fixing issue where setting HttpsOnly along with changing AppservicePlan at the same time using the single Set-AzWebApp Command, was resetting HttpsOnly to default value

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AppServicePlanTests/TestSetAppServicePlan.json

@@ -18,6 +18,8 @@
 using Microsoft.Azure.Commands.WebApps.Utilities;
 using Microsoft.Azure.Management.WebSites.Models;
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.WebApps.Cmdlets.AppServicePlans
@@ -63,6 +65,9 @@ public class NewAzureAppServicePlanCmdlet : AppServicePlanBaseCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
 
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Tags are name/value pairs that enable you to categorize resources")]
+        public Hashtable Tags { get; set; }
+
         public override void ExecuteCmdlet()
         {
             if (HyperV.IsPresent && Tier != "PremiumContainer")
@@ -107,7 +112,8 @@ public override void ExecuteCmdlet()
                 Location = Location,
                 Sku = sku,
                 PerSiteScaling = PerSiteScaling,
-                IsXenon = HyperV.IsPresent
+                IsXenon = HyperV.IsPresent,
+                Tags = (IDictionary<string, string>)CmdletHelpers.ConvertToStringDictionary(Tags)
             };
 
             AppServicePlan retPlan = WebsitesClient.CreateOrUpdateAppServicePlan(ResourceGroupName, Name, appServicePlan, AseName, aseResourceGroupName);

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

@@ -18,6 +18,8 @@
 using System.Management.Automation;
 using System.Text.RegularExpressions;
 using Microsoft.Azure.Commands.WebApps.Models.WebApp;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.WebApps.Cmdlets.AppServicePlans
 {
@@ -49,6 +51,9 @@ public class SetAzureAppServicePlanCmdlet : AppServicePlanBaseCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
 
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Tags are name/value pairs that enable you to categorize resources")]
+        public Hashtable Tags { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -62,6 +67,7 @@ public override void ExecuteCmdlet()
                     int.TryParse(Regex.Match(AppServicePlan.Sku.Name, @"\d+").Value, out workerSizeAsNumber);
                     AppServicePlan.Sku.Name = string.IsNullOrWhiteSpace(WorkerSize) ? CmdletHelpers.GetSkuName(AppServicePlan.Sku.Tier, workerSizeAsNumber) : CmdletHelpers.GetSkuName(AppServicePlan.Sku.Tier, WorkerSize);
                     AppServicePlan.PerSiteScaling = PerSiteScaling;
+                    AppServicePlan.Tags = (IDictionary<string, string>)CmdletHelpers.ConvertToStringDictionary(Tags);
                     break;
             }
 

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

@@ -312,7 +312,7 @@ public override void ExecuteCmdlet()
                     CmdletHelpers.TryParseAppServicePlanMetadataFromResourceId(WebApp.ServerFarmId, out rg, out 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.UpdateWebApp(ResourceGroupName, location, Name, null, servicePlanName, WebApp,rg);
                     WebsitesClient.AddCustomHostNames(ResourceGroupName, location, Name, WebApp.HostNames.ToArray());
                     break;
             }

src/Websites/Websites/ChangeLog.md

@@ -97,11 +97,11 @@ public HostingEnvironmentProfile CreateHostingEnvironmentProfile(string resource
             return CmdletHelpers.CreateHostingEnvironmentProfile(WrappedWebsitesClient.SubscriptionId, resourceGroupName, aseResourceGroupName, aseName);
         }
 
-        public void UpdateWebApp(string resourceGroupName, string location, string webAppName, string slotName, string appServicePlan, Site siteEnvelope =null)
+        public void UpdateWebApp(string resourceGroupName, string location, string webAppName, string slotName, string appServicePlan, Site siteEnvelope =null, string appServicePlanRg = null)
         {
             var webSiteToUpdate = new Site()
             {
-                ServerFarmId = appServicePlan,
+                ServerFarmId = (string.IsNullOrEmpty(appServicePlanRg) && resourceGroupName != appServicePlanRg) ? appServicePlan : siteEnvelope.ServerFarmId,
                 Location = location,
                 Tags = siteEnvelope?.Tags
             };
@@ -112,7 +112,7 @@ public void UpdateWebApp(string resourceGroupName, string location, string webAp
             }
 
             // make sure the serverfarm ID is nt overwritten to the old value
-            if (appServicePlan != null)
+            if (appServicePlan != null && (string.IsNullOrEmpty(appServicePlanRg) && resourceGroupName != appServicePlanRg))
             {
                 webSiteToUpdate.ServerFarmId = appServicePlan;
             }