From e5193d4a5105dfd71e9a316927e3bd416cf2d0ca Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Fri, 8 May 2026 10:14:37 +0530 Subject: [PATCH 1/3] Add tags to prevent SFI W18 Policy violation --- infra/main.bicep | 5 ++- infra/main.json | 70 ++++++++++++++++++++--------------------- infra/main_custom.bicep | 5 ++- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 57fe519d..09214b88 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -943,7 +943,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. } ] : [] - tags: allTags + tags: { + ...resourceGroup().tags + ...allTags + } enableTelemetry: enableTelemetry } } diff --git a/infra/main.json b/infra/main.json index c2042a41..5294bd5f 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "3984182123932774684" + "version": "0.39.26.7824", + "templateHash": "4809612702927835067" }, "name": "Modernize Your Code Solution Accelerator", "description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n" @@ -5095,8 +5095,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "15922750226218572834" + "version": "0.39.26.7824", + "templateHash": "15009691488369627296" } }, "definitions": { @@ -13103,11 +13103,11 @@ }, "dependsOn": [ "applicationInsights", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]", "dataCollectionEndpoint", "logAnalyticsWorkspace", "virtualNetwork" @@ -26170,8 +26170,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "9292767591417947872" + "version": "0.39.26.7824", + "templateHash": "11834228529475584401" }, "name": "AI Services and Project Module", "description": "This module creates an AI Services resource and an AI Foundry project within it. It supports private networking, OpenAI deployments, and role assignments." @@ -27507,8 +27507,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "17679330702241672588" + "version": "0.39.26.7824", + "templateHash": "16634905127625208251" } }, "definitions": { @@ -28484,7 +28484,7 @@ "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]", "type": "Microsoft.Authorization/locks", "apiVersion": "2020-05-01", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]", "properties": { "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]", @@ -28498,7 +28498,7 @@ }, "type": "Microsoft.Insights/diagnosticSettings", "apiVersion": "2021-05-01-preview", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]", "properties": { "copy": [ @@ -28536,7 +28536,7 @@ }, "type": "Microsoft.Authorization/roleAssignments", "apiVersion": "2022-04-01", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]", "properties": { "roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]", @@ -29243,8 +29243,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "12801288885438838277" + "version": "0.39.26.7824", + "templateHash": "15137713459703311595" } }, "definitions": { @@ -29397,8 +29397,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "6439859910553532577" + "version": "0.39.26.7824", + "templateHash": "12656937822859269391" } }, "definitions": { @@ -29615,8 +29615,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "17679330702241672588" + "version": "0.39.26.7824", + "templateHash": "16634905127625208251" } }, "definitions": { @@ -30592,7 +30592,7 @@ "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]", "type": "Microsoft.Authorization/locks", "apiVersion": "2020-05-01", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]", "properties": { "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]", @@ -30606,7 +30606,7 @@ }, "type": "Microsoft.Insights/diagnosticSettings", "apiVersion": "2021-05-01-preview", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]", "properties": { "copy": [ @@ -30644,7 +30644,7 @@ }, "type": "Microsoft.Authorization/roleAssignments", "apiVersion": "2022-04-01", - "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", + "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]", "properties": { "roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]", @@ -31351,8 +31351,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "12801288885438838277" + "version": "0.39.26.7824", + "templateHash": "15137713459703311595" } }, "definitions": { @@ -31505,8 +31505,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "6439859910553532577" + "version": "0.39.26.7824", + "templateHash": "12656937822859269391" } }, "definitions": { @@ -32479,8 +32479,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "3598447245043879538" + "version": "0.39.26.7824", + "templateHash": "78196139117756556" } }, "definitions": { @@ -40888,8 +40888,8 @@ }, "dependsOn": [ "appIdentity", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", "logAnalyticsWorkspace", "virtualNetwork" ] @@ -40938,8 +40938,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "18406833646069425594" + "version": "0.39.26.7824", + "templateHash": "7162569703426678426" } }, "definitions": { @@ -44801,8 +44801,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.42.1.51946", - "templateHash": "14534421541012182178" + "version": "0.39.26.7824", + "templateHash": "13948751655369256846" } }, "definitions": { @@ -51099,7 +51099,7 @@ "appLogsConfiguration": "[if(parameters('enableMonitoring'), createObject('value', createObject('destination', 'log-analytics', 'logAnalyticsWorkspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value), 'logAnalyticsConfiguration', createObject('customerId', if(variables('useExistingLogAnalytics'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value), 'sharedKey', if(variables('useExistingLogAnalytics'), listKeys('existingLogAnalyticsWorkspace', '2025-07-01').primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2025-04-01').primarySharedKey)))), createObject('value', null()))]", "workloadProfiles": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', 'Consumption', 'workloadProfileType', 'Consumption'))), createObject('value', createArray()))]", "tags": { - "value": "[variables('allTags')]" + "value": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags')))]" }, "enableTelemetry": { "value": "[parameters('enableTelemetry')]" diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep index 446c84ca..ed8a8ea9 100644 --- a/infra/main_custom.bicep +++ b/infra/main_custom.bicep @@ -886,7 +886,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. } ] : [] - tags: allTags + tags: { + ...resourceGroup().tags + ...allTags + } enableTelemetry: enableTelemetry } } From 26932f1b4913921414cf4290bff60879412e6742 Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Fri, 8 May 2026 18:15:26 +0530 Subject: [PATCH 2/3] Update tags to avoid SFI W18 fix violation --- infra/main.bicep | 4 +++ infra/main.json | 66 ++++++++++++++++++++--------------------- infra/main_custom.bicep | 4 +++ 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index 09214b88..f9690cfe 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -946,6 +946,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. tags: { ...resourceGroup().tags ...allTags + TemplateName: 'Code Modernization' + Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF' + CreatedBy: createdBy + DeploymentName: deployment().name } enableTelemetry: enableTelemetry } diff --git a/infra/main.json b/infra/main.json index 5294bd5f..825b9842 100644 --- a/infra/main.json +++ b/infra/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "4809612702927835067" + "version": "0.43.8.12551", + "templateHash": "4572051835005912799" }, "name": "Modernize Your Code Solution Accelerator", "description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n" @@ -5095,8 +5095,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "15009691488369627296" + "version": "0.43.8.12551", + "templateHash": "14487392921976794826" } }, "definitions": { @@ -13104,9 +13104,9 @@ "dependsOn": [ "applicationInsights", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]", "dataCollectionEndpoint", "logAnalyticsWorkspace", @@ -26170,8 +26170,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "11834228529475584401" + "version": "0.43.8.12551", + "templateHash": "14906568425252680703" }, "name": "AI Services and Project Module", "description": "This module creates an AI Services resource and an AI Foundry project within it. It supports private networking, OpenAI deployments, and role assignments." @@ -27507,8 +27507,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "16634905127625208251" + "version": "0.43.8.12551", + "templateHash": "16530911718603724547" } }, "definitions": { @@ -28484,7 +28484,7 @@ "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]", "type": "Microsoft.Authorization/locks", "apiVersion": "2020-05-01", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]", "properties": { "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]", @@ -28498,7 +28498,7 @@ }, "type": "Microsoft.Insights/diagnosticSettings", "apiVersion": "2021-05-01-preview", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]", "properties": { "copy": [ @@ -28536,7 +28536,7 @@ }, "type": "Microsoft.Authorization/roleAssignments", "apiVersion": "2022-04-01", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]", "properties": { "roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]", @@ -29243,8 +29243,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "15137713459703311595" + "version": "0.43.8.12551", + "templateHash": "6748139957584741236" } }, "definitions": { @@ -29397,8 +29397,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "12656937822859269391" + "version": "0.43.8.12551", + "templateHash": "9014582203949799641" } }, "definitions": { @@ -29615,8 +29615,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "16634905127625208251" + "version": "0.43.8.12551", + "templateHash": "16530911718603724547" } }, "definitions": { @@ -30592,7 +30592,7 @@ "condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]", "type": "Microsoft.Authorization/locks", "apiVersion": "2020-05-01", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]", "properties": { "level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]", @@ -30606,7 +30606,7 @@ }, "type": "Microsoft.Insights/diagnosticSettings", "apiVersion": "2021-05-01-preview", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]", "properties": { "copy": [ @@ -30644,7 +30644,7 @@ }, "type": "Microsoft.Authorization/roleAssignments", "apiVersion": "2022-04-01", - "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]", + "scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]", "name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]", "properties": { "roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]", @@ -31351,8 +31351,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "15137713459703311595" + "version": "0.43.8.12551", + "templateHash": "6748139957584741236" } }, "definitions": { @@ -31505,8 +31505,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "12656937822859269391" + "version": "0.43.8.12551", + "templateHash": "9014582203949799641" } }, "definitions": { @@ -32421,9 +32421,9 @@ }, "dependsOn": [ "aiServices", + "[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" ] }, @@ -32479,8 +32479,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "78196139117756556" + "version": "0.43.8.12551", + "templateHash": "12228537903958998388" } }, "definitions": { @@ -40938,8 +40938,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "7162569703426678426" + "version": "0.43.8.12551", + "templateHash": "17453447807793095031" } }, "definitions": { @@ -44801,8 +44801,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.39.26.7824", - "templateHash": "13948751655369256846" + "version": "0.43.8.12551", + "templateHash": "15722739321567421405" } }, "definitions": { @@ -51099,7 +51099,7 @@ "appLogsConfiguration": "[if(parameters('enableMonitoring'), createObject('value', createObject('destination', 'log-analytics', 'logAnalyticsWorkspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value), 'logAnalyticsConfiguration', createObject('customerId', if(variables('useExistingLogAnalytics'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value), 'sharedKey', if(variables('useExistingLogAnalytics'), listKeys('existingLogAnalyticsWorkspace', '2025-07-01').primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2025-04-01').primarySharedKey)))), createObject('value', null()))]", "workloadProfiles": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', 'Consumption', 'workloadProfileType', 'Consumption'))), createObject('value', createArray()))]", "tags": { - "value": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags')))]" + "value": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags'), createObject('TemplateName', 'Code Modernization', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name)))]" }, "enableTelemetry": { "value": "[parameters('enableTelemetry')]" diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep index ed8a8ea9..44e1a334 100644 --- a/infra/main_custom.bicep +++ b/infra/main_custom.bicep @@ -889,6 +889,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. tags: { ...resourceGroup().tags ...allTags + TemplateName: 'Code Modernization' + Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF' + CreatedBy: createdBy + DeploymentName: deployment().name } enableTelemetry: enableTelemetry } From 4cf796b185d98743b10d286a0891aa44b5aaf630 Mon Sep 17 00:00:00 2001 From: "Niraj Chaudhari (Persistent Systems Inc)" Date: Fri, 8 May 2026 19:15:09 +0530 Subject: [PATCH 3/3] Add tag parameter --- infra/main.bicep | 6 ++---- infra/main.json | 10 +++++----- infra/main.parameters.json | 5 ++++- infra/main.waf.parameters.json | 5 ++++- infra/main_custom.bicep | 6 ++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/infra/main.bicep b/infra/main.bicep index f9690cfe..7d27a8ba 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -945,11 +945,9 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. : [] tags: { ...resourceGroup().tags + ...existingTags ...allTags - TemplateName: 'Code Modernization' - Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF' - CreatedBy: createdBy - DeploymentName: deployment().name + ...tags } enableTelemetry: enableTelemetry } diff --git a/infra/main.json b/infra/main.json index 825b9842..3d77f0cd 100644 --- a/infra/main.json +++ b/infra/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.43.8.12551", - "templateHash": "4572051835005912799" + "templateHash": "10586044166511921089" }, "name": "Modernize Your Code Solution Accelerator", "description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n" @@ -13103,11 +13103,11 @@ }, "dependsOn": [ "applicationInsights", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]", "dataCollectionEndpoint", "logAnalyticsWorkspace", "virtualNetwork" @@ -32421,9 +32421,9 @@ }, "dependsOn": [ "aiServices", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]", "virtualNetwork" ] }, @@ -40888,8 +40888,8 @@ }, "dependsOn": [ "appIdentity", - "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]", "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]", + "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]", "logAnalyticsWorkspace", "virtualNetwork" ] @@ -51099,7 +51099,7 @@ "appLogsConfiguration": "[if(parameters('enableMonitoring'), createObject('value', createObject('destination', 'log-analytics', 'logAnalyticsWorkspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value), 'logAnalyticsConfiguration', createObject('customerId', if(variables('useExistingLogAnalytics'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value), 'sharedKey', if(variables('useExistingLogAnalytics'), listKeys('existingLogAnalyticsWorkspace', '2025-07-01').primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2025-04-01').primarySharedKey)))), createObject('value', null()))]", "workloadProfiles": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', 'Consumption', 'workloadProfileType', 'Consumption'))), createObject('value', createArray()))]", "tags": { - "value": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags'), createObject('TemplateName', 'Code Modernization', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name)))]" + "value": "[shallowMerge(createArray(resourceGroup().tags, variables('existingTags'), variables('allTags'), parameters('tags')))]" }, "enableTelemetry": { "value": "[parameters('enableTelemetry')]" diff --git a/infra/main.parameters.json b/infra/main.parameters.json index 2d38a529..712bbee7 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -46,6 +46,9 @@ }, "vmAdminPassword": { "value": "${AZURE_ENV_VM_ADMIN_PASSWORD}" - } + }, + "tags": { + "value": "${AZURE_ENV_TAGS}" + } } } \ No newline at end of file diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index 7d9f2f32..f8671c42 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -55,6 +55,9 @@ }, "enableScalability": { "value": true - } + }, + "tags": { + "value": "${AZURE_ENV_TAGS}" + } } } \ No newline at end of file diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep index 44e1a334..44abbec4 100644 --- a/infra/main_custom.bicep +++ b/infra/main_custom.bicep @@ -888,11 +888,9 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13. : [] tags: { ...resourceGroup().tags + ...existingTags ...allTags - TemplateName: 'Code Modernization' - Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF' - CreatedBy: createdBy - DeploymentName: deployment().name + ...tags } enableTelemetry: enableTelemetry }