Skip to content

Commit e5193d4

Browse files
NirajC-MicrosoftNirajC-Microsoft
committed
Add tags to prevent SFI W18 Policy violation
1 parent 302fad8 commit e5193d4

3 files changed

Lines changed: 43 additions & 37 deletions

File tree

‎infra/main.bicep‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
943943
}
944944
]
945945
: []
946-
tags: allTags
946+
tags: {
947+
...resourceGroup().tags
948+
...allTags
949+
}
947950
enableTelemetry: enableTelemetry
948951
}
949952
}

‎infra/main.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.42.1.51946",
9-
"templateHash": "3984182123932774684"
8+
"version": "0.39.26.7824",
9+
"templateHash": "4809612702927835067"
1010
},
1111
"name": "Modernize Your Code Solution Accelerator",
1212
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
@@ -5095,8 +5095,8 @@
50955095
"metadata": {
50965096
"_generator": {
50975097
"name": "bicep",
5098-
"version": "0.42.1.51946",
5099-
"templateHash": "15922750226218572834"
5098+
"version": "0.39.26.7824",
5099+
"templateHash": "15009691488369627296"
51005100
}
51015101
},
51025102
"definitions": {
@@ -13103,11 +13103,11 @@
1310313103
},
1310413104
"dependsOn": [
1310513105
"applicationInsights",
13106-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]",
1310713106
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
13108-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
13109-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
1311013107
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]",
13108+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
13109+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
13110+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]",
1311113111
"dataCollectionEndpoint",
1311213112
"logAnalyticsWorkspace",
1311313113
"virtualNetwork"
@@ -26170,8 +26170,8 @@
2617026170
"metadata": {
2617126171
"_generator": {
2617226172
"name": "bicep",
26173-
"version": "0.42.1.51946",
26174-
"templateHash": "9292767591417947872"
26173+
"version": "0.39.26.7824",
26174+
"templateHash": "11834228529475584401"
2617526175
},
2617626176
"name": "AI Services and Project Module",
2617726177
"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 @@
2750727507
"metadata": {
2750827508
"_generator": {
2750927509
"name": "bicep",
27510-
"version": "0.42.1.51946",
27511-
"templateHash": "17679330702241672588"
27510+
"version": "0.39.26.7824",
27511+
"templateHash": "16634905127625208251"
2751227512
}
2751327513
},
2751427514
"definitions": {
@@ -28484,7 +28484,7 @@
2848428484
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
2848528485
"type": "Microsoft.Authorization/locks",
2848628486
"apiVersion": "2020-05-01",
28487-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
28487+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
2848828488
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
2848928489
"properties": {
2849028490
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
@@ -28498,7 +28498,7 @@
2849828498
},
2849928499
"type": "Microsoft.Insights/diagnosticSettings",
2850028500
"apiVersion": "2021-05-01-preview",
28501-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
28501+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
2850228502
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
2850328503
"properties": {
2850428504
"copy": [
@@ -28536,7 +28536,7 @@
2853628536
},
2853728537
"type": "Microsoft.Authorization/roleAssignments",
2853828538
"apiVersion": "2022-04-01",
28539-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
28539+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
2854028540
"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))]",
2854128541
"properties": {
2854228542
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
@@ -29243,8 +29243,8 @@
2924329243
"metadata": {
2924429244
"_generator": {
2924529245
"name": "bicep",
29246-
"version": "0.42.1.51946",
29247-
"templateHash": "12801288885438838277"
29246+
"version": "0.39.26.7824",
29247+
"templateHash": "15137713459703311595"
2924829248
}
2924929249
},
2925029250
"definitions": {
@@ -29397,8 +29397,8 @@
2939729397
"metadata": {
2939829398
"_generator": {
2939929399
"name": "bicep",
29400-
"version": "0.42.1.51946",
29401-
"templateHash": "6439859910553532577"
29400+
"version": "0.39.26.7824",
29401+
"templateHash": "12656937822859269391"
2940229402
}
2940329403
},
2940429404
"definitions": {
@@ -29615,8 +29615,8 @@
2961529615
"metadata": {
2961629616
"_generator": {
2961729617
"name": "bicep",
29618-
"version": "0.42.1.51946",
29619-
"templateHash": "17679330702241672588"
29618+
"version": "0.39.26.7824",
29619+
"templateHash": "16634905127625208251"
2962029620
}
2962129621
},
2962229622
"definitions": {
@@ -30592,7 +30592,7 @@
3059230592
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
3059330593
"type": "Microsoft.Authorization/locks",
3059430594
"apiVersion": "2020-05-01",
30595-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
30595+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3059630596
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
3059730597
"properties": {
3059830598
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
@@ -30606,7 +30606,7 @@
3060630606
},
3060730607
"type": "Microsoft.Insights/diagnosticSettings",
3060830608
"apiVersion": "2021-05-01-preview",
30609-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
30609+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3061030610
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
3061130611
"properties": {
3061230612
"copy": [
@@ -30644,7 +30644,7 @@
3064430644
},
3064530645
"type": "Microsoft.Authorization/roleAssignments",
3064630646
"apiVersion": "2022-04-01",
30647-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
30647+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3064830648
"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))]",
3064930649
"properties": {
3065030650
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
@@ -31351,8 +31351,8 @@
3135131351
"metadata": {
3135231352
"_generator": {
3135331353
"name": "bicep",
31354-
"version": "0.42.1.51946",
31355-
"templateHash": "12801288885438838277"
31354+
"version": "0.39.26.7824",
31355+
"templateHash": "15137713459703311595"
3135631356
}
3135731357
},
3135831358
"definitions": {
@@ -31505,8 +31505,8 @@
3150531505
"metadata": {
3150631506
"_generator": {
3150731507
"name": "bicep",
31508-
"version": "0.42.1.51946",
31509-
"templateHash": "6439859910553532577"
31508+
"version": "0.39.26.7824",
31509+
"templateHash": "12656937822859269391"
3151031510
}
3151131511
},
3151231512
"definitions": {
@@ -32479,8 +32479,8 @@
3247932479
"metadata": {
3248032480
"_generator": {
3248132481
"name": "bicep",
32482-
"version": "0.42.1.51946",
32483-
"templateHash": "3598447245043879538"
32482+
"version": "0.39.26.7824",
32483+
"templateHash": "78196139117756556"
3248432484
}
3248532485
},
3248632486
"definitions": {
@@ -40888,8 +40888,8 @@
4088840888
},
4088940889
"dependsOn": [
4089040890
"appIdentity",
40891-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
4089240891
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
40892+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
4089340893
"logAnalyticsWorkspace",
4089440894
"virtualNetwork"
4089540895
]
@@ -40938,8 +40938,8 @@
4093840938
"metadata": {
4093940939
"_generator": {
4094040940
"name": "bicep",
40941-
"version": "0.42.1.51946",
40942-
"templateHash": "18406833646069425594"
40941+
"version": "0.39.26.7824",
40942+
"templateHash": "7162569703426678426"
4094340943
}
4094440944
},
4094540945
"definitions": {
@@ -44801,8 +44801,8 @@
4480144801
"metadata": {
4480244802
"_generator": {
4480344803
"name": "bicep",
44804-
"version": "0.42.1.51946",
44805-
"templateHash": "14534421541012182178"
44804+
"version": "0.39.26.7824",
44805+
"templateHash": "13948751655369256846"
4480644806
}
4480744807
},
4480844808
"definitions": {
@@ -51099,7 +51099,7 @@
5109951099
"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()))]",
5110051100
"workloadProfiles": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', 'Consumption', 'workloadProfileType', 'Consumption'))), createObject('value', createArray()))]",
5110151101
"tags": {
51102-
"value": "[variables('allTags')]"
51102+
"value": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags')))]"
5110351103
},
5110451104
"enableTelemetry": {
5110551105
"value": "[parameters('enableTelemetry')]"

‎infra/main_custom.bicep‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
886886
}
887887
]
888888
: []
889-
tags: allTags
889+
tags: {
890+
...resourceGroup().tags
891+
...allTags
892+
}
890893
enableTelemetry: enableTelemetry
891894
}
892895
}

0 commit comments

Comments
 (0)