Update and Upstream Merge

.github/workflows/destroy.yml

@@ -21,9 +21,5 @@ jobs:
       with:
         azcliversion: 2.30.0
         inlineScript: |
-          az group delete --yes --name rg-avd-avdn-test-use2-pool-compute
-          az group delete --yes --name rg-avd-avdn-test-use2-service-objects
-          az group delete --yes --name rg-avd-avdn-test-use2-network
-          az group delete --yes --name rg-avd-avdn-test-use2-storage
-          az group delete --yes --name rg-avd-test-use2-monitoring
-
+          chmod +x $GITHUB_WORKSPACE/Delete_RGs.sh
+          $GITHUB_WORKSPACE/Delete_RGs.sh

Delete_RGs.sh

@@ -0,0 +1,12 @@
+#! /bin/bash
+
+# List of resource groups to delete
+resource_groups=("rg-avd-avdn-test-use2-network" "rg-avd-avdn-test-use2-service-objects" "rg-avd-avdn-test-use2-pool-compute" "rg-avd-avdn-test-use2-storage" "rg-avd-test-use2-monitoring")
+
+# Loop through each resource group and delete
+for rg in "${resource_groups[@]}"; do
+    echo "Deleting resource group: $rg"
+    az group delete --name $rg --yes --no-wait
+done
+
+echo "Resource groups deletion requested. Check Azure portal for status."

workload/arm/deploy-baseline.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "11069848222764082779"
+      "templateHash": "2200290944314916056"
     },
     "name": "AVD Accelerator - Baseline Deployment",
     "description": "AVD Accelerator - Deployment Baseline"
@@ -1516,7 +1516,7 @@
       "IdentityServiceProvider": "[parameters('avdIdentityServiceProvider')]"
     },
     "varAvdDefaultTags": {
-      "cm-resource-parent": "[format('/subscriptions/{0}}}/resourceGroups/{1}/providers/Microsoft.DesktopVirtualization/hostpools/{2}', parameters('avdWorkloadSubsId'), variables('varServiceObjectsRgName'), variables('varHostPoolName'))]",
+      "cm-resource-parent": "[format('/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.DesktopVirtualization/hostpools/{2}', parameters('avdWorkloadSubsId'), variables('varServiceObjectsRgName'), variables('varHostPoolName'))]",
       "Environment": "[parameters('deploymentEnvironment')]",
       "ServiceWorkload": "AVD",
       "CreationTimeUTC": "[parameters('time')]"

workload/bicep/deploy-baseline-arpah.bicep

@@ -293,47 +293,47 @@ param avdServiceObjectsRgCustomName string = 'avd-nih-arpah-test-use2-service-ob
 
 @maxLength(90)
 @sys.description('AVD network resources resource group custom name. (Default: rg-avd-app1-dev-use2-network)')
-param avdNetworkObjectsRgCustomName string = 'avd-nih-arpah-test-use2-network'
+param avdNetworkObjectsRgCustomName string = 'rg-avd-avdn-test-use2-network'
 
 @maxLength(90)
 @sys.description('AVD network resources resource group custom name. (Default: rg-avd-app1-dev-use2-pool-compute)')
 param avdComputeObjectsRgCustomName string = 'avd-nih-arpah-test-use2-pool-compute'
 
 @maxLength(90)
 @sys.description('AVD network resources resource group custom name. (Default: rg-avd-app1-dev-use2-storage)')
-param avdStorageObjectsRgCustomName string = 'avd-nih-arpah-test-use2-storage'
+param avdStorageObjectsRgCustomName string = 'rg-avd-avdn-test-use2-storage'
 
 @maxLength(90)
 @sys.description('AVD monitoring resource group custom name. (Default: rg-avd-dev-use2-monitoring)')
-param avdMonitoringRgCustomName string = 'avd-nih-arpah-test-use2-monitoring'
+param avdMonitoringRgCustomName string = 'rg-avd-test-use2-monitoring'
 
 @maxLength(64)
 @sys.description('AVD virtual network custom name. (Default: vnet-app1-dev-use2-001)')
-param avdVnetworkCustomName string = 'vnet-app1-test-use2-001'
+param avdVnetworkCustomName string = 'avd-nih-arpah-test-use2-vnet'
 
 @maxLength(64)
 @sys.description('AVD Azure log analytics workspace custom name. (Default: log-avd-app1-dev-use2)')
-param avdAlaWorkspaceCustomName string = 'log-avd-app1-test-use2'
+param avdAlaWorkspaceCustomName string = 'avd-nih-arpah-test-use2-log'
 
 @maxLength(80)
 @sys.description('AVD virtual network subnet custom name. (Default: snet-avd-app1-dev-use2-001)')
-param avdVnetworkSubnetCustomName string = 'snet-avd-app1-test-use2-001'
+param avdVnetworkSubnetCustomName string = 'avd-nih-arpah-test-use2-subnet'
 
 @maxLength(80)
 @sys.description('private endpoints virtual network subnet custom name. (Default: snet-pe-app1-dev-use2-001)')
-param privateEndpointVnetworkSubnetCustomName string = 'snet-pe-app1-test-use2-001'
+param privateEndpointVnetworkSubnetCustomName string = 'avd-nih-arpah-test-use2-subnet-private'
 
 @maxLength(80)
 @sys.description('AVD network security group custom name. (Default: nsg-avd-app1-dev-use2-001)')
-param avdNetworksecurityGroupCustomName string = 'nsg-avd-app1-test-use2-001'
+param avdNetworksecurityGroupCustomName string = 'avd-nih-arpah-test-use2-nsg'
 
 @maxLength(80)
 @sys.description('Private endpoint network security group custom name. (Default: nsg-pe-app1-dev-use2-001)')
-param privateEndpointNetworksecurityGroupCustomName string = 'nsg-pe-app1-test-use2-001'
+param privateEndpointNetworksecurityGroupCustomName string = 'avd-nih-arpah-test-use2-nsg-private'
 
 @maxLength(80)
 @sys.description('AVD route table custom name. (Default: route-avd-app1-dev-use2-001)')
-param avdRouteTableCustomName string = 'route-avd-app1-test-use2-001'
+param avdRouteTableCustomName string = 'avd-nih-arpah-test-use2-route'
 
 @maxLength(80)
 @sys.description('Private endpoint route table custom name. (Default: route-avd-app1-dev-use2-001)')

workload/bicep/deploy-baseline.bicep

@@ -720,7 +720,7 @@ var varAllComputeStorageTags = {
     IdentityServiceProvider: avdIdentityServiceProvider
 }
 var varAvdDefaultTags = {
-    'cm-resource-parent': '/subscriptions/${avdWorkloadSubsId}}/resourceGroups/${varServiceObjectsRgName}/providers/Microsoft.DesktopVirtualization/hostpools/${varHostPoolName}'
+    'cm-resource-parent': '/subscriptions/${avdWorkloadSubsId}/resourceGroups/${varServiceObjectsRgName}/providers/Microsoft.DesktopVirtualization/hostpools/${varHostPoolName}'
     Environment: deploymentEnvironment
     ServiceWorkload: 'AVD'
     CreationTimeUTC: time