Complex adjoin pw

.gitignore

@@ -55,4 +55,8 @@ Deploy-Baseline.ps1
 workload/bicep/parameters/deploy-baseline-parameters-MSA.json
 
 # local test files
-localTest
+localTest
+
+# Ignore files that might be used for local testing
+/workload/bicep/*.json
+/workload/bicep/*.bicepparam

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'
@@ -537,11 +536,11 @@ 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 varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/Set-SessionHostConfiguration.ps1'
-var varSessionHostConfigurationScript = './Set-SessionHostConfiguration.ps1'
+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}'
 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'
@@ -913,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
@@ -960,7 +962,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 +989,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 +1169,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 +1212,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

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 //
 // =========== //

workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep

@@ -24,7 +24,8 @@ param domainJoinUserPassword string
 // Variable declaration //
 // =========== //
 
-var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword ${domainJoinUserPassword} -verbose'
+var varscriptArgumentsWithPassword = '${scriptArguments} -DomainAdminUserPassword "${replace(domainJoinUserPassword, '"', '""')}" -verbose'
+
 
 // =========== //
 // Deployments //
@@ -46,3 +47,4 @@ resource dscStorageScript 'Microsoft.Compute/virtualMachines/extensions@2022-08-
     }
   }
 }
+

workload/bicep/modules/storageAzureFiles/deploy.bicep

@@ -99,17 +99,17 @@ param storageAccountFqdn string
 // Variable declaration //
 // =========== //
 var varAzureCloudName = environment().name
-var varStoragePurposeLower = toLower(storagePurpose)
 var varAvdFileShareLogsDiagnostic = [
     'allLogs'
 ]
 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
-                    ]                    
+                    ]
                 }
             }
         ] : []

workload/scripts/DSCStorageScripts/script-domainjoinstorage.ps1 → workload/scripts/DSCStorageScripts/Script-DomainJoinStorage.ps1

@@ -182,7 +182,8 @@
 
 	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 {