From b12b8c49e97791aca30bf66b70faac8f0ad47e4e Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:32:38 -0500 Subject: [PATCH] Fix storage DSC bug (#699) * updates * pr 696 fix --- workload/arm/deploy-baseline.json | 4 ++-- workload/bicep/deploy-baseline.bicep | 12 +++++------- .../1.0.1/DSCStorageScripts.zip | Bin 85874 -> 171628 bytes .../1.0.1/Script-DomainJoinStorage.ps1 | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json index 62bc5d128..060a44633 100644 --- a/workload/arm/deploy-baseline.json +++ b/workload/arm/deploy-baseline.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.30.23.60470", - "templateHash": "8514367717295350076" + "templateHash": "16220838410328199964" }, "name": "AVD Accelerator - Baseline Deployment", "description": "AVD Accelerator - Deployment Baseline", @@ -17542,7 +17542,7 @@ }, "publicNetworkAccess": "[if(parameters('deployPrivateEndpointKeyvaultStorage'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]", "networkAcls": "[if(parameters('deployPrivateEndpointKeyvaultStorage'), createObject('value', createObject('bypass', 'AzureServices', 'defaultAction', 'Deny', 'virtualNetworkRules', createArray(), 'ipRules', createArray())), createObject('value', createObject()))]", - "privateEndpoints": "[if(parameters('deployPrivateEndpointKeyvaultStorage'), createObject('value', createArray(createObject('name', variables('varWrklKvPrivateEndpointName'), 'subnetResourceId', if(parameters('createAvdVnet'), format('{0}/subnets/{1}', reference(subscriptionResourceId('Microsoft.Resources/deployments', format('Networking-{0}', parameters('time'))), '2022-09-01').outputs.virtualNetworkResourceId.value, variables('varVnetPrivateEndpointSubnetName')), parameters('existingVnetPrivateEndpointSubnetResourceId')), 'customNetworkInterfaceName', format('nic-01-{0}', variables('varWrklKvPrivateEndpointName')), 'service', 'vault', 'privateDnsZoneGroup', createObject('privateDNSResourceIds', createArray(if(parameters('createPrivateDnsZones'), reference(subscriptionResourceId('Microsoft.Resources/deployments', format('Networking-{0}', parameters('time'))), '2022-09-01').outputs.KeyVaultDnsZoneResourceId.value, parameters('avdVnetPrivateDnsZoneKeyvaultId'))))))), createObject('value', createArray()))]", + "privateEndpoints": "[if(parameters('deployPrivateEndpointKeyvaultStorage'), createObject('value', createArray(createObject('name', variables('varWrklKvPrivateEndpointName'), 'subnetResourceId', if(parameters('createAvdVnet'), format('{0}/subnets/{1}', reference(subscriptionResourceId('Microsoft.Resources/deployments', format('Networking-{0}', parameters('time'))), '2022-09-01').outputs.virtualNetworkResourceId.value, variables('varVnetPrivateEndpointSubnetName')), parameters('existingVnetPrivateEndpointSubnetResourceId')), 'customNetworkInterfaceName', format('nic-01-{0}', variables('varWrklKvPrivateEndpointName')), 'service', 'vault', 'privateDnsZoneGroupName', split(reference(subscriptionResourceId('Microsoft.Resources/deployments', format('Networking-{0}', parameters('time'))), '2022-09-01').outputs.KeyVaultDnsZoneResourceId.value, '/')[8], 'privateDnsZoneResourceIds', createArray(if(parameters('createPrivateDnsZones'), reference(subscriptionResourceId('Microsoft.Resources/deployments', format('Networking-{0}', parameters('time'))), '2022-09-01').outputs.KeyVaultDnsZoneResourceId.value, parameters('avdVnetPrivateDnsZoneKeyvaultId')))))), createObject('value', createArray()))]", "secrets": "[if(not(equals(parameters('avdIdentityServiceProvider'), 'EntraID')), createObject('value', createArray(createObject('name', 'vmLocalUserPassword', 'value', parameters('avdVmLocalUserPassword'), 'contentType', 'Session host local user credentials'), createObject('name', 'vmLocalUserName', 'value', parameters('avdVmLocalUserName'), 'contentType', 'Session host local user credentials'), createObject('name', 'domainJoinUserName', 'value', parameters('avdDomainJoinUserName'), 'contentType', 'Domain join credentials'), createObject('name', 'domainJoinUserPassword', 'value', parameters('avdDomainJoinUserPassword'), 'contentType', 'Domain join credentials'))), createObject('value', createArray(createObject('name', 'vmLocalUserPassword', 'value', parameters('avdVmLocalUserPassword'), 'contentType', 'Session host local user credentials'), createObject('name', 'vmLocalUserName', 'value', parameters('avdVmLocalUserName'), 'contentType', 'Session host local user credentials'), createObject('name', 'domainJoinUserName', 'value', 'NoUsername', 'contentType', 'Domain join credentials'), createObject('name', 'domainJoinUserPassword', 'value', 'NoPassword', 'contentType', 'Domain join credentials'))))]", "tags": "[if(parameters('createResourceTags'), createObject('value', union(variables('varCustomResourceTags'), variables('varAvdDefaultTags'), variables('varWorkloadKeyvaultTag'))), createObject('value', union(variables('varAvdDefaultTags'), variables('varWorkloadKeyvaultTag'))))]" }, diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep index 9f6feb90c..29c4eae7e 100644 --- a/workload/bicep/deploy-baseline.bicep +++ b/workload/bicep/deploy-baseline.bicep @@ -1229,8 +1229,7 @@ module wrklKeyVault '../../avm/1.0.0/res/key-vault/vault/main.bicep' = { ipRules: [] } : {} - privateEndpoints: deployPrivateEndpointKeyvaultStorage - ? [ + privateEndpoints: deployPrivateEndpointKeyvaultStorage? [ { name: varWrklKvPrivateEndpointName subnetResourceId: createAvdVnet @@ -1238,13 +1237,12 @@ module wrklKeyVault '../../avm/1.0.0/res/key-vault/vault/main.bicep' = { : existingVnetPrivateEndpointSubnetResourceId customNetworkInterfaceName: 'nic-01-${varWrklKvPrivateEndpointName}' service: 'vault' - privateDnsZoneGroup: { - privateDNSResourceIds: [ + privateDnsZoneGroupName: split(networking.outputs.KeyVaultDnsZoneResourceId, '/')[8] + privateDnsZoneResourceIds: [ createPrivateDnsZones ? networking.outputs.KeyVaultDnsZoneResourceId : avdVnetPrivateDnsZoneKeyvaultId - ] - } + ] } - ] + ] : [] secrets: (avdIdentityServiceProvider != 'EntraID') ? [ diff --git a/workload/scripts/DSCStorageScripts/1.0.1/DSCStorageScripts.zip b/workload/scripts/DSCStorageScripts/1.0.1/DSCStorageScripts.zip index 2111475ab9493b24defd416ed91eb2209fe1ed35..7aa71861efbdcad2c2104f873a199273de29f75b 100644 GIT binary patch delta 22380 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 delta 2057 zcmV+k2=@2vybAK31&}@i8f*!HLA5~v$UC>begc*Rx1T@(#sQc6kOC){zJ3B1w>gml z83GMpYD-xF000000000?mtT_tC*kX@pX6wCsm}isVEFjM4;?13l;V7a|IWDPMxkjESG; z#+j7pSKNh(3r+?258jQSq}n;UPB5e0p2EK3ibI1G?-&!>80`+Y#=tgj8ztp#*rDj# z=vY}(vLk=j!@wL?^16cQ^kuT1%85_kiu~UB4(_7ZEP2)m?7}4C)QZJ2Czc&RIV!jI` zL`I^J4P>NYiPe)>!LCLi+umKA!fGLc1*}9A8O(nIkiI^uuGbh$kh0Ghv;j5(NFZfY z3O@oinv!aJPmqBC!(}3oxM~Sfmb?j#R&QXJ<*{4cQx%5G=`>wD9N6s34{qm-f5|Wy z-LZenS&CH!TuX#`+t+6ayA%<|061rwrCtr&8~E4aS$hBFZLn+xc@p zVp^LJ#-vy#STvN=hTq`h0!yW9_k4xcFJ7LkxUivvhg<8`2UW3NE-{o}n?{QH;nT2%E-*P=v7y-QJBA3~rI^;M!Ni zaNGRXQbXka%-KpsiRRYt^5URb7ft9-+xjF23x<8p7j~9(d#i3rN}le zcLpoRo_V!V&-I`l&g!wVYiJm)t@eS~mSwcO5c7eg7}<9up>OVL*rc_aTWViT*9m|2 zWJOrpmu+yzYR+PDV=4)Y&SQ}d1eKt9CXj@}96j%{aWSUuid=bgoi8dfiA-y>?1fEw zmbOo`|2~so*Y(-5s!`>+n!fHS*O~&!@v{J17Cpn7UdvKL{Z9!v%#^@{5sc3vF*Q3k z%E^-(IQEYJGXeEqA4C5~VH5Hh%c6hup19feZ`Bz$=c$>Fjra_hT+wO3ixv)2BB4v1!c4 zw{82axS&CdATM@PY;-Wj$Z>~24>Z~p6_d(Q5dck5WzeyKQ7OEC|9yRqL@<8{wn)qz zGM!XnH<%f=33A0W+*Q!nKE?K@R@OEiEe6oSlTCqQE;_>|zi#`%4s}WsKlgs#fmP1c zE!`%7j}qfFTBFZUiHvt`xoe$kZ0oEhhv2-)@cF>>2A>)fb80OS?Jf*CfHIg_Ss?tK z(_M*CxXvB)>1p)w2yb*7`#^t$-?W0xXTIKdO!rs0@u0&nF$a+iR5ayI@EU_+oYK)l z(E3{P^lj7fiZh_(2=9VLnIW0o(%XIX51tK@RyvigxnbqLxihNly`sJ73O$LCey04o zG;$(dpt$L`ScGsRzA9Yd5=$CC_-l<*vUh6QOS*dUunZxWnJIVT_qTrlI1kS=T5*E> z2^}Yo37sMdt>3-_btBb8OKB8mAeBFa&7SZE&MoQmJI09VWJA zw%kD8$(v12zNBce-FQy7eU{>ISg&7Fwm`GGB@PW2ubQ|Rz2fY!EZR6pi1 z>LJMvOcs>0@!L+zFe%+nZ}0U>1-8jU4~eq}-1=%@Zx8HwHaf?OE}z$}xnU`njd+t# zCVR}G!Y&SRWY#Z(^iiZ^2+D~u zExHH*08E!^oB~k;8f*!XK@^wlodOJ(pq&B)m*SiPIG4VD0vDI;odOJ(pq&C916x7? zm%*I^6qmk!0vDI;odOIYU}{TQ%84;8x(EOOOdS9K8~`8y0000000000wt=!l0hbw` n0wM<#Yzb!-YzdJ;6c$iR1qJ{B000C41OSEs007oa0RR91==svE diff --git a/workload/scripts/DSCStorageScripts/1.0.1/Script-DomainJoinStorage.ps1 b/workload/scripts/DSCStorageScripts/1.0.1/Script-DomainJoinStorage.ps1 index 95a621f88..dedc11eb4 100644 --- a/workload/scripts/DSCStorageScripts/1.0.1/Script-DomainJoinStorage.ps1 +++ b/workload/scripts/DSCStorageScripts/1.0.1/Script-DomainJoinStorage.ps1 @@ -63,7 +63,7 @@ $ErrorActionPreference = "Stop" . (Join-Path $ScriptPath "Logger.ps1") -if ($IdentityServiceProvider -ne 'AAD') { +if ($IdentityServiceProvider -ne 'EntraID') { Write-Log "Forcing group policy updates" gpupdate /force /wait:0 @@ -171,7 +171,7 @@ Try { icacls ${DriveLetter}: /remove "BUILTIN\Users" Write-Log "ACLs set" #AVD group permissions - if ($SecurityPrincipalName -eq 'none' -or $IdentityServiceProvider -eq 'AAD') { + if ($SecurityPrincipalName -eq 'none' -or $IdentityServiceProvider -eq 'EntraID') { Write-Log "AD group not provided or using Microsoft Entra ID joined session hosts, ACLs for AD group not set" } else {