From b9b9de2a384b78676c5f098b19ed44dd302f0c2f Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:44:32 -0500 Subject: [PATCH 01/13] Add local test ignores --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8dd22420f..2d42a350b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,4 +55,8 @@ Deploy-Baseline.ps1 workload/bicep/parameters/deploy-baseline-parameters-MSA.json # local test files -localTest \ No newline at end of file +localTest + +# Ignore files that might be used for local testing +/workload/bicep/*.json +/workload/bicep/*.bicepparam From 014b900cbe631130f27338b731958decfa1ae00b Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:19:29 -0500 Subject: [PATCH 02/13] Update casing in file name --- ...{script-domainjoinstorage.ps1 => Script-DomainJoinStorage.ps1} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename workload/scripts/DSCStorageScripts/{script-domainjoinstorage.ps1 => Script-DomainJoinStorage.ps1} (100%) diff --git a/workload/scripts/DSCStorageScripts/script-domainjoinstorage.ps1 b/workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 similarity index 100% rename from workload/scripts/DSCStorageScripts/script-domainjoinstorage.ps1 rename to workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 From 17a183d184b62d3d10f36c21549eb531a47e6fa3 Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:22:33 -0500 Subject: [PATCH 03/13] Disable deleting drive mapping. Update zip. --- workload/scripts/DSCStorageScripts.zip | Bin 82678 -> 82703 bytes .../Script-DomainJoinStorage.ps1 | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/workload/scripts/DSCStorageScripts.zip b/workload/scripts/DSCStorageScripts.zip index da77018698fd4c91f7e22a6d759c4d42fdfc738b..031ee38067c523f6c33853b2aac78aa7d4dc6fc8 100644 GIT binary patch delta 2414 zcmV-!36b{pg$0j>1%R{x+&E);qFz@HU&`g@2mk`~VP|D7aC0%`S#59I$PxbR0QnCCTBzjKWMU%;il8aLN^(wjwk4QK(ra@# ztjU$M7mCa5l9uJv|Gk$#IRO`cUv{5A+XRI#wbtgv{jV&q0C8Hji~e7KEsO{F63K(n?Es8&}RHrk+VS% zTtgw@9O*gFk!KR<9l%m#Wx@9lG%A=X{3zu-2Ok+jW{HM3FA2N>KP^>8@NzbTPa;d? zO2bSjzG7(_00HsBKjp=ddxz0K6DbG3da!}J50mm7wZeauxFBQvVaCo=RO^W7jiin; zT_6JbF8)H{)`O^0r*GOITgx@OiI$j zY@Wy!ZdmX%Z3j6FUIq6+gjazJI(_fLs>t5A4*j;0>dU?B&bXE(uDFr>{F#_R?|ak( zKK}~ca4?9vd+-h8yLO;X2Ayemb%ZCRe^{R@k-*Xj#S`6s>9`O75c#o;8HGCrIeO0T zFGQM*3cdsv;giV5_?eXGSKNgO2wnsDkHM9oZvkW@V7vJByzzAm^86rs(cfm?i@g9Y@yOMunQ(q$`tCT!hz|$Fl$_!r2~UKl_2c7 zf++UkEDEQ<63lji#KuSza)C@WEU^j_C%DxJeXl)Fp31qZ1C?G8?|CT61K^!$Rs>tv!65RF2T?Gk1MoJR zDPXv&AU$$~9}axOR1sNCDbs2%Gx*8IQPyJck?SwFzNNie-)^LwQ~J7kpY^$@ATwZ_xQQu*r%GTUv3rc5b~>73bv| zLsjfqjTLRsm>n!toF(h}M8cE6cujG1YGxgAy;acqGRshX6Mz!aC`04~giGT}D8jgf zet6{sgI^^(`0mvxxoP6J1 zo7)<;Y3*A}-K*(3=g_Uf+P&<8KUQ;=i7Qh{So$Fo#XwLAnwJ7eD6#0aTgJthx+`*j zpgfHQ^zVh$$4C_=52V$W1Y~)_OMUfn!toKND&H^}+T35Kjr8u`(^b z6Hum%>>~XwB{oyxO>ZR?4nztAk;DUk&QXPusbgg)$PL1l1ZO&xb8+c-urt7Mh#zCE zK(c-Z-JiQg)OU9;^>?@a-EOTh{0W&y+`bL9?GY?A1`O($W}fX(Yh`X^YLh_s^XD%7 zscja=w_W$Gy2U|^*jCahc2O9oh<=2kcwas z-yks)4|J%x+hE4yHpmsza9crR`xJYtt(v*`@ywiLCc+ zd)GKuzjoyS5lYO8bd5ekB}%^MYH8<##-7n>@(#QgCH{VE8jsH{ig{c87VWMKc?)$g zv$8_?iPMFOQFxnw=+na}=pOEW*=ubw5#ACHHKbqo`oJ@-W!(k}Q!p_HsS8vz(rzpTx(h!-nvnmLvt+$mpGuJDORjUS@5#t}R?F}*9@PX$=YkoL@f2tA4VHvl+n z&r4cyjAR8p&&Grww76E^GIO65IJq`+l`;oBlRh-rVt6d8GUXqoU5hK=I)7j=_op;l3<7-W-*TG z+oAbF*}CKX?ZfDJIy(K_EI@bdoGX^mni2Nonki%mpEC9?DJ+r%`IX7SOfZoUhhKqaZufWZrr1P9apyhpN1`onanu0 z6~ym%PeI|JdwbXnE1|^3x!sTef|Z(1>_o&$YB?)lh=rZOXmbIhxjn#z)P>#$V+$Q- z1JD`QjPj0QNV=T9xzw)}&NfSF+dT)|`DS3R-@5Z`HPVT$JKn@>qa0+LL@`-mPscVs zcalQIVY~1{*#GG+E#O3AZ+Opn%!qJB0W&62I@H~E5{4HEj==?QYGg&0nM-`{5jp?x z%=-^={oj|`K>^4OdZJ!e4qwXU=Li4*YL~A<0TnV+V{&P5bS*@0ZDDC{N^fayQ*>`~ gVP|D7aC0$GO9ci10000400aOA0RRB=K>+{&0NEI#YybcN delta 2384 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 C?1yOp diff --git a/workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 b/workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 index bda935181..4a8380c8b 100644 --- a/workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 +++ b/workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1 @@ -182,7 +182,8 @@ Try { Write-Log "Unmounting drive" # Remove-PSDrive -Name $DriveLetter -Force - net use ${DriveLetter} /delete + # HACK: Disabled because it fails + #net use ${DriveLetter} /delete Write-Log "Drive unmounted" } Catch { From 9d5c5bdafa1368f0322a782cad76551e959ccc2a Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Mon, 30 Oct 2023 20:48:59 -0500 Subject: [PATCH 04/13] Enclose SecurityPrincipalName in `"` Delete unused variables to avoid Bicep warnings Bicep linting --- .../bicep/modules/storageAzureFiles/deploy.bicep | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workload/bicep/modules/storageAzureFiles/deploy.bicep b/workload/bicep/modules/storageAzureFiles/deploy.bicep index 0eb4c9cc3..ce8bada79 100644 --- a/workload/bicep/modules/storageAzureFiles/deploy.bicep +++ b/workload/bicep/modules/storageAzureFiles/deploy.bicep @@ -99,7 +99,6 @@ param storageAccountFqdn string // Variable declaration // // =========== // var varAzureCloudName = environment().name -var varStoragePurposeLower = toLower(storagePurpose) var varAvdFileShareLogsDiagnostic = [ 'allLogs' ] @@ -107,9 +106,10 @@ var varAvdFileShareMetricsDiagnostic = [ 'Transaction' ] var varWrklStoragePrivateEndpointName = 'pe-${storageAccountName}-file' -var varDirectoryServiceOptions = (identityServiceProvider == 'AADDS') ? 'AADDS': (identityServiceProvider == 'AAD') ? 'AADKERB': 'None' -var varSecurityPrincipalName = !empty(securityPrincipalName)? securityPrincipalName : 'none' -var varStorageToDomainScriptArgs = '-DscPath ${dscAgentPackageLocation} -StorageAccountName ${storageAccountName} -StorageAccountRG ${storageObjectsRgName} -StoragePurpose ${storagePurpose} -DomainName ${identityDomainName} -IdentityServiceProvider ${identityServiceProvider} -AzureCloudEnvironment ${varAzureCloudName} -SubscriptionId ${workloadSubsId} -DomainAdminUserName ${domainJoinUserName} -CustomOuPath ${storageCustomOuPath} -OUName ${ouStgPath} -ShareName ${fileShareName} -ClientId ${managedIdentityClientId} -SecurityPrincipalName ${varSecurityPrincipalName} -StorageAccountFqdn ${storageAccountFqdn} ' +var varDirectoryServiceOptions = (identityServiceProvider == 'AADDS') ? 'AADDS' : (identityServiceProvider == 'AAD') ? 'AADKERB' : 'None' +var varSecurityPrincipalName = !empty(securityPrincipalName) ? securityPrincipalName : 'none' +var varStorageToDomainScriptArgs = '-DscPath ${dscAgentPackageLocation} -StorageAccountName ${storageAccountName} -StorageAccountRG ${storageObjectsRgName} -StoragePurpose ${storagePurpose} -DomainName ${identityDomainName} -IdentityServiceProvider ${identityServiceProvider} -AzureCloudEnvironment ${varAzureCloudName} -SubscriptionId ${workloadSubsId} -DomainAdminUserName ${domainJoinUserName} -CustomOuPath ${storageCustomOuPath} -OUName ${ouStgPath} -ShareName ${fileShareName} -ClientId ${managedIdentityClientId} -SecurityPrincipalName "${varSecurityPrincipalName}" -StorageAccountFqdn ${storageAccountFqdn} ' + // =========== // // Deployments // // =========== // @@ -136,7 +136,7 @@ module storageAndFile '../../../../carml/1.3.0/Microsoft.Storage/storageAccounts activeDirectoryProperties: (identityServiceProvider == 'AAD') ? { domainGuid: identityDomainGuid domainName: identityDomainName - }: {} + } : {} } accessTier: 'Hot' networkAcls: deployPrivateEndpoint ? { @@ -172,7 +172,7 @@ module storageAndFile '../../../../carml/1.3.0/Microsoft.Storage/storageAccounts privateDnsZoneGroup: { privateDNSResourceIds: [ vnetPrivateDnsZoneFilesId - ] + ] } } ] : [] From 9498946ffee3eed0e3e7ed64bb79851604973d3a Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:09:48 -0500 Subject: [PATCH 05/13] Support `|` and other special chars in domain pwd Remove unnecessary variables to avoid Bicep warnings Avoid duplication of file names by creating variables Bicep linting --- workload/bicep/deploy-baseline.bicep | 23 ++++++++++--------- .../.bicep/azureFilesDomainJoin.bicep | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep index aca95b71b..71b55bf27 100644 --- a/workload/bicep/deploy-baseline.bicep +++ b/workload/bicep/deploy-baseline.bicep @@ -486,7 +486,6 @@ var varSessionHostLocationAcronym = varLocations[varSessionHostLocationLowercase var varManagementPlaneLocationAcronym = varLocations[varManagementPlaneLocationLowercase].acronym var varLocations = loadJsonContent('../variables/locations.json') var varTimeZoneSessionHosts = varLocations[varSessionHostLocationLowercase].timeZone -var varTimeZoneManagementPlane = varLocations[varManagementPlaneLocationLowercase].timeZone var varManagementPlaneNamingStandard = '${varDeploymentPrefixLowercase}-${varDeploymentEnvironmentLowercase}-${varManagementPlaneLocationAcronym}' var varComputeStorageResourcesNamingStandard = '${varDeploymentPrefixLowercase}-${varDeploymentEnvironmentLowercase}-${varSessionHostLocationAcronym}' var varDiskEncryptionSetName = avdUseCustomNaming ? '${ztDiskEncryptionSetCustomNamePrefix}-${varComputeStorageResourcesNamingStandard}-001' : 'des-zt-${varComputeStorageResourcesNamingStandard}-001' @@ -538,10 +537,10 @@ var varZtKvPrivateEndpointName = 'pe-${varZtKvName}-vault' // var varFslogixSharePath = '\\\\${varFslogixStorageName}.file.${environment().suffixes.storage}\\${varFslogixFileShareName}' var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/' -var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/Set-SessionHostConfiguration.ps1' -var varSessionHostConfigurationScript = './Set-SessionHostConfiguration.ps1' +var varSessionHostConfigurationScriptFileName = 'Set-SessionHostConfiguration.ps1' +var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/${varSessionHostConfigurationScriptFileName}' +var varSessionHostConfigurationScript = './${varSessionHostConfigurationScriptFileName}' var varDiskEncryptionKeyExpirationInEpoch = dateTimeToEpoch(dateTimeAdd(time, 'P${string(diskEncryptionKeyExpirationInDays)}D')) -var varAvdAgentPackageLocation = 'https://wvdportalstorageblob.blob.${environment().suffixes.storage}/galleryartifacts/Configuration_09-08-2022.zip' var varCreateStorageDeployment = (createAvdFslogixDeployment || createMsixDeployment == true) ? true : false var varFslogixStorageSku = zoneRedundantStorage ? '${fslogixStoragePerformance}_ZRS' : '${fslogixStoragePerformance}_LRS' var varMsixStorageSku = zoneRedundantStorage ? '${msixStoragePerformance}_ZRS' : '${msixStoragePerformance}_LRS' @@ -753,9 +752,11 @@ var varMarketPlaceGalleryWindows = { version: 'latest' } } -var varStorageAzureFilesDscAgentPackageLocation = 'https://github.com/Azure/avdaccelerator/raw/main/workload/scripts/DSCStorageScripts.zip' -var varStorageToDomainScriptUri = '${varBaseScriptUri}scripts/Manual-DSC-Storage-Scripts.ps1' -var varStorageToDomainScript = './Manual-DSC-Storage-Scripts.ps1' + +var varStorageAzureFilesDscAgentPackageLocation = '${varBaseScriptUri}scripts/DSCStorageScripts.zip' +var varStorageToDomainScriptFileName = 'Manual-DSC-Storage-Scripts.ps1' +var varStorageToDomainScriptUri = '${varBaseScriptUri}scripts/${varStorageToDomainScriptFileName}' +var varStorageToDomainScript = './${varStorageToDomainScriptFileName}' var varOuStgPath = !empty(storageOuPath) ? '"${storageOuPath}"' : '"${varDefaultStorageOuPath}"' var varDefaultStorageOuPath = (avdIdentityServiceProvider == 'AADDS') ? 'AADDC Computers' : 'Computers' var varStorageCustomOuPath = !empty(storageOuPath) ? 'true' : 'false' @@ -960,7 +961,7 @@ module managementPLane './modules/avdManagementPlane/deploy.bicep' = { startVmOnConnect: (avdHostPoolType == 'Pooled') ? avdDeployScalingPlan : avdStartVmOnConnect workloadSubsId: avdWorkloadSubsId identityServiceProvider: avdIdentityServiceProvider - securityPrincipalIds: !empty(securityPrincipalId)? array(securityPrincipalId): [] + securityPrincipalIds: !empty(securityPrincipalId) ? array(securityPrincipalId) : [] tags: createResourceTags ? union(varCustomResourceTags, varAvdDefaultTags) : varAvdDefaultTags alaWorkspaceResourceId: avdDeployMonitoring ? (deployAlaWorkspace ? monitoringDiagnosticSettings.outputs.avdAlaWorkspaceResourceId : alaExistingWorkspaceResourceId) : '' hostPoolAgentUpdateSchedule: varHostPoolAgentUpdateSchedule @@ -987,7 +988,7 @@ module identity './modules/identity/deploy.bicep' = { enableStartVmOnConnect: avdStartVmOnConnect identityServiceProvider: avdIdentityServiceProvider createStorageDeployment: varCreateStorageDeployment - securityPrincipalIds: !empty(securityPrincipalId)? array(securityPrincipalId): [] + securityPrincipalIds: !empty(securityPrincipalId) ? array(securityPrincipalId) : [] tags: createResourceTags ? union(varCustomResourceTags, varAvdDefaultTags) : varAvdDefaultTags } dependsOn: [ @@ -1167,7 +1168,7 @@ module fslogixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if deployPrivateEndpoint: deployPrivateEndpointKeyvaultStorage ouStgPath: varOuStgPath managedIdentityClientId: varCreateStorageDeployment ? identity.outputs.managedIdentityStorageClientId : '' - securityPrincipalName: !empty(securityPrincipalName)? securityPrincipalName: '' + securityPrincipalName: !empty(securityPrincipalName) ? securityPrincipalName : '' domainJoinUserName: avdDomainJoinUserName wrklKvName: varWrklKvName serviceObjectsRgName: varServiceObjectsRgName @@ -1210,7 +1211,7 @@ module msixAzureFilesStorage './modules/storageAzureFiles/deploy.bicep' = if (cr deployPrivateEndpoint: deployPrivateEndpointKeyvaultStorage ouStgPath: varOuStgPath managedIdentityClientId: varCreateStorageDeployment ? identity.outputs.managedIdentityStorageClientId : '' - securityPrincipalName: !empty(securityPrincipalName)? securityPrincipalName: '' + securityPrincipalName: !empty(securityPrincipalName) ? securityPrincipalName : '' domainJoinUserName: avdDomainJoinUserName wrklKvName: varWrklKvName serviceObjectsRgName: varServiceObjectsRgName diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index f5878b553..a85712fdc 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -24,7 +24,7 @@ param domainJoinUserPassword string // Variable declaration // // =========== // -var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword ${domainJoinUserPassword} -verbose' +var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose' // =========== // // Deployments // From 739242cfc3b71abd87f4dbafcad4d0af2ea741f8 Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:30:20 -0500 Subject: [PATCH 06/13] updates --- workload/bicep/deploy-baseline.bicep | 3 ++- workload/bicep/modules/networking/deploy.bicep | 8 ++++++++ .../storageAzureFiles/.bicep/azureFilesDomainJoin.bicep | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep index 71b55bf27..657309c43 100644 --- a/workload/bicep/deploy-baseline.bicep +++ b/workload/bicep/deploy-baseline.bicep @@ -536,7 +536,7 @@ var varZtKvName = avdUseCustomNaming ? '${ztKvPrefixCustomName}-${varComputeStor var varZtKvPrivateEndpointName = 'pe-${varZtKvName}-vault' // var varFslogixSharePath = '\\\\${varFslogixStorageName}.file.${environment().suffixes.storage}\\${varFslogixFileShareName}' -var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/' +var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/complex-adjoin-pw/workload/' var varSessionHostConfigurationScriptFileName = 'Set-SessionHostConfiguration.ps1' var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/${varSessionHostConfigurationScriptFileName}' var varSessionHostConfigurationScript = './${varSessionHostConfigurationScriptFileName}' @@ -914,6 +914,7 @@ module networking './modules/networking/deploy.bicep' = if (createAvdVnet || cre vnetPeeringName: varVnetPeeringName remoteVnetPeeringName: varRemoteVnetPeeringName vnetAvdSubnetName: varVnetAvdSubnetName + existingPeSubnetResourceId: existingVnetPrivateEndpointSubnetResourceId vnetPrivateEndpointSubnetName: varVnetPrivateEndpointSubnetName createVnetPeering: varCreateVnetPeering deployPrivateEndpointSubnet: (deployPrivateEndpointKeyvaultStorage == true) ? true : false //adding logic that will be used when also including AVD control plane PEs diff --git a/workload/bicep/modules/networking/deploy.bicep b/workload/bicep/modules/networking/deploy.bicep index eea5a9e45..45463528f 100644 --- a/workload/bicep/modules/networking/deploy.bicep +++ b/workload/bicep/modules/networking/deploy.bicep @@ -15,6 +15,9 @@ param deployAsg bool @sys.description('Existing virtual network subnet for AVD.') param existingAvdSubnetResourceId string +@sys.description('Existing virtual network subnet for private endpoints.') +param existingPeSubnetResourceId string + @sys.description('Resource Group Name for the AVD session hosts') param computeObjectsRgName string @@ -105,11 +108,16 @@ var varVirtualNetworkLogsDiagnostic = varAzureCloudName == 'AzureUSGovernment' ? var varVirtualNetworkMetricsDiagnostic = [ 'AllMetrics' ] + var varCreateAvdStaicRoute = true var varExistingAvdVnetSubId = !createVnet ? split(existingAvdSubnetResourceId, '/')[2] : '' var varExistingAvdVnetSubRgName = !createVnet ? split(existingAvdSubnetResourceId, '/')[4] : '' var varExistingAvdVnetName = !createVnet ? split(existingAvdSubnetResourceId, '/')[8] : '' var varExistingAvdVnetResourceId = !createVnet ? '/subscriptions/${varExistingAvdVnetSubId}/resourceGroups/${varExistingAvdVnetSubRgName}/providers/Microsoft.Network/virtualNetworks/${varExistingAvdVnetName}' : '' +//var varExistingPeVnetSubId = split(existingPeSubnetResourceId, '/')[2] +//var varExistingPeVnetSubRgName = split(existingPeSubnetResourceId, '/')[4] +//var varExistingAPeVnetName = split(existingPeSubnetResourceId, '/')[8] +//var varExistingPeVnetResourceId = '/subscriptions/${varExistingPeVnetSubId}/resourceGroups/${varExistingPeVnetSubRgName}/providers/Microsoft.Network/virtualNetworks/${varExistingAPeVnetName}' // =========== // // Deployments // // =========== // diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index a85712fdc..a6f53db9f 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -24,7 +24,8 @@ param domainJoinUserPassword string // Variable declaration // // =========== // -var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose' +var escapedDomainJoinUserPassword = replace(domainJoinUserPassword, '"', '""') +var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${escapedDomainJoinUserPassword}" -verbose' // =========== // // Deployments // From 24134fe63bc3090c04b212a4df63e151e9565b10 Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Tue, 31 Oct 2023 19:52:41 -0500 Subject: [PATCH 07/13] Update azureFilesDomainJoin.bicep --- .../storageAzureFiles/.bicep/azureFilesDomainJoin.bicep | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index a6f53db9f..2c25f10ec 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -24,8 +24,10 @@ param domainJoinUserPassword string // Variable declaration // // =========== // -var escapedDomainJoinUserPassword = replace(domainJoinUserPassword, '"', '""') -var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${escapedDomainJoinUserPassword}" -verbose' +//var escapedDomainJoinUserPassword = replace(domainJoinUserPassword, '"', '""') +//var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "" -verbose' +var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose' + // =========== // // Deployments // From e74b1372ef2cff79b87732c6eb0e3c77c907e1fc Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:25:30 -0500 Subject: [PATCH 08/13] Update azureFilesDomainJoin.bicep --- .../storageAzureFiles/.bicep/azureFilesDomainJoin.bicep | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index 2c25f10ec..215f60185 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -16,7 +16,7 @@ param file string @sys.description('Arguments for domain join script.') param scriptArguments string -@secure() +//@secure() //testing change back @sys.description('Domain join user password.') param domainJoinUserPassword string @@ -49,3 +49,6 @@ resource dscStorageScript 'Microsoft.Compute/virtualMachines/extensions@2022-08- } } } + + +output djpwtest string = varscriptArgumentsWithPassword //testing change back From 635e173463869a6870a33c868097d6fa7fd3d886 Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:44:13 -0500 Subject: [PATCH 09/13] Update azureFilesDomainJoin.bicep --- .../storageAzureFiles/.bicep/azureFilesDomainJoin.bicep | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index 215f60185..02e231308 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -16,7 +16,7 @@ param file string @sys.description('Arguments for domain join script.') param scriptArguments string -//@secure() //testing change back +@secure() @sys.description('Domain join user password.') param domainJoinUserPassword string @@ -24,8 +24,6 @@ param domainJoinUserPassword string // Variable declaration // // =========== // -//var escapedDomainJoinUserPassword = replace(domainJoinUserPassword, '"', '""') -//var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "" -verbose' var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose' @@ -50,5 +48,3 @@ resource dscStorageScript 'Microsoft.Compute/virtualMachines/extensions@2022-08- } } - -output djpwtest string = varscriptArgumentsWithPassword //testing change back From 760280300c65cdcd715e63d387d9c47ae09e9d41 Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Wed, 1 Nov 2023 08:38:35 -0500 Subject: [PATCH 10/13] Update .gitignore --- .gitignore | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d42a350b..8dd22420f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,8 +55,4 @@ Deploy-Baseline.ps1 workload/bicep/parameters/deploy-baseline-parameters-MSA.json # local test files -localTest - -# Ignore files that might be used for local testing -/workload/bicep/*.json -/workload/bicep/*.bicepparam +localTest \ No newline at end of file From ee020f06756e3b96e3e1964eebdefdfa1fe6a0b6 Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:02:46 -0600 Subject: [PATCH 11/13] updates --- .../.bicep/azureFilesDomainJoin.bicep | 5 ++--- workload/scripts/DSCStorageScripts.zip | Bin 82676 -> 84870 bytes 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep index 0fa9875fb..c840ceb29 100644 --- a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep +++ b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep @@ -19,13 +19,12 @@ param scriptArguments string @secure() @sys.description('Domain join user password.') param adminUserPassword string -param domainJoinUserPassword string // =========== // // Variable declaration // // =========== // -var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose' +var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(adminUserPassword, '"', '""')}" -verbose' // =========== // @@ -44,7 +43,7 @@ resource dscStorageScript 'Microsoft.Compute/virtualMachines/extensions@2022-08- settings: {} protectedSettings: { fileUris: array(baseScriptUri) - commandToExecute: 'powershell -ExecutionPolicy Unrestricted -File ${file} ${scriptArguments} -AdminUserPassword ${adminUserPassword} -verbose' + commandToExecute: 'powershell -ExecutionPolicy Unrestricted -File ${file} ${varscriptArgumentsWithPassword} -verbose' } } } diff --git a/workload/scripts/DSCStorageScripts.zip b/workload/scripts/DSCStorageScripts.zip index 76c0bce424c9d1ed0e23cca2a18881bfacf7dacd..6a29d544dc45e159d9aafc2b44c0f06a298e1c33 100644 GIT binary patch delta 19261 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 delta 17109 zcmZU4bx__hvo6pg1q#KXxVyW%I}~?!*BATYF2x-R6f4Eu-QC^Yofqf!JLjI6JLe`7 znI!xCkx8<)R+s%)P`Y#g!oUv`ZtzpCk=^Jn~1<9 zR68U~B2;@Bg(g%BJBAU?gD9xs`s90&A)~IiVioZ{=+~=~haXG!338FQyvT#Z!5@OeO~D1UBo-GanUy(VPnkv6zlryCRo0TdAR- z+Z&p0*4KzdP$y^*yJ<+tsNA_Bg~ROLlR2uE-VgYU!HzXqK{~i$e5#O9YsQ>Hz2ov@ zqiHA_Iwg?t@#qw>?2~&=N(!C@0-yA`#U1f0N0a)T~LBC ztKKdT?{n!U56g%`+l&=7Cwd@JK4Cn36bT}okxu5_F|flhTwmOQP8&SPU24OX+xZGX zaX$~rVt)D(1KKW}W(d=-UcJNOnQ+#W0@Dr8h4Jr6Oq^wA*e|xi+mCjSP@~u%_8vYxZ*Csgj6~ z9k@L^*KJe!$ufAKB@%e^edy()cKFD?Dw9$RKKn*_4~T?*@eIJ%_UQQ|j^p2UDBbG% zVz(`1=RUCMd1df;fxSyP5Y_4V^8nxvb8ACo{0bG)wwe?9F`c2yj@CurL=QF2&rR$ja%1m0Oh-oGZZ_s zUB4}EzWBi8B2a(osQyD}$wCGUg)3I<<271u{!uoFiFqczVs%}i7o{1!!0=Pc(nPBz zA9?d>dwo4M4gIcW?@g`q-z5^fhI!kX1@2(pd^<06T{gYkKkPd%vQGbRN4N1`XI)hz z&UNJY$dNo73W%Vbc6 zOCFhe&A0Qe_{E!2-Bh7m2tKx2ZnUz=ZR{5x(md&;OgMLbl9=>UoqxrZ;xR>DjpjBkxbyb!}Yq+?7K^L zkqt)7`-{BmB^RtfmZaqnCeEI4*o;kb`qlackM4XiYV1)C%hFs-2Sj(V1|mRVFgKj* zd59Fy<65}TgQfSyyIyb`<-V{U8^HunVXW#~Xc@nVKsd9{e5&mKdN+NPm>7hKSo&7o zK9qCPIG)Kh`FS-=kvw=w;x*wgrFxN!&$|t6r%JB=?T@6-c=ZRZ!&dHnI4i}6bmFfM zeUGP##q86ER`cSE>&bI-<`2EZjYF`*_ne6Y!Gl-kf$H4tN6OxrzAK}u?bvdli1lhi z!U>~o-H4Q&4Wy*o85Un1F-ObM#+?FrBgE@>ioLsfsdbmAdsCNr%eEo7kR^$wkBR6? z+lcArNJa_%9Jub>IJuF;7)Sn7?~5)Udsbu;X|Wiw9%j&+C>WK;;sb&3lzZ?&^D6gI zGmg0f^a5BqzMx6_-B-WQ*t`P6vO>A~fi8YiJKxpVQoB73Xj$4TkKaHewOKk(ElJF_ zGM4!3cLV|X=0C4PCM#sO)}XZ01EqPiPQ;^1pb~(7m)8lGy2oIF#oxUdD1RO7AaP$u6nr>iIJ_-Dqur4y3tyd{E<1l16%?yXwen!;ag87!0OF4cvL zdW{yb6el3X?Bcw3TPOfW1CsawA~BV5T-o zR?*=^{GOv5OFARVBwlf7b*&=K1MyEHksliu(#IH3dAI#4EulC1v>i@Djm$(?!-6@3Ts@(Eh6Q=5tRZe zxq|e&x0K(yZ_7)TfV)os#1lk)hPZRBW<7Yt2Km`#k=D-nt3iJ;@Nsuohx2|quM4}O z2DHSyt)Kl_J!J%*9f0RkAnaq1@WXLb;BCM2wO{6Caq~e(;Qj4Z0|$6JE&g~K6!g*l zm~(y2yplOJ(7UlBY&c+e6Wh$OdbQ5IE&jNd_U?Qy>L@#j10FYl*IvSpD*fE5MjAaz z@;SX1-Q304<5{|yKl!~HO}Q`M-oPIK#Hjnyt;<~-Ibd)prVc5+Qn{08uwjOAUu;lx z{U-l$ec0&(+SwGmaGbFKY%)9F2XpZOT{N$>-v|xsT{9;KdYvtr&O_D|#w_n%lg&Ujehep{v>XY%0(OP62XVScM$l zB8k-l2vpB`9%`s$_*l`W(j)Z!We(Kz*IZbpFkto&5iD=S4$fT?g%1!v`9SInrl*_^ zPC;F{Uu0hY$n$}ZMuZSr1R3+a*pjOv#zy=ZvtuE5!(Jz2Y*DN zHldPDs6$y;S`-~v@bs|Ks&9Q1?L@(IWNZ87*oMDda`h*#$I{XQY}x>lJ6Db9-Ju{~ zU1JK#uZx^ZrebM4pJQ@PkIZ75N6)+^u<{0_^M&88b^CXWe%~@Xg-^?7E0N*nNsw1r zWBn?&PgNdl9xwSVgiv72Olr{gM}?-KhN;AOzp4g~(t~iek@@jdQ@ST|BQ6tBX7g}> zx!`CC!GxNu7qZWsN+lk^OVSgm@PbWa79%g9-D=7ur3`7bIV5OK1yhjzT707%jC+Ca zuU`8TeL9Mo2T8|t@{M!v+aeua%PNnr9`bXpW}KT~`f8ka-7zc|JQ;uBdE000fHhNy zYz3<0BKRhunhWo5=RCdZVrYcI^wEC6&V*vKV{W#`*Piu-FIX;9pB{&YBmIV0q!Jj@IX z+%wxUtj0X-dHA4&)im8QH4MgQ-GtA{!YPf!8QVXEvexoZY#^j1p1ov#X(>Cf=)PUx zD(x=_@gOn;VRY?t#NqhIjkfXX#g5e0I>Zdj=wYFU`1vzjEE5UHc zdKju$WLexA1n245jsCh?=c%-}S$gW;qy^BXnHx7nok>A*pka_dcwY1OfS99iWMqiVC-?^>elx)pRQAX*`^c3G^4%nO6fP>*2)RsB#sZ*^5?# z)o>wUY2I!q5)3SVCQ#g#&kSoFXkF3t!qP$6t9$gVdY$Mz`hrj1$+NV0wY${f_iNU$ zblfat!z%^tKL_5NMK}CSTJZPW2!?&U>>3_`wJ1&|P}JFQ{A@S6_MJMDg__tOa@u8{Fho?;+D(kdWDh?9`vK^1;lejvN-g_G&! zW#859WcKHRMR~(BDbE}e^~!^A+ljNnqf%~C+C2;FGWgTC$O7o#S9b*toc@`t$Sd+j zixy2J$PI(6Xu1pmG)(~6<_}0?~Q}wbLO`bcj#^jq2%?~%6 zDxPYtU;`-a?U0IRU#j6D{_%w9;+(|@(1h4(`2LtvZ-1&bs4Ji-yFME;Tn_(u9!eg( zaj1lWDlgA>gxtAHcW_?Yu^ZZWFjnlDE-5J%%@dP&6daHr6eRF#ZPj#%J2M}|qKyxT zgGGhYBBuquh5u-O1a)Y24Zu+Xs7vD@y|)Z{sBvXOor_<%q=(!5D=jUMsGnmo2A^4enioXj#2 zirA9aR_n}MZIDlh?hh9t0a~gvJ3YXKnnhn<)=+(m_42pfAp}(Gq+hQX5CtXI?2=J} z!(viW@S|X@*_Uj^aZZ-Rzn?OdRuiE}icv2ytsyIIKYY`!ZosyYtN`lhOU){@JTP=w5(#kslUGV-wG7z-n{V0W|nr&ahRI1Tjr_ zmG1GFJDBD~NITp+z}w*%`v&N}i*H6L)YwXi8&|1R!IDWu_!E5VE)K`zE3IRAw@a zXcR58xdtC1rV!A4#|4mRr<$RM=ms5Di&nYUB_YE(X8sUOV{5s~~#i+=SMParsG3}XwK9VTU1 zDd)6LG+ODoMyEqx_?hgD!*#*yHZC@t((^uyM*f2D2_bHkE2#(1nU-vSN8fkf3HS0j ze$aQ@5f=bfuamU7fA}_2Ry>D@rlWY}X()(O~rAo=CXF~I)9AuEu^KdF4`q_XZjBZd5(SZePi0ZxW=VJPiKU9 zHn&G-dfi`bKIZ`A-oAv|Y>@uYTiE4xjVG~JUjq)3!8E&tOj}|1->5BenJ$Z8>YF5k~uiPhbuXuiH;B;bKR#uZit2c|` zs@F@blumbS%R<7|qMtYU-NY1>rPtFpYmwww##4L>^Blc<;xev5d0OmM5}}`OJcLwe z#ROD%(dUWsT+85vA3*3Npyuv?3$kWsgD-?0mnO#PCAcJ~Zx|qgR16$@H&>eN5?Q%m zu!@fCK7$g?!3oCWg#&T_NRN`@XZdz2->(<%Cbl|nF`4+Klhe!e*FSr*Q>=+g{ho@- zOp|ol*Dnrof=}&V3LxkQ?4*djreH^L^MTA4fepTtz{qe39H9~V4OWhnL zbA`mg;Xd`Deh-`?x74CnX?f&3-^e|PY~Ah#e1n31=`5a-$-9GJ1m5Qo?)7vqoQW1mZ7>V1>yfbf=Yev98d9aj)?zv4?-{VzPsU9fwXEs_7=C*(X*-g?eJ1X>7Rb)C zU?}D^l$u^(6r+89g@#;=8YY{>f_%?q_rl<`n|(TYoq>id{x z4|gwK^-dqhS^(hgtRH?% z(RrhNDwiKf*?lJN6ladAIXu%}2#)Ju-YPp?|Jd3kaCsIXg76SmxQa(6aif_mU>AC0 zAZVYB6sU0BqAeh}*vF`E-GC_K@&15fDU3y_rr7wVrQjztNNUFhbf*3G&x*{$!x?7H!446|Og^ zu8RwC7$j!AlXd34iOwhphK73MH+busjj7GRT}WSS)C`~F^BAA*(CFaK`5AOrzeu<0 zOdXtp&4V5eWw@yqVASutEAXnzMJF!a;ZPY(S~VoHhW2R^p~k-B9>|Hx|IEt>F< zA2`SE=chL3@9}U-rzQ+7=agu4iV;^OH(1pd&~gWp(T)W!+5>$#4Z{7RW>hyQ#BcBw zm3+hfuLnm8M_X1tX*)|je{9Q`SrX5ctroXy9^y`HX3@fZg`xprh%j4~mipQiSE(dQ zExt0&1jC{8!)XeyDd5j@Owk)+w4?7~g#$zGMv}fKo)i2R-mSZxs+>e6+vWI2ugXPE z-d6@(&W!#q%Oa;HiF4aItIj8dxfHvo^1?weWI>#VB3XI)vHRZcLimAArTtV=;c@73{r zfo!WH>4-W@Ycn>+;1oVAu+PCd1C4TqBZ$WX&)c#c-6{hZumv2g3T5BDF33Om z>q-uRzc*fJKI)yd>=Q`stZKdz_HSoK1L#p71zfMaoVL|Xf{_L`5JMi`dw*?k)54P- z&uH~GmBP|>sk?tq5t&JP4*t6LoG+v2z%uXu(_^Qrm3IH}yvQuBN$Q{5wpn5FAyTou z3VxXa;&S)DZ#mtQuez9-b98tM&Z3otn`}ag>wDm2-D(jkMs>;Q?WsF%og``ozF@8I z;TPPmmquF5G@y`k;;GGEJewQvdMM$_;XBXPmy`;dR-$UO?vzm^a*4Z30o8Zo5EZKq(+uJZJ?_ zXLOIn+qf*iLN-HFWZn#ankWoc_myQZVfyL4Un6znxP--hlBT+go!*aPkx0p(`6!xu(Xcj_=$=Tq_{6t=omJxLhfPkiz42m(GRX#v#$ z1TFrSAd3!iVUSHnD5bZ;mkHaC=P_!)s)W9&hw5V4--8I|Sk3WlJFV=qejdxLtCAjp z#ej7!ZVHG^9~o8ZlkFj)mxy3yD#3MmOirbcfHe3%i?dEu&2{u#s`~q~h#4|;apD}syxOSBr8`eS^Wlj^x`VAcw;&Kc$rG>Gb=P+;^s;{F`KTg1;)ns6uSn%xet-~O`L zq=3zy#m7p>t@Dh1cwFG^ZEm{&*6)3Gy4bg=u@T&&9?1udHaT;L{c;DH$UpGq4S6me zZlX_U`Jjs{7~jNN))W`wK(MT*6qJx>#|KXuk4fQbob7b;mMu+Wwa9YsL%dCF$25P_ zSCLg1FN!zI34L{VS4@3W1)q%%lU4jKMa5*XISJZ*FEwTM6HRl}qX|5K4^&8lrRGZe z+p=+10r?_$US|UvIfP&8GvHZ}9gAPqDo^FS1y0l}{$Qg;h+g$Xy#a?gdOU1Hvpu$f z@4!91AhQhH>~K8~C7Y7Kf)uf^1k4wfw_xxWY`O+s>~pDH{iBdBDEqYxki;^7x<=k`+Gw?b!-kXQ&-+yGRisj za+f?7wjXZV#FwTLTEK-kv*Du3X`Y`5bYR~B;$bYUyHseQuTPn;;bvh+^ca$Sxn1ZPEzPAJR6l8pOkl)m%tk5h<1YCs? zj4C9Y&?U0Y*d}w>?atEHWT=+2Y9+A|DAo_Sb`R_s8En28!`d@>T3mjOzGXHV*e`cf z_iI==@N6x|N*?B>aQ9Y5V!Vk@=_Apk?qoS7J$)${Q7HP_7--$T#q=eDPMYNE0yg%{=xGj8ST1VJ&Y?6N6Z&mffEqH3R8 zlyk{#Oj3)BNt)$4nxm(WVf%8^NwQxXvo@qp*65zNl=3vKcWv-eI%2r+zp7tL@g#q-|mLAl{YzLyW{p_*f{cUX0KzH196uEHs*En@WVh zZYA%U6xlf}g{s}>r$AIQ%VduaCYu9OHb9#_l!u~})09qDUuk@G-;)ER+I7#MT=(f`yY`UNo*(vRa?AurJ-bU7N2)Fz)7b2kUrx_fi-#m)KXmzJ zg@vAK?#(}*JT(nBdB~0EEQu>I$eO$4O?#g7p)#3Ek+A$q?jnV?)RQCS{&oE|5@0!m z*r)`P(iZ5qGkRAB2Jg_TUY|3qxOy9d$vE?cpr_I_JHjh*WXFV~%l3p8uqjcN@RM|tLH9dq-#)pyF=yOB?i#OdD6QZmgN z&drHK9kGS>);kMryRA@zpCld-1NP2j+OyA2^*Wkg^A7}izQDxk55P@K;SghS1P3lv zECqw^=U<$rJ@mjWek^HZeuQ&Dq^u$F+NAtEM{~xrO`-I6`;Y#5cg9<7U@zTFlC)kf zpGsyJ_wrnCgVDP?Q%rkrh=@|=6;ADEK_gEkz zPIQAgSb1fgW%?(d_9fxtR^{V5#V&3v7H}op#f51_eI|oY%IG4Ugr~zDE}j4{|JqYK z5Z6Yo^X`W{?ZJn@0Yj)7ieWN{q0xd7=Z+^ko-FBnH5Bc=`9nO=>GzF;=SCW^C*D~R zpisW}`-g(If1^jo#Ua^O0NebxfT^y=Ox-g|tSZE{-6V3Ee|B!n>!2IC^a1H=V0$jo zFqDUYh@FmnqmmgzvXlf|Kv-6OoI-~|ZagBhJ^zpM1yQ%xB8OueyK~BVvfCP`CE|mA z;;n3!?PQ}{>P&|vFRTW?kn)B4-4s_E>id&^Qx#zI)wsqx6vdT3j z`Pci)adBxzfitHE0NVfL2y-^YVV9=Dm7Ftyz4EoUJib5!DZNcTUm{)NT{3s3KSWlN zHI~DCGutJR?PrnRuH~0`SvL^&g~>f~rOtLZmLs7p4PnuDGx+W+x+ZRxxsAkPX#{sB z8z;Uv{mG2K?`^1eG9d0wE4VAKy=pP%hHpzTw54w{0U9~Pz-Ey}Bmptb58j-bmFJ!~ znx3r|xh}aZailJC_00X!g{|IZ?3Hxy`3rGPP|-wzEMb=tCY6)?5%Smu*sNxZ*%yN+ zsj|rYld(v&#_pdg>G4FjID>*bRwvhHLb=;-1!+GH?h6UECS9X>PxQckrM5icFk5Vm zB{7a-wXrn2fMH8x{u;r!Dp+9bFMdA$=#rJB*s=G5eZGev*;Uk!gyPy!M9|r z-N%bMp{HFR^QGq#j?{ER=~-U zT-p43B!nbxWJ-6-)M1AHC1893B_7lhqEB-cnCs;8QYvOO1M; zE?Z-V5HW&y0PoWCMB~Q#e4l40n&)BTjaz2)hn&NdhTk)?caWc;LF4M$Vb*$QM&+v8 zo6E!nU@*RT?*77UvABV5r6cNmr)9-A^UKmoopKseVIn6LDo;y)ogX;|!*IOecle-s zW3l^3g6zQd2XE|)sBO)2)w*QB8cdU>jP4hEJfeoz%aP;Tm_|UAq=etF(;F1 zkfzJg#nUM8;C=j)&1ly%>b zNeCFWRDIRF#Or3*jfYJEk8o?Y0b%E8r)vRY#=NuW4v+-T;!J`)9tBP7XsSMmMRh_S z(3iYdn?d|~TMfp7DmV)&kXsms$NQSKrSR@47-tc)$S}Js7ObywC^JcZMpP5mJkFNF zVtVG*ZzIpx*6xm))iPlkigB&rQT)k1OOP&CgJ>JC`8$w%qpPu)7M$0x8LWv8GU%w3 z^f_AkDBI}DT_kmvd)JbOdi7i1muW{2F&=rH-u()G(h zvhPbOK2IyYex4rW3&aWdlhyq_wIt7p47rC}cU^6FrUuvGfPw3;b<;};n;t0%plE~< zaJz_n^thY$W^h-1;n`x`4HU(>{oBOG51X&{>+yRp0t=VUF`IX&{_UxTi^yHuuOgqZ z0>xn**5!ORCzXfpbxSM1L^gmzGD6~cr}Z(3gVN!^=p z?*xg7@2|ELx)#z5szg`5vryd>cGN$N#0IwK#MGJHJQzQJYt|@eS)l3Jwk-bc`Az@N z3S~Wcb$eoISrkp1rLM~US-yt`*?n$KOsLXGtCaWnEWH#;1gQO}G9$?G@9lQY_TSqrq9Za$Ck}O?6Uy6Jvsba)YI9 z`Z0Qp!S>WrD{&HP!>{>W&(Gu_Xe@QK5A`Kv&$q@7WvJzT%VBQFc!g8njMwL zr+g^9@g4iV9GrJ_ArMsEdbo5H2Yc(_P#DZ84Sd!f3Z7Iua+>6>7B{`+?MDb03D}upR8!R)p-BV zAV&R6CQ>HHLu2Lsi6$;~BH|T3DnwXcFP4H}CRc%x+hLSm)4LYwY}HlSArJp~QH=ni z!6gKEIfn~@O`22DAFibA-^?5Mt16D~E5(*vS zKg|07W~!J`k*Rf3LqHIzKtQ1W8~sm$gdqB_76L-pOTx<5%tZ=h>}+NFkGNvW{J-UY z0%7r0I}i}zX`lZi5B!(le*;|pgZ)+a`Wh**J68PvmKhR4K%o4a7Im;Ux3X|^HgdIcu>TMJW?#$B zVU^?CyY8oVWZ1zp{9iX!mB%b|Rf%1qCb;pd#z&FD@s>K-bS-4bbED6j9+WaH`fn`DLG@9D5SUWi;^@YXRNPBDZp6ok#3<^l<6 z05U?%^~4UlhWfqJqr-INlS^4`&B0RMOY7mtnK2=ec&&bIizD;118xzXpqDDp8-^qT z^4`117}MWWC1IUB6+VH>FvN^eb6e4%%DB%!Z;-R=?sJ{EcBsdkugq1kb8#E2yT$G~T9f<223Q00bDfdaSglnA?nAvfI zP@Rt%?r3{P*o`$;ZZl#i%jrcCpJ#<)RDJpTH$|7J?Ro*TIibYw@)tz1z72F#s=3Ux zJ98Gm1@`lt#S;_iyoCoc&Af#pY#vfNP2QY~9lmgxsCy@UAH4Itg(Y(2yv0HMOJrVwwtW$&ML!4-J8wT_e@*oUk)V7M!!s4Uv#Z`hMt^wb^eNN;<5jZ{Oy!W0^ zdiGd`;%Y2~lA)2?|2h24L8n3lke$jnY^6^JE{i4(kc`Kup1OiFoG9tNi=gSc{by5W z;qOF7+O`{%#4 zB*RxXdFhKek$=YW&8?Gz&SdR29_uG}bzEG;XI-}Av{U{J)$}fG4Tx;$?2ZjaMd20! zp=m6+4Y_CTt4A0H(TCbt)^w*(65r(@iE|JOt$Wm;;m0W%wHs`q5;!c&8+r`^8gB)`$Z6GCF=!@UV#N ze$elN60@s6l?TN0%(#g3yasB(q~QSYd*ruxU_T#n$PfRgU`Hfk1(syEjAEF#1Z#en z)bz?E_6>BKfu_GJg?a3~r^QGFabzm^f5MUajbzja))VJbqln@))3L&2yYb*xqr|CW zz~O9T-HUnR1}^R{ZTC)|SBXeB+jT|>;q@R^old%{z2ukf2D#$y~^hEkIcE4gauW}{%_!Dw-9xJ!7K1vC#cF=xwzlk+^3!y2FT{=7h zhsXJX(K)j`6-1{qpJMLPw2y=D#oHk|`qCjkc{O9e@}YR*5l%$e$OmTzG{1X!XBf5$ z&XK{p_!}lN(>SV-i?I-B3ZtBTpDM3FbE#Kz>tM9~j-yat`33UaI7Own`zk~71bQD*y5^g)yGX=eutzQib&=bdft!@(io~ksO zO%X%yD}0!A5vn7aj8$_qQF}y}n-DLRp87klm~SZ2(5$}rdU;o_VZ`X`LUWiyP9IzD zD6^t*s=IzV>&Og7`;GjdCVj*F!xy8`tvF|}@89+w8%3kK6z)TOH1K0j8Swuo9#Cqu z`T%4maPsj_Aw_xNB%@ zqvx-SW(1i~7=BreXU=o2|JZ=6382RsyY)P1KO8JoUV|^+num+(u4ULde@8l6t~Axp zd!zWl@MHTa3`KyocdzMgU{NXSfk~T9zvl-q@s|VN2YN6AMor+L_boGEl(lqP=9?78#hbEUM>WWY*o@;wjMV6R)wNm1GoEUr|AF=JTGphuitE$` z{)I4eZ7f6f_wy)O^WWWEe6$kYIg)v8%$+F75(ovSVBRP{Z`S91sgg<{nhdH48XVLd zX{z}5mrwB||EVi}f&p(*y5$ReqJ3c@S!1spXJ`T8hXHfT6&?D!?H)=@XWA;g!q)xw zSMF7#i+ktiyq9tJ7aQ*;BUZ1=S!Zo}Kzdw;R#rgds^@Aq?5Pd-sRuxL#`=POlDo1`?&yBaRC$oZ3KYEs+zQ^|QX6~NK zLe1)~`{q9@2o1^*1s+G4U=kgN>y*NN^87XUGU`cpQ00$fSY7NCd1Cd+y(HgjKGza3I15qX)Nb)&R(W07fjsbpf zvo}!pJwSaEnRidTDHaZmyPT_(%HRxoxPOO&fJ&2Hwj|0|i+x;uAy1m$n#pAzy10Do zo|tdn+QW1B`2(+jrKe&MZZ#`uucdL-`hl;qIcDcXllh0!_}|{jhG0vZU5wO{F15q_ zbZFnMC)^I#N>DX)Wjkm$9x0<6x0yO{9Q9$ctv*h$6^CB!T=K->X=#%J3w8xxRre@q zjFJe_(2trOtI)N07#`t$B;-s|(GF$u44kki=sthl5|q#Y0u!tp?zji#kY2vyM#>`5 ztK^%=ncBE=?ZJFn?XXMUTdR_sZk(^KE;0|B?d@r^-*frIie2Kvsydt2p$2LP!!||i z)b8n1Rw2(ut0GgVbsIp&PmmKD&yb}o-`M#-yFeIK?T>JDF{BSssg`^?MYbyr)!JQU zLDM=*huWS1FvOhT4xIoPx_%!lso-caV%(CkF8DHv>Og}Sp^i##5BSqUsgx>AEpujC zp=Yn+7G)bI;cfxrDT*ZsqJTMN>Q}fWYneazeqo58u`8WJ`sx#j+=f@Dj_$(z(xcW7 za*CLA6^e0ow!7SOd7Ii@-b?!o5h<^kEuhuW;P_F17I%j(XLn+jXh^t;ueAC2XO`Gu zl)YRT(~zH6$I+Q|HGV>Jlbj)oj{acQlBb@vW~_ZYUQnJehWqz$qAMS7Xs`gb8TIoh z*KrI!S+dW)!~K=vHREd)-UOy&*tk7u=w*0Op-3%P4xXKTs5sC32ET4)_YyF$8tN{t z=3DOpb+xus8$`8g3--`DVH5W%IhPds6Es9c(o^>F>Czc)?) z@irvIW@dCFVO@%)(KK$%m+ZTG_HAzx6jiF~Yv{zrpR2|ff4}N3d>Sme0VrnPPlHZB zh;vi~EX>q>NPkuE3Usb2_QozBP^cnYFDL3)gtH6izJ6~JbUS}{xX@2`uzw3% z)h;+!ok@rD#pm;q4|J!V~-m#CaH?}G=5W_(lv)FRR`R?44kIY zU-iDBUuPAF*SzY!Ytbq;Ku5Nt$*;b8tqVVtG-eD;yi{1&WZ7u8diZ0LkC3bazb2I; z5(pommO(aED0dlcp&e8GzmUu|)Zu_b*D_;_4RVa1TLudd`APF zz60=ZSUw!QvBZa7FtDiX~*4#!{MrwP1Tof&Vi>q0LSrK5Boa?n|Bf zOuMy>rM}kMZf5U!yD#h2tLvAZ%@q=x<+4k|zetsZNIs3MdWd`jDz6%d$GgRH46<9mH{`iWW zD%J*(0q3seSIeGWQZl*ruRX(7rrXaJ-ahh^`CZM%4e{|mKj)P8iO1UOZ_1Q^mFk=) zd@8NqHsr?fjs0hKO|{e7cDubyuT5REZwKpr(U$_=FC`UrxPPjz=laL)`Cl3_e1z>_ z2hdh2Fi?Qf;By}85t=v{u#NA46hnrLtbyl4V2t)4Ylk+|QCjH;?aR#=k=pDqeQKbw hGHh)&gvN6gjF1+b7;J!wg@J{E4cHa9;RqU_0szApTW$aV From e9a608e16bce04c1074eaeee3d41fab9dd40788f Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:07:09 -0600 Subject: [PATCH 12/13] updates --- workload/bicep/modules/networking/deploy.bicep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workload/bicep/modules/networking/deploy.bicep b/workload/bicep/modules/networking/deploy.bicep index 45463528f..f8ac24773 100644 --- a/workload/bicep/modules/networking/deploy.bicep +++ b/workload/bicep/modules/networking/deploy.bicep @@ -15,8 +15,8 @@ param deployAsg bool @sys.description('Existing virtual network subnet for AVD.') param existingAvdSubnetResourceId string -@sys.description('Existing virtual network subnet for private endpoints.') -param existingPeSubnetResourceId string +//@sys.description('Existing virtual network subnet for private endpoints.') +//param existingPeSubnetResourceId string @sys.description('Resource Group Name for the AVD session hosts') param computeObjectsRgName string From 82d9a6235265af279db48153d983b517e941c45a Mon Sep 17 00:00:00 2001 From: moisesjgomez <51566179+moisesjgomez@users.noreply.github.com> Date: Tue, 7 Nov 2023 11:12:12 -0600 Subject: [PATCH 13/13] Update deploy-baseline.bicep --- workload/bicep/deploy-baseline.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep index ea9045b65..8e72b25aa 100644 --- a/workload/bicep/deploy-baseline.bicep +++ b/workload/bicep/deploy-baseline.bicep @@ -914,7 +914,7 @@ module networking './modules/networking/deploy.bicep' = if (createAvdVnet || cre vnetPeeringName: varVnetPeeringName remoteVnetPeeringName: varRemoteVnetPeeringName vnetAvdSubnetName: varVnetAvdSubnetName - existingPeSubnetResourceId: existingVnetPrivateEndpointSubnetResourceId + //existingPeSubnetResourceId: existingVnetPrivateEndpointSubnetResourceId vnetPrivateEndpointSubnetName: varVnetPrivateEndpointSubnetName createVnetPeering: varCreateVnetPeering deployPrivateEndpointSubnet: (deployPrivateEndpointKeyvaultStorage == true) ? true : false //adding logic that will be used when also including AVD control plane PEs