Add tag parameter

Author: NirajC-Microsoft

infra/main.bicep

@@ -829,10 +829,6 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.13.2' = {
     tags: {
       ...resourceGroup().tags
       ...tags
-      TemplateName: 'Content Processing'
-      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
-      CreatedBy: createdBy
-      DeploymentName: deployment().name
     }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.43.8.12551",
-      "templateHash": "10672198332480851690"
+      "templateHash": "14892051102514442895"
     },
     "name": "Content Processing Solution Accelerator",
     "description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -36177,8 +36177,8 @@
         "avmContainerApp_API",
         "avmContainerApp_Workflow",
         "avmManagedIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "virtualNetwork"
       ]
     },
@@ -42481,10 +42481,10 @@
       },
       "dependsOn": [
         "avmAiServices",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "virtualNetwork"
       ]
     },
@@ -42505,7 +42505,7 @@
             "value": "[parameters('location')]"
           },
           "tags": {
-            "value": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags'), createObject('TemplateName', 'Content Processing', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name)))]"
+            "value": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags')))]"
           },
           "managedIdentities": {
             "value": {

infra/main.parameters.json

@@ -34,6 +34,9 @@
     },
     "imageTag": {
       "value": "${AZURE_ENV_IMAGETAG=latest_v2}"
-    }
+    },
+    "tags": {
+       "value": "${AZURE_ENV_TAGS}"
+      }
   }
 }

infra/main.waf.parameters.json

@@ -52,6 +52,9 @@
     },
     "imageTag": {
       "value": "${AZURE_ENV_IMAGETAG=latest_v2}"
-    }
+    },
+    "tags": {
+       "value": "${AZURE_ENV_TAGS}"
+      }
   }
 }

infra/main_custom.bicep

@@ -832,10 +832,6 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.13.2' = {
     tags: {
       ...resourceGroup().tags
       ...tags
-      TemplateName: 'Content Processing'
-      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
-      CreatedBy: createdBy
-      DeploymentName: deployment().name
     }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring