Skip to content

Commit f911bac

Browse files
jamastengithub-actionsMatt Hallenborg
authored
ESRI Enterprise & AVD Add-On Updates (#1136)
* Integrated tier3 * Removed unnecessary file * Fixed formatting, Removed default value * Added script * Added parameter * Updated image terms script, Removed unnecessary dependency * Updated tags to use safe dereference * Created script file for certificate creation * Created script file for ESRI licenses * Updated URLs * Removed run command for module installation * Removed bicep config file * Removed unnecessary file * Fixed linter issue * Fixed linter issue * Removed unnecessary dependencies * Fixed deployment scope * Compiled bicep changes * GitHub Action: Build Bicep to JSON * Compiled bicep changes * Compiled bicep changes * Fixed API versions for AVD * Fixed scope on VNET links * Updated default values for params * Removed unnecessary params, Updated param values * Added filter for image SKUs, Optimized default value for image SKU * Created step for control plane * Added info box to show selected groups * Added warning info boxes for VM quota * Added replace to remove double spaces * Fixed tags * Added file * Fixed dependencies & params * Organized resources by deployment order * Simplified the scopes * Updated file path for consistency * Added script to set DNS client * Updated param names, Moved inline script to file * Fixed param name casing * Fixed param casing, param names, param sorting * Compiled bicep changes * added sslcert script * Updated script * Added pvt dns zone for Azure SQL Server * GitHub Action: Build Bicep to JSON * Compiled bicep changes * Fixed condition for purchase plan * Removed unnecessary dependency * Fixed conditions & resource properties * Compiled bicep changes * Fixed ID type * Added fix for service principals api * Fixed the tool tip value --------- Co-authored-by: github-actions <[email protected]> Co-authored-by: Matt Hallenborg <[email protected]>
1 parent 19421c6 commit f911bac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+7325
-4787
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $AzureManagementHeader = @{
3232
$SessionHosts = (Invoke-RestMethod `
3333
-Headers $AzureManagementHeader `
3434
-Method 'GET' `
35-
-Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts?api-version=2022-02-10-preview')).value.name
35+
-Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $HostPoolResourceGroupName + '/providers/Microsoft.DesktopVirtualization/hostPools/' + $HostPoolName + '/sessionHosts?api-version=2023-09-05')).value.name
3636

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ Invoke-RestMethod `
3232
-Body (@{properties = @{friendlyName = $FriendlyName.Replace('"', '')}} | ConvertTo-Json) `
3333
-Headers $AzureManagementHeader `
3434
-Method 'PATCH' `
35-
-Uri $($ResourceManagerUriFixed + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $ResourceGroupName + '/providers/Microsoft.DesktopVirtualization/applicationGroups/' + $ApplicationGroupName + '/desktops/SessionDesktop?api-version=2022-02-10-preview') | Out-Null
35+
-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/modules/management/virtualMachine.bicep

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2021-11-01' = {
114114
licenseType: 'Windows_Server'
115115
}
116116
identity: {
117-
type: 'SystemAssigned, UserAssigned'
117+
type: 'UserAssigned'
118118
userAssignedIdentities: {
119119
'${deploymentUserAssignedIdentityResourceId}': {}
120120
}

‎src/bicep/add-ons/azure-virtual-desktop/modules/sessionHosts/sessionHosts.bicep

+5-5
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ module roleAssignments '../common/roleAssignments/resourceGroup.bicep' = [for i
117117
}
118118
}]
119119

120-
resource gallery 'Microsoft.Compute/galleries@2023-07-03' existing = if (empty(imageVersionResourceId)) {
120+
resource gallery 'Microsoft.Compute/galleries@2023-07-03' existing = if (!empty(imageVersionResourceId)) {
121121
scope: resourceGroup(split(imageVersionResourceId, '/')[2], split(imageVersionResourceId, '/')[4])
122122
name: split(imageVersionResourceId, '/')[8]
123123
}
124124

125-
resource image 'Microsoft.Compute/galleries/images@2023-07-03' existing = if (empty(imageVersionResourceId)) {
125+
resource image 'Microsoft.Compute/galleries/images@2023-07-03' existing = if (!empty(imageVersionResourceId)) {
126126
parent: gallery
127127
name: split(imageVersionResourceId, '/')[10]
128128
}
@@ -236,9 +236,9 @@ module virtualMachines 'virtualMachines.bicep' = [for i in range(1, sessionHostB
236236
fslogixContainerType: fslogixContainerType
237237
hostPoolName: hostPoolName
238238
imageVersionResourceId: imageVersionResourceId
239-
imageOffer: empty(imageVersionResourceId) ? imageOffer : image.properties.purchasePlan.product
240-
imagePublisher: empty(imageVersionResourceId) ? imagePublisher: image.properties.purchasePlan.publisher
241-
imageSku: empty(imageVersionResourceId) ? imageSku : image.properties.purchasePlan.name
239+
imageOffer: empty(imageVersionResourceId) ? imageOffer : image.properties.identifier.offer
240+
imagePublisher: empty(imageVersionResourceId) ? imagePublisher : image.properties.identifier.publisher
241+
imageSku: empty(imageVersionResourceId) ? imageSku : image.properties.identifier.sku
242242
location: location
243243
managementVirtualMachineName: managementVirtualMachineName
244244
netAppFileShares: netAppFileShares

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

+4-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ param activeDirectorySolution string
1818
param availability string = 'AvailabilityZones'
1919

2020
@description('The availability zones allowed for the AVD session hosts deployment location.')
21-
param availabilityZones array
21+
param availabilityZones array = ['1', '2', '3']
2222

2323
@description('The file name for the ZIP file containing the AVD agents and DSC configuration.')
2424
param avdConfigurationZipFileName string = 'Configuration_1.0.02790.438.zip'
@@ -72,7 +72,7 @@ param domainName string = ''
7272
param drainMode bool = false
7373

7474
@description('The email address to use for Defender for Cloud notifications.')
75-
param emailSecurityContact string
75+
param emailSecurityContact string = ''
7676

7777
@description('Determine whether to enable accelerated networking on the AVD session hosts. https://learn.microsoft.com/en-us/azure/virtual-network/accelerated-networking-overview')
7878
param enableAcceleratedNetworking bool
@@ -132,7 +132,7 @@ param functionAppSubnetAddressPrefix string = ''
132132
'EnabledForSessionHostsOnly'
133133
])
134134
@description('The type of public network access for the host pool.')
135-
param hostPoolPublicNetworkAccess string
135+
param hostPoolPublicNetworkAccess string = 'Enabled'
136136

137137
@allowed([
138138
'Pooled'
@@ -302,7 +302,7 @@ param workspaceFriendlyName string = ''
302302
'Enabled'
303303
])
304304
@description('The public network access setting on the AVD workspace either disables public network access or allows both public and private network access.')
305-
param workspacePublicNetworkAccess string
305+
param workspacePublicNetworkAccess string = 'Enabled'
306306

307307
// BATCH SESSION HOSTS
308308
// The following variables are used to determine the batches to deploy any number of AVD session hosts.
@@ -685,9 +685,6 @@ module sessionHosts 'modules/sessionHosts/sessionHosts.bicep' = {
685685
virtualMachineSize: virtualMachineSize
686686
virtualMachineUsername: virtualMachineUsername
687687
}
688-
dependsOn: [
689-
fslogix
690-
]
691688
}
692689

693690
module cleanUp 'modules/cleanUp/cleanUp.bicep' = {

0 commit comments

Comments
 (0)