Merge pull request #782 from Azure/tags-updates

Tags updates

Author: danycontre

workload/arm/deploy-baseline.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.34.44.8038",
-      "templateHash": "6868748504185616259"
+      "templateHash": "2844762627669354029"
     },
     "name": "AVD Accelerator - Baseline Deployment",
     "description": "AVD Accelerator - Deployment Baseline",
@@ -1719,7 +1719,14 @@
     "varCreateVnetPeering": "[if(not(empty(parameters('existingHubVnetResourceId'))), true(), false())]",
     "varTagsWithValues": "[union(if(empty(parameters('workloadNameTag')), createObject(), createObject('WorkloadName', parameters('workloadNameTag'))), if(empty(parameters('workloadTypeTag')), createObject(), createObject('WorkloadType', parameters('workloadTypeTag'))), if(empty(parameters('dataClassificationTag')), createObject(), createObject('DataClassification', parameters('dataClassificationTag'))), if(empty(parameters('departmentTag')), createObject(), createObject('Department', parameters('departmentTag'))), if(empty(parameters('workloadCriticalityTag')), createObject(), createObject('Criticality', if(equals(parameters('workloadCriticalityTag'), 'Custom'), parameters('workloadCriticalityCustomValueTag'), parameters('workloadCriticalityTag')))), if(empty(parameters('applicationNameTag')), createObject(), createObject('ApplicationName', parameters('applicationNameTag'))), if(empty(parameters('workloadSlaTag')), createObject(), createObject('ServiceClass', parameters('workloadSlaTag'))), if(empty(parameters('opsTeamTag')), createObject(), createObject('OpsTeam', parameters('opsTeamTag'))), if(empty(parameters('ownerTag')), createObject(), createObject('Owner', parameters('ownerTag'))), if(empty(parameters('costCenterTag')), createObject(), createObject('CostCenter', parameters('costCenterTag'))))]",
     "varCustomResourceTags": "[if(parameters('createResourceTags'), variables('varTagsWithValues'), createObject())]",
-    "varAllComputeStorageTags": "[if(contains(parameters('avdIdentityServiceProvider'), 'EntraID'), createObject('IdentityServiceProvider', parameters('avdIdentityServiceProvider')), createObject('DomainName', parameters('identityDomainName'), 'IdentityServiceProvider', parameters('avdIdentityServiceProvider')))]",
+    "varAllComputeStorageTags": {
+      "DomainName": "[parameters('identityDomainName')]",
+      "IdentityServiceProvider": "[parameters('avdIdentityServiceProvider')]",
+      "SourceImage": "[if(parameters('useSharedImage'), split(parameters('avdCustomImageDefinitionId'), '/')[8], parameters('mpImageSku'))]",
+      "HotPoolName": "[variables('varHostPoolName')]",
+      "FSLogixPath": "[if(parameters('createAvdFslogixDeployment'), variables('varFslogixSharePath'), 'NA')]",
+      "OUPath": "[if(contains(parameters('avdIdentityServiceProvider'), 'EntraID'), 'NA', parameters('avdOuPath'))]"
+    },
     "varAvdDefaultTags": {
       "cm-resource-parent": "[format('/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.DesktopVirtualization/hostpools/{2}', parameters('avdWorkloadSubsId'), variables('varServiceObjectsRgName'), variables('varHostPoolName'))]",
       "Environment": "[parameters('deploymentEnvironment')]",

workload/bicep/deploy-baseline.bicep

@@ -980,13 +980,14 @@ var varTagsWithValues = union(
   empty(costCenterTag) ? {} : { CostCenter: costCenterTag }
 )
 var varCustomResourceTags = createResourceTags ? varTagsWithValues : {}
-var varAllComputeStorageTags = contains(avdIdentityServiceProvider, 'EntraID')
-  ? {
-      IdentityServiceProvider: avdIdentityServiceProvider
-  }: {
-      DomainName: identityDomainName
-      IdentityServiceProvider: avdIdentityServiceProvider
-    }
+var varAllComputeStorageTags = {
+  DomainName: identityDomainName
+  IdentityServiceProvider: avdIdentityServiceProvider
+  SourceImage: useSharedImage ? split(avdCustomImageDefinitionId, '/')[8] : mpImageSku
+  HotPoolName: varHostPoolName
+  FSLogixPath: createAvdFslogixDeployment ? varFslogixSharePath : 'NA'
+  OUPath: contains(avdIdentityServiceProvider, 'EntraID') ? 'NA' : avdOuPath
+}
 var varAvdDefaultTags = {
   'cm-resource-parent': '/subscriptions/${avdWorkloadSubsId}/resourceGroups/${varServiceObjectsRgName}/providers/Microsoft.DesktopVirtualization/hostpools/${varHostPoolName}'
   Environment: deploymentEnvironment