Merge pull request Azure#11042 from ThejaChoudary/master

Adding support to set custom hostnames for WebAppSlots#10980

Author: VeryEarly

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

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+*Fixing issue to set custom hostnames for WebAppSlots
 
 ## Version 1.6.0
 * Set-AzWebapp and Set-AzWebappSlot supports AlwaysOn, MinTls and FtpsState properties

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

@@ -133,6 +133,10 @@ public class SetAzureWebAppSlotCmdlet : WebAppSlotBaseCmdlet
         [ValidateSet("AllAllowed", "Disabled", "FtpsOnly")]
         public string FtpsState { get; set; }
 
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Custom hostnames associated with web app slot")]
+        [ValidateNotNullOrEmpty]
+        public string[] HostNames { get; set; }
+
 
         public override void ExecuteCmdlet()
         {
@@ -260,6 +264,10 @@ public override void ExecuteCmdlet()
                         //Update WebApp object after site update
                         WebApp = new PSSite(WebsitesClient.GetWebApp(ResourceGroupName, Name, null));
                     }
+                    if (parameters.Contains("HostNames"))
+                    {
+                        WebsitesClient.AddCustomHostNames(ResourceGroupName, location, Name,HostNames, Slot);
+                    }
 
                     break;
                 case ParameterSet2Name:
@@ -298,6 +306,7 @@ public override void ExecuteCmdlet()
                     CmdletHelpers.TryParseAppServicePlanMetadataFromResourceId(WebApp.ServerFarmId, out rg, out 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);
+                    WebsitesClient.AddCustomHostNames(ResourceGroupName, location, Name, WebApp.HostNames.ToArray(), Slot);
                     break;
             }
 

src/Websites/Websites/ChangeLog.md

@@ -128,9 +128,11 @@ public void UpdateWebApp(string resourceGroupName, string location, string webAp
             }
         }
 
-        public void AddCustomHostNames(string resourceGroupName, string location, string webAppName, string[] hostNames)
+        public void AddCustomHostNames(string resourceGroupName, string location, string webAppName, string[] hostNames, string slotName=null)
         {
-            var webApp = WrappedWebsitesClient.WebApps().Get(resourceGroupName, webAppName);
+            var webApp = (slotName == null)
+                ? WrappedWebsitesClient.WebApps().Get(resourceGroupName, webAppName)
+                : GetWebApp(resourceGroupName, webAppName, slotName);
             var currentHostNames = webApp.HostNames;
 
             // Add new hostnames
@@ -140,11 +142,22 @@ public void AddCustomHostNames(string resourceGroupName, string location, string
                 {
                     if (!currentHostNames.Contains(hostName, StringComparer.OrdinalIgnoreCase))
                     {
-                        WrappedWebsitesClient.WebApps().CreateOrUpdateHostNameBinding(resourceGroupName, webAppName,
+                        if (slotName == null)
+                        {
+                            WrappedWebsitesClient.WebApps().CreateOrUpdateHostNameBinding(resourceGroupName, webAppName,
                             hostName, new HostNameBinding
                             {
                                 SiteName = webAppName,
                             });
+                        }
+                        else
+                        {
+                            WrappedWebsitesClient.WebApps().CreateOrUpdateHostNameBindingSlot(resourceGroupName, webAppName,
+                                hostName, new HostNameBinding
+                                {
+                                    SiteName = webAppName,
+                                }, slotName);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -160,7 +173,14 @@ public void AddCustomHostNames(string resourceGroupName, string location, string
                 {
                     if (!hostNames.Contains(hostName, StringComparer.OrdinalIgnoreCase))
                     {
-                        WrappedWebsitesClient.WebApps().DeleteHostNameBinding(resourceGroupName, webAppName, hostName);
+                        if (slotName == null)
+                        {
+                            WrappedWebsitesClient.WebApps().DeleteHostNameBinding(resourceGroupName, webAppName, hostName);
+                        }
+                        else
+                        {
+                            WrappedWebsitesClient.WebApps().DeleteHostNameBindingSlot(resourceGroupName, webAppName, slotName, hostName);
+                        }
                     }
                 }
                 catch (Exception e)