Merge pull request #230 from microsoft/psl-SFIW18

chore: Add tags to prevent SFI W18 Policy violation

Author: Roopan-Microsoft

infra/main.bicep

@@ -1123,6 +1123,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
   params: {
     name: 'cae-${solutionSuffix}'
     location: location
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring
       ? {

infra/main.json

@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.43.1.21952",
-      "templateHash": "1278209883407272359"
+      "version": "0.43.8.12551",
+      "templateHash": "7630070384569998511"
     }
   },
   "parameters": {
@@ -4715,8 +4715,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "4488065934246762087"
+              "version": "0.43.8.12551",
+              "templateHash": "4604761290796021104"
             }
           },
           "definitions": {
@@ -26135,8 +26135,8 @@
       },
       "dependsOn": [
         "appIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "virtualNetwork"
       ]
     },
@@ -30103,8 +30103,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "17526785557845507677"
+              "version": "0.43.8.12551",
+              "templateHash": "13516349791985095953"
             }
           },
           "definitions": {
@@ -33853,9 +33853,9 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "virtualNetwork"
       ]
     },
@@ -33892,8 +33892,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.1.21952",
-              "templateHash": "8251376928798842081"
+              "version": "0.43.8.12551",
+              "templateHash": "17583277036649944863"
             }
           },
           "parameters": {
@@ -38362,6 +38362,9 @@
           "location": {
             "value": "[parameters('location')]"
           },
+          "tags": {
+            "value": "[shallowMerge(createArray(resourceGroup().tags, variables('existingTags'), variables('allTags'), parameters('tags')))]"
+          },
           "managedIdentities": {
             "value": {
               "systemAssigned": true

infra/main.parameters.json

@@ -40,6 +40,9 @@
       },
       "imageTag": {
         "value": "${AZURE_ENV_IMAGE_TAG}"
+      },
+      "tags": {
+       "value": "${AZURE_ENV_TAGS}"
       }
     }
 }

infra/main.waf.parameters.json

@@ -55,6 +55,9 @@
       },
       "vmSize": {
         "value": "${AZURE_ENV_VM_SIZE}"
+      },
+      "tags": {
+       "value": "${AZURE_ENV_TAGS}"
       }
     }
 }

infra/main_custom.bicep

@@ -1076,6 +1076,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
   params: {
     name: 'cae-${solutionSuffix}'
     location: location
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     managedIdentities: { systemAssigned: true }
     appLogsConfiguration: enableMonitoring
       ? {