Merge pull request #5252 from panchagnula/sisirap-NickGBase-IdentitySet

Fixes#4808: Add support for Identity property on WebApps & Fixes:#5155: Add support for Https only property

Author: cormacpayne

src/ResourceManager/Websites/ChangeLog.md

@@ -22,6 +22,7 @@
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
 * Added -AsJob support for long-running Websites cmdlets. Allows selected cmdlets to run in the background and return a job to track and control progress.
      - Affected cmdlets are New-, Remove-, Add-, and Set- for WebApps, AppServicePlan and Slots
+* Added -AssignIdentity & -Httpsonly properties for SetAzureWebApp
 
 ## Version 4.0.0
 * Add support for online help

src/ResourceManager/Websites/Commands.Websites/Cmdlets/AppServicePlans/SetAzureAppServicePlan.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.WebApps.Utilities;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.WebSites.Models;
 using System.Management.Automation;
 using System.Text.RegularExpressions;
@@ -33,14 +34,14 @@ public class SetAzureAppServicePlanCmdlet : AppServicePlanBaseCmdlet
         public string AdminSiteName { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 3, Mandatory = false, HelpMessage = "The App Service plan tier. Allowed values are [Free|Shared|Basic|Standard|Premium|PremiumV2]")]
-        [ValidateSet("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", IgnoreCase = true)]
+        [PSArgumentCompleter("Free", "Shared", "Basic", "Standard", "Premium", "PremiumV2", "Isolated")]
         public string Tier { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 4, Mandatory = false, HelpMessage = "Number of Workers to be allocated.")]
         public int NumberofWorkers { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Position = 5, Mandatory = false, HelpMessage = "Size of workers to be allocated. Allowed values are [Small|Medium|Large|ExtraLarge]")]
-        [ValidateSet("Small", "Medium", "Large", "ExtraLarge", IgnoreCase = true)]
+        [PSArgumentCompleter("Small", "Medium", "Large", "ExtraLarge")]
         public string WorkerSize { get; set; }
 
         [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Whether or not to enable Per Site Scaling")]

src/ResourceManager/Websites/Commands.Websites/Cmdlets/WebApps/SetAzureWebApp.cs

@@ -96,11 +96,18 @@ public class SetAzureWebAppCmdlet : WebAppBaseCmdlet
 
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
+        
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Enable MSI on an existing azure webapp or functionapp")]
+        public SwitchParameter AssignIdentity { get; set; }
+
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Enable/disable redirecting all traffic to HTTPS on an existing azure webapp or functionapp")]
+        public SwitchParameter HttpsOnly { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
             SiteConfig siteConfig = null;
+            Site site = null;
             string location = null;
             switch (ParameterSetName)
             {
@@ -131,10 +138,40 @@ public override void ExecuteCmdlet()
                             AutoSwapSlotName = parameters.Contains("AutoSwapSlotName") ? AutoSwapSlotName : null,
                             NumberOfWorkers = parameters.Contains("NumberOfWorkers") ? NumberOfWorkers : WebApp.SiteConfig.NumberOfWorkers
                         };
+
+                        // Update web app configuration
+                        WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings.ConvertToConnectionStringDictionary());
                     }
 
-                    // Update web app configuration
-                    WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, siteConfig, AppSettings.ConvertToStringDictionary(), ConnectionStrings.ConvertToConnectionStringDictionary());
+                    if (parameters.Any(p => CmdletHelpers.SiteParameters.Contains(p)))
+                    {
+                        site = new Site
+                        {
+                            Location = location,
+                            ServerFarmId = WebApp.ServerFarmId,
+                            Identity = parameters.Contains("AssignIdentity") ? new ManagedServiceIdentity("SystemAssigned", null, null) : WebApp.Identity,
+                            HttpsOnly = parameters.Contains("HttpsOnly")
+                        };
+
+                        if (parameters.Contains("AssignIdentity"))
+                        {
+                            Dictionary<string, string> appSettings = WebApp.SiteConfig?.AppSettings?.ToDictionary(x => x.Name, x => x.Value);
+
+                            // Add or update the appsettings property
+                            appSettings["WEBSITE_DISABLE_MSI"] = (!AssignIdentity).ToString();
+                            WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, location, Name, null, WebApp.SiteConfig, appSettings, 
+                                                                     WebApp.SiteConfig.ConnectionStrings.
+                                                                        ToDictionary(nvp => nvp.Name,
+                                                                        nvp => new ConnStringValueTypePair
+                                                                        {
+                                                                            Type = nvp.Type.Value,
+                                                                            Value = nvp.ConnectionString
+                                                                        },
+                                                                        StringComparer.OrdinalIgnoreCase));
+                        }
+                        
+                        WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, WebApp.ServerFarmId, site);
+                    }
 
                     if (parameters.Contains("AppServicePlan"))
                     {

src/ResourceManager/Websites/Commands.Websites/Utilities/CmdletHelpers.cs

@@ -28,6 +28,12 @@ public static class CmdletHelpers
                 "NumberOfWorkers"
             };
 
+        public static HashSet<string> SiteParameters = new HashSet<string>
+            {
+                "HttpsOnly",
+                "AssignIdentity"
+            };
+
         private static readonly Regex AppWithSlotNameRegex = new Regex(@"^(?<siteName>[^\(]+)/(?<slotName>[^\)]+)$");
 
         private static readonly Regex WebAppResourceIdRegex =
@@ -284,8 +290,8 @@ internal static void ExtractWebAppPropertiesFromWebApp(Site webapp, out string r
 
             string webAppNameTemp, slotNameTemp;
             if (TryParseAppAndSlotNames(
-                webapp.Name, 
-                out webAppNameTemp, 
+                webapp.Name,
+                out webAppNameTemp,
                 out slotNameTemp))
             {
                 webAppName = webAppNameTemp;

src/ResourceManager/Websites/Commands.Websites/Utilities/WebsitesClient.cs

@@ -94,14 +94,19 @@ 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)
+        public void UpdateWebApp(string resourceGroupName, string location, string webAppName, string slotName, string appServicePlan, Site siteEnvelope =null)
         {
             var webSiteToUpdate = new Site()
             {
                 ServerFarmId = appServicePlan,
-                Location = location
+                Location = location,
             };
 
+            if (siteEnvelope!=null)
+            {
+                webSiteToUpdate = siteEnvelope;
+            }
+
             string qualifiedSiteName;
             if (CmdletHelpers.ShouldUseDeploymentSlot(webAppName, slotName, out qualifiedSiteName))
             {
@@ -216,7 +221,7 @@ public Site GetWebApp(string resourceGroupName, string webSiteName, string slotN
                 WrappedWebsitesClient.WebApps().GetSlot(resourceGroupName, webSiteName, slotName) :
                 WrappedWebsitesClient.WebApps().Get(resourceGroupName, webSiteName);
 
-            GetWebAppConfiguration(resourceGroupName, webSiteName, slotName, site);
+         GetWebAppConfiguration(resourceGroupName, webSiteName, slotName, site);
 
             return site;
         }

src/ResourceManager/Websites/Commands.Websites/Validations/ValidateServerFarmAttribute.cs

@@ -49,7 +49,7 @@ private void ValidateSku(SkuDescription sku)
                 throw new ValidationMetadataException("Argument 'ServerFarm.SKU.Name' must conform to format first letter of sku name and numerical value of worker size. Worker Size [Small = 1, Medium = 2, Large = 3, ExtraLarge = 4] For instance, F1 means free small workers, P3 means premium large workers. ");
             }
 
-            const string tierPattern = "^(Free|Shared|Basic|Standard|Premium)$";
+            const string tierPattern = "^(Free|Shared|Basic|Standard|Premium|Isolated)$";
             if (!Regex.IsMatch(sku.Tier, tierPattern, RegexOptions.IgnoreCase))
             {
                 throw new ValidationMetadataException("Argument 'ServerFarm.SKU.Tier' must be one of Free|Shared|Basic|Standard|Premium");
@@ -58,7 +58,7 @@ private void ValidateSku(SkuDescription sku)
             var firstLetter = string.Equals("Shared", sku.Tier, StringComparison.OrdinalIgnoreCase) ? 'D' : sku.Tier[0];
             if (char.ToUpperInvariant(firstLetter) != char.ToUpperInvariant(sku.Name[0]))
             {
-                throw new ValidationMetadataException(string.Format("Arguments 'ServerFarm.SKU.Name' and 'ServerFarm.SKU.Tier' must point to the same tier. [F = Free, D = Shared, B = Basic, S = Standard, P = Premium]. Current values: SKU.Name = {0}, SKU.Tier = {1}", sku.Name, sku.Tier));
+                throw new ValidationMetadataException(string.Format("Arguments 'ServerFarm.SKU.Name' and 'ServerFarm.SKU.Tier' must point to the same tier. [F = Free, D = Shared, B = Basic, S = Standard, P = Premium, I=Isolated]. Current values: SKU.Name = {0}, SKU.Tier = {1}", sku.Name, sku.Tier));
             }
         }
 

src/ResourceManager/Websites/Commands.Websites/help/Set-AzureRmWebApp.md

@@ -1,6 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.Websites.dll-Help.xml
-Module Name: AzureRM.WebSites
+Module Name: AzureRM.Websites
 ms.assetid: 4166119F-D26A-45A1-B040-D7B2459833D6
 online version: https://docs.microsoft.com/en-us/powershell/module/azurerm.websites/set-azurermwebapp
 schema: 2.0.0
@@ -21,16 +21,16 @@ Set-AzureRmWebApp [[-AppServicePlan] <String>] [[-DefaultDocuments] <String[]>]
  [[-ConnectionStrings] <Hashtable>]
  [[-HandlerMappings] <System.Collections.Generic.IList`1[Microsoft.Azure.Management.WebSites.Models.HandlerMapping]>]
  [[-ManagedPipelineMode] <String>] [[-WebSocketsEnabled] <Boolean>] [[-Use32BitWorkerProcess] <Boolean>]
- [[-AutoSwapSlotName] <String>] [-HostNames <String[]>] [-NumberOfWorkers <Int32>]
- [-ResourceGroupName] <String> [-Name] <String> [-AsJob]
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [[-AutoSwapSlotName] <String>] [-HostNames <String[]>] [-NumberOfWorkers <Int32>] [-AsJob] [-AssignIdentity]
+ [-HttpsOnly] [-ResourceGroupName] <String> [-Name] <String> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ### S2
 ```
 Set-AzureRmWebApp [[-Use32BitWorkerProcess] <Boolean>] [[-AutoSwapSlotName] <String>]
- [-NumberOfWorkers <Int32>] [-WebApp] <Site> [-AsJob]
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-NumberOfWorkers <Int32>] [-AsJob] [-WebApp] <Site> [-DefaultProfile <IAzureContextContainer>]
+ [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -77,6 +77,36 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AsJob
+Run cmdlet in the background
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AssignIdentity
+Enable MSI on an existing azure webapp or functionapp
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: S1
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AutoSwapSlotName
 Destination slot name for auto swap
 
@@ -197,6 +227,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -HttpsOnly
+Enable/disable redirecting all traffic to HTTPS on an existing azure webapp or functionapp
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: S1
+Aliases: 
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ManagedPipelineMode
 Managed Pipeline Mode Name
 
@@ -348,21 +393,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -AsJob
-Run cmdlet in the background
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
 

tools/AzureRM/AzureRM.psm1

@@ -1 +1 @@
-# Placeholder for script template
+# Placeholder for script template