ESRI Enterprise Add-On: SFI & ZTA updates

src/bicep/add-ons/azure-virtual-desktop/artifacts/Set-AvdDrainMode.ps1

@@ -32,7 +32,7 @@ $AzureManagementHeader = @{
 $SessionHosts = (Invoke-RestMethod `
     -Headers $AzureManagementHeader `
     -Method 'GET' `
-    -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts?api-version=2022-02-10-preview')).value.name
+    -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts?api-version=2023-09-05')).value.name
 
 # Enable drain mode for the AVD session hosts
 for($i = $SessionHostIndex; $i -lt $($SessionHostIndex + $SessionHostCount); $i++)
@@ -43,5 +43,5 @@ for($i = $SessionHostIndex; $i -lt $($SessionHostIndex + $SessionHostCount); $i+
         -Body (@{properties = @{allowNewSession = $false}} | ConvertTo-Json) `
         -Headers $AzureManagementHeader `
         -Method 'PATCH' `
-        -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts/' + $SessionHostName + '?api-version=2022-02-10-preview') | Out-Null
+        -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts/' + $SessionHostName + '?api-version=2023-09-05') | Out-Null
 }

src/bicep/add-ons/azure-virtual-desktop/artifacts/Update-AvdDesktop.ps1

@@ -32,4 +32,4 @@ Invoke-RestMethod `
     -Body (@{properties = @{friendlyName = $FriendlyName.Replace('"', '')}} | ConvertTo-Json) `
     -Headers $AzureManagementHeader `
     -Method 'PATCH' `
-    -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $ResourceGroupName + '/providers/Microsoft.DesktopVirtualization/applicationGroups/' + $ApplicationGroupName + '/desktops/SessionDesktop?api-version=2022-02-10-preview') | Out-Null
+    -Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $ResourceGroupName + '/providers/Microsoft.DesktopVirtualization/applicationGroups/' + $ApplicationGroupName + '/desktops/SessionDesktop?api-version=2023-09-05') | Out-Null

src/bicep/add-ons/azure-virtual-desktop/solution.bicep

@@ -18,7 +18,7 @@ param activeDirectorySolution string
 param availability string = 'AvailabilityZones'
 
 @description('The availability zones allowed for the AVD session hosts deployment location.')
-param availabilityZones array
+param availabilityZones array = ['1', '2', '3']
 
 @description('The file name for the ZIP file containing the AVD agents and DSC configuration.')
 param avdConfigurationZipFileName string = 'Configuration_1.0.02790.438.zip'
@@ -72,7 +72,7 @@ param domainName string = ''
 param drainMode bool = false
 
 @description('The email address to use for Defender for Cloud notifications.')
-param emailSecurityContact string
+param emailSecurityContact string = ''
 
 @description('Determine whether to enable accelerated networking on the AVD session hosts. https://learn.microsoft.com/en-us/azure/virtual-network/accelerated-networking-overview')
 param enableAcceleratedNetworking bool
@@ -132,7 +132,7 @@ param functionAppSubnetAddressPrefix string = ''
   'EnabledForSessionHostsOnly'
 ])
 @description('The type of public network access for the host pool.')
-param hostPoolPublicNetworkAccess string
+param hostPoolPublicNetworkAccess string = 'Enabled'
 
 @allowed([
   'Pooled'
@@ -302,7 +302,7 @@ param workspaceFriendlyName string = ''
   'Enabled'
 ])
 @description('The public network access setting on the AVD workspace either disables public network access or allows both public and private network access.')
-param workspacePublicNetworkAccess string
+param workspacePublicNetworkAccess string = 'Enabled'
 
 //  BATCH SESSION HOSTS
 // The following variables are used to determine the batches to deploy any number of AVD session hosts.