Skip to content

Commit 91cbd79

Browse files
danycontredanycontre
authored
Merge pull request #588 from Poven795909/main
AVD LZA support for Azure China [ mooncake ]
2 parents 84d2d26 + fb7313d commit 91cbd79

File tree

8 files changed

+338
-393
lines changed

8 files changed

+338
-393
lines changed

‎readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ As of today, we have a first reference implementation scenario that is one of th
3131

3232
| Deployment Type | Link |
3333
|:--|:--|
34-
| Azure portal UI |[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fportal-ui%2Fportal-ui-baseline.json) [![Deploy to Azure Gov](https://aka.ms/deploytoazuregovbutton)](https://portal.azure.us/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fportal-ui%2Fportal-ui-baseline.json)|
34+
| Azure portal UI |[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fportal-ui%2Fportal-ui-baseline.json) [![Deploy to Azure Gov](https://aka.ms/deploytoazuregovbutton)](https://portal.azure.us/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fportal-ui%2Fportal-ui-baseline.json) [![Deploy to Azure China](https://aka.ms/deploytoazurechinabutton)](https://portal.azure.cn/#blade/Microsoft_Azure_CreateUIDef/CustomDeploymentBlade/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Farm%2Fdeploy-baseline.json/uiFormDefinitionUri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Favdaccelerator%2Fmain%2Fworkload%2Fportal-ui%2Fportal-ui-baseline.json)|
3535
| Command line (Bicep/ARM) | [![Powershell/Azure CLI](./workload/docs/icons/powershell.png)](./workload/bicep/readme.md#avd-accelerator-baseline) |
3636
| Terraform | [![Terraform](./workload/docs/icons/terraform.png)](./workload/terraform/greenfield/readme.md) |
3737

‎workload/arm/deploy-baseline.json

+228-350
Large diffs are not rendered by default.

‎workload/bicep/deploy-baseline.bicep

+16-10
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ param enableKvPurgeProtection bool = true
486486
// =========== //
487487
// Resource naming
488488
var varDeploymentPrefixLowercase = toLower(deploymentPrefix)
489+
var varAzureCloudName = environment().name
489490
var varDeploymentEnvironmentLowercase = toLower(deploymentEnvironment)
490491
var varDeploymentEnvironmentComputeStorage = (deploymentEnvironment == 'Dev') ? 'd' : ((deploymentEnvironment == 'Test') ? 't' : ((deploymentEnvironment == 'Prod') ? 'p' : ''))
491492
var varNamingUniqueStringThreeChar = take('${uniqueString(avdWorkloadSubsId, varDeploymentPrefixLowercase, time)}', 3)
@@ -524,12 +525,15 @@ var varHostFriendlyName = avdUseCustomNaming ? avdHostPoolCustomFriendlyName : '
524525
var varHostPoolPreferredAppGroupType = toLower(hostPoolPreferredAppGroupType)
525526
var varApplicationGroupName = avdUseCustomNaming ? avdApplicationGroupCustomName : 'vdag-${varHostPoolPreferredAppGroupType}-${varManagementPlaneNamingStandard}-001'
526527
var varApplicationGroupFriendlyName = avdUseCustomNaming ? avdApplicationGroupCustomFriendlyName : '${varHostPoolPreferredAppGroupType} ${deploymentPrefix} ${deploymentEnvironment} ${avdManagementPlaneLocation} 001'
528+
var varDeployScalingPlan = (varAzureCloudName == 'AzureChinaCloud') ? false : avdDeployScalingPlan
529+
var varCreateMsixDeployment = (varAzureCloudName == 'AzureChinaCloud') ? false : createMsixDeployment
527530
var varScalingPlanName = avdUseCustomNaming ? avdScalingPlanCustomName : 'vdscaling-${varManagementPlaneNamingStandard}-001'
528531
var varScalingPlanExclusionTag = 'exclude-${varScalingPlanName}'
529532
var varScalingPlanWeekdaysScheduleName = 'Weekdays-${varManagementPlaneNamingStandard}'
530533
var varScalingPlanWeekendScheduleName = 'Weekend-${varManagementPlaneNamingStandard}'
531534
var varWrklKvName = avdUseCustomNaming ? '${avdWrklKvPrefixCustomName}-${varComputeStorageResourcesNamingStandard}-${varNamingUniqueStringTwoChar}' : 'kv-sec-${varComputeStorageResourcesNamingStandard}-${varNamingUniqueStringTwoChar}' // max length limit 24 characters
532535
var varWrklKvPrivateEndpointName = 'pe-${varWrklKvName}-vault'
536+
var varWrklKeyVaultSku = (varAzureCloudName == 'AzureCloud' || varAzureCloudName == 'AzureUSGovernment') ? 'premium' : (varAzureCloudName == 'AzureChinaCloud' ? 'standard': null)
533537
var varSessionHostNamePrefix = avdUseCustomNaming ? avdSessionHostCustomNamePrefix : 'vm${varDeploymentPrefixLowercase}${varDeploymentEnvironmentComputeStorage}${varSessionHostLocationAcronym}'
534538
var varAvsetNamePrefix = avdUseCustomNaming ? '${avsetCustomNamePrefix}-${varComputeStorageResourcesNamingStandard}' : 'avail-${varComputeStorageResourcesNamingStandard}'
535539
var varStorageManagedIdentityName = 'id-storage-${varComputeStorageResourcesNamingStandard}-001'
@@ -550,7 +554,7 @@ var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/m
550554
var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/Set-SessionHostConfiguration.ps1'
551555
var varSessionHostConfigurationScript = './Set-SessionHostConfiguration.ps1'
552556
var varDiskEncryptionKeyExpirationInEpoch = dateTimeToEpoch(dateTimeAdd(time, 'P${string(diskEncryptionKeyExpirationInDays)}D'))
553-
var varCreateStorageDeployment = (createAvdFslogixDeployment || createMsixDeployment == true) ? true : false
557+
var varCreateStorageDeployment = (createAvdFslogixDeployment || varCreateMsixDeployment == true) ? true : false
554558
var varFslogixStorageSku = zoneRedundantStorage ? '${fslogixStoragePerformance}_ZRS' : '${fslogixStoragePerformance}_LRS'
555559
var varMsixStorageSku = zoneRedundantStorage ? '${msixStoragePerformance}_ZRS' : '${msixStoragePerformance}_LRS'
556560
var varMgmtVmSpecs = {
@@ -830,11 +834,11 @@ module monitoringDiagnosticSettings './modules/avdInsightsMonitoring/deploy.bice
830834
}
831835

832836
// Networking
833-
module networking './modules/networking/deploy.bicep' = if (createAvdVnet || createPrivateDnsZones || avdDeploySessionHosts || createAvdFslogixDeployment || createMsixDeployment) {
837+
module networking './modules/networking/deploy.bicep' = if (createAvdVnet || createPrivateDnsZones || avdDeploySessionHosts || createAvdFslogixDeployment || varCreateMsixDeployment) {
834838
name: 'Networking-${time}'
835839
params: {
836840
createVnet: createAvdVnet
837-
deployAsg: (avdDeploySessionHosts || createAvdFslogixDeployment || createMsixDeployment) ? true : false
841+
deployAsg: (avdDeploySessionHosts || createAvdFslogixDeployment || varCreateMsixDeployment) ? true : false
838842
existingAvdSubnetResourceId: existingVnetAvdSubnetResourceId
839843
createPrivateDnsZones: deployPrivateEndpointKeyvaultStorage ? createPrivateDnsZones : false
840844
applicationSecurityGroupName: varApplicationSecurityGroupName
@@ -885,15 +889,15 @@ module managementPLane './modules/avdManagementPlane/deploy.bicep' = {
885889
hostPoolLoadBalancerType: avdHostPoolLoadBalancerType
886890
hostPoolType: avdHostPoolType
887891
preferredAppGroupType: (hostPoolPreferredAppGroupType == 'RemoteApp') ? 'RailApplications' : 'Desktop'
888-
deployScalingPlan: avdDeployScalingPlan
892+
deployScalingPlan: varDeployScalingPlan
889893
scalingPlanExclusionTag: varScalingPlanExclusionTag
890894
scalingPlanSchedules: varScalingPlanSchedules
891895
scalingPlanName: varScalingPlanName
892896
hostPoolMaxSessions: hostPoolMaxSessions
893897
personalAssignType: avdPersonalAssignType
894898
managementPlaneLocation: avdManagementPlaneLocation
895899
serviceObjectsRgName: varServiceObjectsRgName
896-
startVmOnConnect: (avdHostPoolType == 'Pooled') ? avdDeployScalingPlan : avdStartVmOnConnect
900+
startVmOnConnect: (avdHostPoolType == 'Pooled') ? varDeployScalingPlan : avdStartVmOnConnect
897901
workloadSubsId: avdWorkloadSubsId
898902
identityServiceProvider: avdIdentityServiceProvider
899903
securityPrincipalIds: !empty(securityPrincipalId)? array(securityPrincipalId): []
@@ -918,7 +922,7 @@ module identity './modules/identity/deploy.bicep' = {
918922
serviceObjectsRgName: varServiceObjectsRgName
919923
storageObjectsRgName: varStorageObjectsRgName
920924
avdEnterpriseObjectId: avdEnterpriseAppObjectId
921-
deployScalingPlan: avdDeployScalingPlan
925+
deployScalingPlan: varDeployScalingPlan
922926
storageManagedIdentityName: varStorageManagedIdentityName
923927
enableStartVmOnConnect: avdStartVmOnConnect
924928
identityServiceProvider: avdIdentityServiceProvider
@@ -944,6 +948,7 @@ module zeroTrust './modules/zeroTrust/deploy.bicep' = if (diskZeroTrust && avdDe
944948
serviceObjectsRgName: varServiceObjectsRgName
945949
computeObjectsRgName: varComputeObjectsRgName
946950
managedIdentityName: varZtManagedIdentityName
951+
vaultSku: varWrklKeyVaultSku
947952
diskEncryptionKeyExpirationInDays: diskEncryptionKeyExpirationInDays
948953
diskEncryptionKeyExpirationInEpoch: varDiskEncryptionKeyExpirationInEpoch
949954
diskEncryptionSetName: varDiskEncryptionSetName
@@ -973,6 +978,7 @@ module wrklKeyVault '../../carml/1.3.0/Microsoft.KeyVault/vaults/deploy.bicep' =
973978
location: avdSessionHostLocation
974979
enableRbacAuthorization: false
975980
enablePurgeProtection: enableKvPurgeProtection
981+
vaultSku: varWrklKeyVaultSku
976982
softDeleteRetentionInDays: 7
977983
publicNetworkAccess: deployPrivateEndpointKeyvaultStorage ? 'Disabled' : 'Enabled'
978984
networkAcls: deployPrivateEndpointKeyvaultStorage ? {
@@ -1049,14 +1055,14 @@ module wrklKeyVault '../../carml/1.3.0/Microsoft.KeyVault/vaults/deploy.bicep' =
10491055
}
10501056

10511057
// Management VM deployment
1052-
module managementVm './modules/storageAzureFiles/.bicep/managementVm.bicep' = if (createAvdFslogixDeployment || createMsixDeployment) {
1058+
module managementVm './modules/storageAzureFiles/.bicep/managementVm.bicep' = if (createAvdFslogixDeployment || varCreateMsixDeployment) {
10531059
name: 'Storage-MGMT-VM-${time}'
10541060
params: {
10551061
diskEncryptionSetResourceId: diskZeroTrust ? zeroTrust.outputs.ztDiskEncryptionSetResourceId : ''
10561062
identityServiceProvider: avdIdentityServiceProvider
10571063
managementVmName: varManagementVmName
10581064
computeTimeZone: varTimeZoneSessionHosts
1059-
applicationSecurityGroupResourceId: (avdDeploySessionHosts || createAvdFslogixDeployment || createMsixDeployment) ? '${networking.outputs.applicationSecurityGroupResourceId}' : ''
1065+
applicationSecurityGroupResourceId: (avdDeploySessionHosts || createAvdFslogixDeployment || varCreateMsixDeployment) ? '${networking.outputs.applicationSecurityGroupResourceId}' : ''
10601066
domainJoinUserName: avdDomainJoinUserName
10611067
wrklKvName: varWrklKvName
10621068
serviceObjectsRgName: varServiceObjectsRgName
@@ -1129,7 +1135,7 @@ module fslogixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if
11291135
}
11301136

11311137
// MSIX storage
1132-
module msixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if (createMsixDeployment) {
1138+
module msixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if (varCreateMsixDeployment) {
11331139
name: 'Storage-MSIX-${time}'
11341140
params: {
11351141
storagePurpose: 'msix'
@@ -1198,7 +1204,7 @@ module sessionHosts './modules/avdSessionHosts/deploy.bicep' = [for i in range(1
11981204
params: {
11991205
diskEncryptionSetResourceId: diskZeroTrust ? zeroTrust.outputs.ztDiskEncryptionSetResourceId : ''
12001206
timeZone: varTimeZoneSessionHosts
1201-
asgResourceId: (avdDeploySessionHosts || createAvdFslogixDeployment || createMsixDeployment) ? '${networking.outputs.applicationSecurityGroupResourceId}' : ''
1207+
asgResourceId: (avdDeploySessionHosts || createAvdFslogixDeployment || varCreateMsixDeployment) ? '${networking.outputs.applicationSecurityGroupResourceId}' : ''
12021208
identityServiceProvider: avdIdentityServiceProvider
12031209
createIntuneEnrollment: createIntuneEnrollment
12041210
maxAvsetMembersCount: varMaxAvsetMembersCount

‎workload/bicep/modules/networking/deploy.bicep

+26-2
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,34 @@ module privateDnsZoneKeyVaultGov '.bicep/privateDnsZones.bicep' = if (createPriv
401401
tags: tags
402402
}
403403
}
404+
405+
406+
// Private DNS zones Azure files China
407+
module privateDnsZoneAzureFilesChina '.bicep/privateDnsZones.bicep' = if (createPrivateDnsZones && (varAzureCloudName == 'AzureChinaCloud')) {
408+
scope: resourceGroup('${workloadSubsId}', '${networkObjectsRgName}')
409+
name: 'Private-DNS-Gov-Files-${time}'
410+
params: {
411+
privateDnsZoneName: 'privatelink.file.core.chinacloudapi.cn'
412+
virtualNetworkResourceId: createVnet ? virtualNetwork.outputs.resourceId : varExistingAvdVnetResourceId
413+
tags: tags
414+
}
415+
}
416+
417+
// Private DNS zones key vault China
418+
module privateDnsZoneKeyVaultChina '.bicep/privateDnsZones.bicep' = if (createPrivateDnsZones && (varAzureCloudName == 'AzureChinaCloud')) {
419+
scope: resourceGroup('${workloadSubsId}', '${networkObjectsRgName}')
420+
name: 'Private-DNS-Gov-Kv-${time}'
421+
params: {
422+
privateDnsZoneName: 'privatelink.vaultcore.azure.cn'
423+
virtualNetworkResourceId: createVnet ? virtualNetwork.outputs.resourceId : varExistingAvdVnetResourceId
424+
tags: tags
425+
}
426+
}
427+
404428
// =========== //
405429
// Outputs //
406430
// =========== //
407431
output applicationSecurityGroupResourceId string = deployAsg ? applicationSecurityGroup.outputs.resourceId : ''
408432
output virtualNetworkResourceId string = createVnet ? virtualNetwork.outputs.resourceId : ''
409-
output azureFilesDnsZoneResourceId string = createPrivateDnsZones ? ((varAzureCloudName == 'AzureCloud') ? privateDnsZoneAzureFilesCommercial.outputs.resourceId : privateDnsZoneAzureFilesGov.outputs.resourceId) : ''
410-
output KeyVaultDnsZoneResourceId string = createPrivateDnsZones ? ((varAzureCloudName == 'AzureCloud') ? privateDnsZoneKeyVaultCommercial.outputs.resourceId : privateDnsZoneKeyVaultGov.outputs.resourceId) : ''
433+
output azureFilesDnsZoneResourceId string = createPrivateDnsZones ? ((varAzureCloudName == 'AzureCloud') ? privateDnsZoneAzureFilesCommercial.outputs.resourceId : ((varAzureCloudName == 'AzureUSGovernment') ? privateDnsZoneAzureFilesGov.outputs.resourceId : ((varAzureCloudName == 'AzureChinaCloud') ? privateDnsZoneAzureFilesChina.outputs.resourceId : ''))) : ''
434+
output KeyVaultDnsZoneResourceId string = createPrivateDnsZones ? ((varAzureCloudName == 'AzureCloud') ? privateDnsZoneKeyVaultCommercial.outputs.resourceId : ((varAzureCloudName == 'AzureUSGovernment') ? privateDnsZoneKeyVaultGov.outputs.resourceId : ((varAzureCloudName == 'AzureChinaCloud') ? privateDnsZoneKeyVaultChina.outputs.resourceId : ''))) : ''

‎workload/bicep/modules/zeroTrust/.bicep/zeroTrustKeyVault.bicep

+9-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,18 @@ param diskEncryptionKeyExpirationInEpoch int
3737
@sys.description('Encryption set name')
3838
param diskEncryptionSetName string
3939

40-
@sys.description('Zero trust managed identity')
41-
param ztManagedIdentityResourceId string
40+
//@sys.description('Zero trust managed identity')
41+
//param ztManagedIdentityResourceId string
4242

4343
@sys.description('Tags to be applied to resources')
4444
param tags object
4545

4646
@sys.description('Do not modify, used to set unique value for resource deployment.')
4747
param time string = utcNow()
4848

49+
@description('Specifies the SKU for the vault.')
50+
param vaultSku string
51+
4952
@sys.description('Enable purge protection on the key vault')
5053
param enableKvPurgeProtection bool = true
5154
// =========== //
@@ -66,6 +69,7 @@ module ztKeyVault '../../../../../carml/1.3.0/Microsoft.KeyVault/vaults/deploy.b
6669
enableRbacAuthorization: true
6770
enablePurgeProtection: enableKvPurgeProtection
6871
softDeleteRetentionInDays: 7
72+
vaultSku: vaultSku
6973
publicNetworkAccess: 'Disabled'
7074
networkAcls: {
7175
bypass: 'AzureServices'
@@ -141,11 +145,9 @@ module ztDiskEncryptionSet '../../../../../carml/1.3.0/Microsoft.Compute/diskEnc
141145
location: location
142146
name: diskEncryptionSetName
143147
rotationToLatestKeyVersionEnabled: true
144-
systemAssignedIdentity: false
148+
systemAssignedIdentity: true
145149
tags: tags
146-
userAssignedIdentities: {
147-
'${ztManagedIdentityResourceId}': {}
148-
}
150+
// userAssignedIdentities: {}
149151
}
150152
}
151153

@@ -154,3 +156,4 @@ module ztDiskEncryptionSet '../../../../../carml/1.3.0/Microsoft.Compute/diskEnc
154156
// =========== //
155157

156158
output ztDiskEncryptionSetResourceId string = ztDiskEncryptionSet.outputs.resourceId
159+
output ztDiskEncryptionSetPrincipalId string = ztDiskEncryptionSet.outputs.principalId

‎workload/bicep/modules/zeroTrust/deploy.bicep

+16-12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ param time string = utcNow()
5858
@sys.description('Enable purge protection on the key vault')
5959
param enableKvPurgeProtection bool = true
6060

61+
@sys.description('Specifies the SKU for the vault.')
62+
param vaultSku string
63+
6164
// =========== //
6265
// Variable declaration //
6366
// =========== //
@@ -185,23 +188,23 @@ module ztRoleAssignmentServObj '../../../../carml/1.3.0/Microsoft.Authorization/
185188
}]
186189

187190
// User Assigned Identity for Zero Trust.
188-
module ztManagedIdentity '../../../../carml/1.3.0/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep' = {
189-
scope: resourceGroup('${subscriptionId}', '${serviceObjectsRgName}')
190-
name: 'ZT-Managed-ID-${time}'
191-
params: {
192-
location: location
193-
name: managedIdentityName
194-
tags: tags
195-
}
196-
dependsOn: []
197-
}
191+
//module ztManagedIdentity '../../../../carml/1.3.0/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep' = {
192+
// scope: resourceGroup('${subscriptionId}', '${serviceObjectsRgName}')
193+
// name: 'ZT-Managed-ID-${time}'
194+
// params: {
195+
// location: location
196+
// name: managedIdentityName
197+
// tags: tags
198+
// }
199+
// dependsOn: []
200+
//}
198201

199202
// Role Assignment for Zero Trust.
200203
module ztRoleAssignment '../../../../carml/1.3.0/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = if (diskZeroTrust) {
201204
scope: resourceGroup('${subscriptionId}', '${serviceObjectsRgName}')
202205
name: 'ZT-RoleAssign-${time}'
203206
params: {
204-
principalId: diskZeroTrust ? ztManagedIdentity.outputs.principalId : ''
207+
principalId: diskZeroTrust ? ztKeyVault.outputs.ztDiskEncryptionSetPrincipalId : ''
205208
roleDefinitionIdOrName: 'Key Vault Crypto Service Encryption User'
206209
principalType: 'ServicePrincipal'
207210
}
@@ -216,14 +219,15 @@ module ztKeyVault './.bicep/zeroTrustKeyVault.bicep' = if (diskZeroTrust) {
216219
subscriptionId: subscriptionId
217220
rgName: serviceObjectsRgName
218221
kvName: ztKvName
222+
vaultSku: vaultSku
219223
deployPrivateEndpointKeyvaultStorage: deployPrivateEndpointKeyvaultStorage
220224
ztKvPrivateEndpointName: ztKvPrivateEndpointName
221225
privateEndpointsubnetResourceId: privateEndpointsubnetResourceId
222226
keyVaultprivateDNSResourceId: keyVaultprivateDNSResourceId
223227
diskEncryptionKeyExpirationInDays: diskEncryptionKeyExpirationInDays
224228
diskEncryptionKeyExpirationInEpoch: diskEncryptionKeyExpirationInEpoch
225229
diskEncryptionSetName: diskEncryptionSetName
226-
ztManagedIdentityResourceId: diskZeroTrust ? ztManagedIdentity.outputs.resourceId : ''
230+
// ztManagedIdentityResourceId: diskZeroTrust ? ztManagedIdentity.outputs.resourceId : ''
227231
tags: union(tags, kvTags)
228232
enableKvPurgeProtection: enableKvPurgeProtection
229233
}

0 commit comments

Comments
 (0)