Merge pull request #10867 from panchagnula/sisirap-setAzWebAppUpdates

webapp: Adding support for MinTls, AlwaysOn, FtpsState properties for an app & slot

Author: isra-fel

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

@@ -438,20 +438,24 @@ function Test-SetWebAppSlot
 		Assert-AreEqual $appWithSlotName $slot.Name
 		Assert-AreEqual $serverFarm1.Id $slot.ServerFarmId
         Assert-Null $webApp.Identity
+		Assert-AreEqual "AllAllowed" $slot.SiteConfig.FtpsState
 
-		# Change service plan & set properties
-		$job = Set-AzWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName2 -HttpsOnly $true -AsJob
+		# Change service plan & set site and SiteConfig properties
+		$job = Set-AzWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppServicePlan $planName2 -HttpsOnly $true -AlwaysOn $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-AreEqual $true $slot.SiteConfig.AlwaysOn
 
 		# Set config properties
 		$slot.SiteConfig.HttpLoggingEnabled = $true
 		$slot.SiteConfig.RequestTracingEnabled = $true
+		$slot.SiteConfig.FtpsState = "FtpsOnly"
+		$slot.SiteConfig.MinTlsVersion = "1.0"
 
 		$slot = $slot | Set-AzWebAppSlot
 
@@ -460,16 +464,19 @@ function Test-SetWebAppSlot
 		Assert-AreEqual $serverFarm2.Id $slot.ServerFarmId
 		Assert-AreEqual $true $slot.SiteConfig.HttpLoggingEnabled
 		Assert-AreEqual $true $slot.SiteConfig.RequestTracingEnabled
+		Assert-AreEqual "FtpsOnly" $slot.SiteConfig.FtpsState
+		Assert-AreEqual "1.0" $slot.SiteConfig.MinTlsVersion
 
 		# 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"}}
 
-		$slot = Set-AzWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -AssignIdentity $true
+		$slot = Set-AzWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -AssignIdentity $true -MinTlsVersion "1.2"
 
         # Assert
         Assert-NotNull  $slot.Identity
         Assert-AreEqual ($appSettings.Keys.Count) $slot.SiteConfig.AppSettings.Count
+		Assert-AreEqual "1.0" $slot.SiteConfig.MinTlsVersion
 
         $slot = Set-AzWebAppSlot -ResourceGroupName $rgname -Name $appname -Slot $slotname -AppSettings $appSettings -ConnectionStrings $connectionStrings -numberofworkers $numberOfWorkers
 
@@ -853,13 +860,13 @@ function Test-SetAzureStorageWebAppHyperVSlot
 	$azureStorageAccountName1 = "myaccountname.file.core.windows.net"
 	$azureStorageAccountShareName1 = "myremoteshare"
 	$azureStorageAccountAccessKey1 = "AnAccessKey"
-	$azureStorageAccountMountPath1 = "C:\mymountpath"
+	$azureStorageAccountMountPath1 = "\mymountpath"
 	$azureStorageAccountCustomId2 = "mystorageaccount2"
 	$azureStorageAccountType2 = "AzureFiles"
 	$azureStorageAccountName2 = "myaccountname2.file.core.windows.net"
 	$azureStorageAccountShareName2 = "myremoteshare2"
 	$azureStorageAccountAccessKey2 = "AnAccessKey2"
-	$azureStorageAccountMountPath2 = "C:\mymountpath2"
+	$azureStorageAccountMountPath2 = "\mymountpath2"
 
 	try
 	{

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

@@ -914,13 +914,13 @@ function Test-SetAzureStorageWebAppHyperV
 	$azureStorageAccountName1 = "myaccountname.file.core.windows.net"
 	$azureStorageAccountShareName1 = "myremoteshare"
 	$azureStorageAccountAccessKey1 = "AnAccessKey"
-	$azureStorageAccountMountPath1 = "C:\mymountpath"
+	$azureStorageAccountMountPath1 = "\mymountpath"
 	$azureStorageAccountCustomId2 = "mystorageaccount2"
 	$azureStorageAccountType2 = "AzureFiles"
 	$azureStorageAccountName2 = "myaccountname2.file.core.windows.net"
 	$azureStorageAccountShareName2 = "myremoteshare2"
 	$azureStorageAccountAccessKey2 = "AnAccessKey2"
-	$azureStorageAccountMountPath2 = "C:\mymountpath2"
+	$azureStorageAccountMountPath2 = "\mymountpath2"
 
 	try
 	{
@@ -1090,9 +1090,11 @@ function Test-SetWebApp
 		Assert-AreEqual $serverFarm1.Id $webApp.ServerFarmId
 		Assert-Null $webApp.Identity
 		Assert-NotNull $webApp.SiteConfig.phpVersion
+		Assert-AreEqual $false $webApp.HttpsOnly
+		Assert-AreEqual "AllAllowed" $webApp.SiteConfig.FtpsState
 
 		# Change service plan & set site properties
-		$job = Set-AzWebApp -ResourceGroupName $rgname -Name $webAppName -AppServicePlan $appServicePlanName2 -HttpsOnly $true -AsJob
+		$job = Set-AzWebApp -ResourceGroupName $rgname -Name $webAppName -AppServicePlan $appServicePlanName2 -HttpsOnly $true -AlwaysOn $false -AsJob
 		$job | Wait-Job
 		$webApp = $job | Receive-Job
 
@@ -1102,10 +1104,13 @@ function Test-SetWebApp
 		Assert-AreEqual $webAppName $webApp.Name
 		Assert-AreEqual $serverFarm2.Id $webApp.ServerFarmId
 		Assert-AreEqual $true $webApp.HttpsOnly
+		Assert-AreEqual $false $webapp.SiteConfig.AlwaysOn
 
 		# Set config properties
 		$webapp.SiteConfig.HttpLoggingEnabled = $true
 		$webapp.SiteConfig.RequestTracingEnabled = $true
+		$webapp.SiteConfig.FtpsState = "FtpsOnly"
+		$webApp.SiteConfig.MinTlsVersion = "1.0"
 
 		# Set site properties
 		$webApp = $webApp | Set-AzWebApp
@@ -1117,18 +1122,22 @@ function Test-SetWebApp
 		Assert-AreEqual $serverFarm2.Id $webApp.ServerFarmId
 		Assert-AreEqual $true $webApp.SiteConfig.HttpLoggingEnabled
 		Assert-AreEqual $true $webApp.SiteConfig.RequestTracingEnabled
-
+		Assert-AreEqual $false $webApp.SiteConfig.AlwaysOn
+		Assert-AreEqual "FtpsOnly" $webApp.SiteConfig.FtpsState
+		Assert-AreEqual "1.0" $webApp.SiteConfig.MinTlsVersion
+		 
 		$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-AzWebApp -ResourceGroupName $rgname -Name $webAppName -AppSettings $appSettings -AssignIdentity $true
+        $webApp = Set-AzWebApp -ResourceGroupName $rgname -Name $webAppName -AppSettings $appSettings -AssignIdentity $true -MinTlsVersion "1.2"
 
         # Assert
         Assert-NotNull  $webApp.Identity
         # AssignIdentity adds an appsetting to handle enabling / disabling AssignIdentity
         Assert-AreEqual ($appSettings.Keys.Count) $webApp.SiteConfig.AppSettings.Count
         Assert-NotNull  $webApp.Identity
+		Assert-AreEqual "1.2" $webApp.SiteConfig.MinTlsVersion
 
         # set app settings and connection strings
 		$webApp = Set-AzWebApp -ResourceGroupName $rgname -Name $webAppName -AppSettings $appSettings -ConnectionStrings $connectionStrings -NumberofWorkers $capacity -PhpVersion "off"
@@ -1148,6 +1157,7 @@ function Test-SetWebApp
 
 		Assert-AreEqual $capacity $webApp.SiteConfig.NumberOfWorkers
 		Assert-AreEqual "" $webApp.SiteConfig.PhpVersion
+		Assert-AreEqual "1.2" $webApp.SiteConfig.MinTlsVersion
 
 	}
 	finally

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

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* 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
 
 ## Version 1.5.1
 * Update references in .psd1 to use relative path

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

@@ -122,6 +122,17 @@ public class SetAzureWebAppSlotCmdlet : WebAppSlotBaseCmdlet
         [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Azure Storage to mount inside a Web App for Container. Use New-AzWebAppAzureStoragePath to create it")]
         public WebAppAzureStoragePath[] AzureStoragePath { get; set; }
 
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Ensure web app gets loaded all the time, rather unloaded after been idle.")]
+        public bool AlwaysOn { get; set; }
+
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "The minimum version of TLS required for SSL requests. Allowed Values [1.0 | 1.1 | 1.2].")]
+        [ValidateSet("1.0", "1.1", "1.2")]
+        public string MinTlsVersion { get; set; }
+
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Set the Ftps state value for an app. Allowed Values [AllAllowed | Disabled | FtpsOnly].")]
+        [ValidateSet("AllAllowed", "Disabled", "FtpsOnly")]
+        public string FtpsState { get; set; }
+
 
         public override void ExecuteCmdlet()
         {
@@ -137,6 +148,14 @@ public override void ExecuteCmdlet()
                     location = WebApp.Location;
                     tags = WebApp.Tags;
                     var parameters = new HashSet<string>(MyInvocation.BoundParameters.Keys, StringComparer.OrdinalIgnoreCase);
+
+                    // Perform the AppServicePlan update before updating site or config properties
+                    if (parameters.Contains("AppServicePlan"))
+                    {
+                        WebApp.AzureStoragePath = null; // the API to update site Object doesn't have the AzureStorage Path property
+                        WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, Slot, AppServicePlan, WebApp);
+                    }
+
                     if (parameters.Any(p => CmdletHelpers.SiteConfigParameters.Contains(p)))
                     {
                         siteConfig = new SiteConfig
@@ -158,7 +177,8 @@ public override void ExecuteCmdlet()
                             Use32BitWorkerProcess =
                                 parameters.Contains("Use32BitWorkerProcess") ? (bool?)Use32BitWorkerProcess : null,
                             AutoSwapSlotName = parameters.Contains("AutoSwapSlotName") ? AutoSwapSlotName : null,
-                            NumberOfWorkers = parameters.Contains("NumberOfWorkers") ? NumberOfWorkers : WebApp.SiteConfig.NumberOfWorkers
+                            NumberOfWorkers = parameters.Contains("NumberOfWorkers") ? NumberOfWorkers : WebApp.SiteConfig.NumberOfWorkers,
+                            AlwaysOn = parameters.Contains("AlwaysOn") ? (bool)AlwaysOn : false
                         };
                     }
 
@@ -236,12 +256,9 @@ public override void ExecuteCmdlet()
                         };
 
                         WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, Slot, WebApp.ServerFarmId, new PSSite(site));
-                    }
-
-                    if (parameters.Contains("AppServicePlan"))
-                    {
-                        WebApp.AzureStoragePath = null; // the API to update site Object doesn't have the AzureStorage Path property
-                        WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, Slot, AppServicePlan, WebApp);
+                        
+                        //Update WebApp object after site update
+                        WebApp = new PSSite(WebsitesClient.GetWebApp(ResourceGroupName, Name, null));
                     }
 
                     break;

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

@@ -130,6 +130,18 @@ public class SetAzureWebAppCmdlet : WebAppBaseCmdlet
         [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Azure Storage to mount inside a Web App for Container. Use New-AzWebAppAzureStoragePath to create it")]
         public WebAppAzureStoragePath[] AzureStoragePath { get; set; }
 
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Ensure web app gets loaded all the time, rather unloaded after been idle.")]
+        public bool AlwaysOn { get; set; }
+
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "The minimum version of TLS required for SSL requests. Allowed Values [1.0 | 1.1 | 1.2].")]
+        [ValidateSet("1.0", "1.1", "1.2")]
+        public string MinTlsVersion { get; set; }
+
+        [Parameter(ParameterSetName = ParameterSet1Name, Mandatory = false, HelpMessage = "Set the Ftps state value for an app. Allowed Values [AllAllowed | Disabled | FtpsOnly].")]
+        [ValidateSet("AllAllowed", "Disabled", "FtpsOnly")]
+        public string FtpsState { get; set; }
+
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -144,6 +156,13 @@ public override void ExecuteCmdlet()
                     location = WebApp.Location;
                     tags = WebApp.Tags;
                     var parameters = new HashSet<string>(MyInvocation.BoundParameters.Keys, StringComparer.OrdinalIgnoreCase);
+                    if (parameters.Contains("AppServicePlan"))
+                    {
+                        // AzureStorage path is not a part of the back end siteObject, but if the PSSite Object is given as an input, so simply set this to null
+                        WebApp.AzureStoragePath = null;
+                        WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, AppServicePlan, WebApp);
+                    }
+ 
                     if (parameters.Any(p => CmdletHelpers.SiteConfigParameters.Contains(p)))
                     {
                         siteConfig = new SiteConfig
@@ -165,7 +184,10 @@ public override void ExecuteCmdlet()
                             Use32BitWorkerProcess =
                                 parameters.Contains("Use32BitWorkerProcess") ? (bool?)Use32BitWorkerProcess : null,
                             AutoSwapSlotName = parameters.Contains("AutoSwapSlotName") ? AutoSwapSlotName : null,
-                            NumberOfWorkers = parameters.Contains("NumberOfWorkers") ? NumberOfWorkers : WebApp.SiteConfig.NumberOfWorkers
+                            NumberOfWorkers = parameters.Contains("NumberOfWorkers") ? NumberOfWorkers : WebApp.SiteConfig.NumberOfWorkers,
+                            AlwaysOn = parameters.Contains("AlwaysOn") ? (bool?)AlwaysOn : null,
+                            MinTlsVersion = parameters.Contains("MinTlsVersion") ? MinTlsVersion : WebApp.SiteConfig.MinTlsVersion,
+                            FtpsState = parameters.Contains("FtpsState") ? FtpsState: WebApp.SiteConfig.FtpsState
                         };
                     }
 
@@ -241,16 +263,14 @@ public override void ExecuteCmdlet()
                             ServerFarmId = WebApp.ServerFarmId,
                             Identity = parameters.Contains("AssignIdentity") ? AssignIdentity ? new ManagedServiceIdentity("SystemAssigned", null, null) : new ManagedServiceIdentity("None", null, null) : WebApp.Identity,
                             HttpsOnly = parameters.Contains("HttpsOnly") ? HttpsOnly : WebApp.HttpsOnly
+                            
                         };
 
                         WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, WebApp.ServerFarmId, new PSSite(site));
-                    }
 
-                    if (parameters.Contains("AppServicePlan"))
-                    {
-                        // AzureStorage path is not a part of the back end siteObject, but if the PSSite Object is given as an input, so simply set this to null
-                        WebApp.AzureStoragePath = null;
-                        WebsitesClient.UpdateWebApp(ResourceGroupName, location, Name, null, AppServicePlan, WebApp);
+                        //Update WebApp object after site update
+                        WebApp = new PSSite(WebsitesClient.GetWebApp(ResourceGroupName, Name, null));
+
                     }
 
                     if (parameters.Contains("HostNames"))

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

@@ -29,7 +29,10 @@ public static class CmdletHelpers
                 "WebSocketsEnabled",
                 "Use32BitWorkerProcess",
                 "AutoSwapSlotName",
-                "NumberOfWorkers"
+                "NumberOfWorkers",
+                "AlwaysOn",
+                "MinTlsVersion",
+                "FtpsState"
             };
 
         public static HashSet<string> SiteParameters = new HashSet<string>

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

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.Websites.dll-Help.xml
 Module Name: Az.Websites
 ms.assetid: 4166119F-D26A-45A1-B040-D7B2459833D6
@@ -24,7 +24,8 @@ Set-AzWebApp [[-AppServicePlan] <String>] [[-DefaultDocuments] <String[]>] [[-Ne
  [-ContainerRegistryUser <String>] [-ContainerRegistryPassword <SecureString>]
  [-EnableContainerContinuousDeployment <Boolean>] [-HostNames <String[]>] [-NumberOfWorkers <Int32>] [-AsJob]
  [-AssignIdentity <Boolean>] [-HttpsOnly <Boolean>] [-AzureStoragePath <WebAppAzureStoragePath[]>]
- [-ResourceGroupName] <String> [-Name] <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-AlwaysOn <Boolean>] [-MinTlsVersion <String>] [-FtpsState <String>] [-ResourceGroupName] <String>
+ [-Name] <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### S2
@@ -55,6 +56,21 @@ This command sets HttpLoggingEnabled to true for Web App ContosoWebApp associate
 
 ## PARAMETERS
 
+### -AlwaysOn
+Ensure web app gets loaded all the time, rather unloaded after been idle.
+
+```yaml
+Type: System.Boolean
+Parameter Sets: S1
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -AppServicePlan
 App Service Plan Name
 
@@ -280,6 +296,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -FtpsState
+Set the Ftps state value for an app. Allowed Values [AllAllowed | Disabled | FtpsOnly].
+
+```yaml
+Type: System.String
+Parameter Sets: S1
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -HandlerMappings
 Handler Mappings IList
 
@@ -356,6 +387,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -MinTlsVersion
+The minimum version of TLS required for SSL requests. Allowed Values [1.0 | 1.1 | 1.2].
+
+```yaml
+Type: System.String
+Parameter Sets: S1
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 WebApp Name
 
@@ -492,7 +538,7 @@ 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).
+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).
 
 ## INPUTS