Skip to content

Commit aaf336a

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request microsoft#217 from microsoft/rc-templatetag-cp-main
feat: Added templateName tag on rg
2 parents 60ffbb0 + fba1d18 commit aaf336a

2 files changed

Lines changed: 64 additions & 44 deletions

File tree

‎infra/main.bicep‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,16 @@ module applicationInsights 'br/public:avm/res/insights/component:0.6.0' = {
417417
}
418418
}
419419

420+
// ========== Resource Group Tag ========== //
421+
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
422+
name: 'default'
423+
properties: {
424+
tags: {
425+
TemplateName: 'Content Processing'
426+
}
427+
}
428+
}
429+
420430
// ========== Managed Identity ========== //
421431
module avmManagedIdentity './modules/managed-identity.bicep' = {
422432
params: {

‎infra/main.json‎

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.36.1.42791",
9-
"templateHash": "961802883849358046"
8+
"version": "0.36.177.2456",
9+
"templateHash": "5192359171136519746"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -219,6 +219,16 @@
219219
}
220220
}
221221
},
222+
"resourceGroupTags": {
223+
"type": "Microsoft.Resources/tags",
224+
"apiVersion": "2021-04-01",
225+
"name": "default",
226+
"properties": {
227+
"tags": {
228+
"TemplateName": "Content Processing"
229+
}
230+
}
231+
},
222232
"avmNetworkSecurityGroup": {
223233
"condition": "[parameters('enablePrivateNetworking')]",
224234
"type": "Microsoft.Resources/deployments",
@@ -245,7 +255,7 @@
245255
"diagnosticSettings": {
246256
"value": [
247257
{
248-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
258+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
249259
}
250260
]
251261
},
@@ -925,7 +935,7 @@
925935
"diagnosticSettings": {
926936
"value": [
927937
{
928-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
938+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
929939
}
930940
]
931941
},
@@ -1670,7 +1680,7 @@
16701680
"diagnosticSettings": {
16711681
"value": [
16721682
{
1673-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
1683+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
16741684
}
16751685
]
16761686
},
@@ -2350,7 +2360,7 @@
23502360
"diagnosticSettings": {
23512361
"value": [
23522362
{
2353-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
2363+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
23542364
}
23552365
]
23562366
},
@@ -3035,7 +3045,7 @@
30353045
"diagnosticSettings": {
30363046
"value": [
30373047
{
3038-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
3048+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
30393049
}
30403050
]
30413051
},
@@ -7898,8 +7908,8 @@
78987908
"metadata": {
78997909
"_generator": {
79007910
"name": "bicep",
7901-
"version": "0.36.1.42791",
7902-
"templateHash": "15981152896828585106"
7911+
"version": "0.36.177.2456",
7912+
"templateHash": "3906046175102371285"
79037913
}
79047914
},
79057915
"parameters": {
@@ -11014,15 +11024,15 @@
1101411024
"outputs": {
1101511025
"resourceId": {
1101611026
"type": "string",
11017-
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').resourceId)]"
11027+
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), reference('logAnalyticsWorkspace').outputs.resourceId.value)]"
1101811028
},
1101911029
"logAnalyticsWorkspaceId": {
1102011030
"type": "string",
11021-
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId)]"
11031+
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value)]"
1102211032
},
1102311033
"primarySharedKey": {
1102411034
"type": "securestring",
11025-
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey)]"
11035+
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey)]"
1102611036
}
1102711037
}
1102811038
}
@@ -11045,12 +11055,12 @@
1104511055
"value": "[parameters('location')]"
1104611056
},
1104711057
"workspaceResourceId": {
11048-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
11058+
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1104911059
},
1105011060
"diagnosticSettings": {
1105111061
"value": [
1105211062
{
11053-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
11063+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1105411064
}
1105511065
]
1105611066
},
@@ -11783,8 +11793,8 @@
1178311793
"metadata": {
1178411794
"_generator": {
1178511795
"name": "bicep",
11786-
"version": "0.36.1.42791",
11787-
"templateHash": "2317259662067975763"
11796+
"version": "0.36.177.2456",
11797+
"templateHash": "14410385321137128263"
1178811798
}
1178911799
},
1179011800
"parameters": {
@@ -12358,7 +12368,7 @@
1235812368
},
1235912369
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
1236012370
"logAnalyticsWorkspaceResourceId": {
12361-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
12371+
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1236212372
},
1236312373
"networkAcls": {
1236412374
"value": {
@@ -12373,8 +12383,8 @@
1237312383
"metadata": {
1237412384
"_generator": {
1237512385
"name": "bicep",
12376-
"version": "0.36.1.42791",
12377-
"templateHash": "12497992766525707634"
12386+
"version": "0.36.177.2456",
12387+
"templateHash": "12745773382509549839"
1237812388
},
1237912389
"name": "Key Vault Module"
1238012390
},
@@ -15912,8 +15922,8 @@
1591215922
"metadata": {
1591315923
"_generator": {
1591415924
"name": "bicep",
15915-
"version": "0.36.1.42791",
15916-
"templateHash": "11910096117865508081"
15925+
"version": "0.36.177.2456",
15926+
"templateHash": "11092248228709008584"
1591715927
},
1591815928
"name": "Container Registry Module"
1591915929
},
@@ -24942,7 +24952,7 @@
2494224952
"diagnosticSettings": {
2494324953
"value": [
2494424954
{
24945-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
24955+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
2494624956
}
2494724957
]
2494824958
},
@@ -24998,8 +25008,8 @@
2499825008
"metadata": {
2499925009
"_generator": {
2500025010
"name": "bicep",
25001-
"version": "0.36.1.42791",
25002-
"templateHash": "16330577693396165210"
25011+
"version": "0.36.177.2456",
25012+
"templateHash": "5761548449731819585"
2500325013
},
2500425014
"name": "Cognitive Services",
2500525015
"description": "This module deploys a Cognitive Service."
@@ -26248,8 +26258,8 @@
2624826258
"metadata": {
2624926259
"_generator": {
2625026260
"name": "bicep",
26251-
"version": "0.36.1.42791",
26252-
"templateHash": "4128376395637895528"
26261+
"version": "0.36.177.2456",
26262+
"templateHash": "11270933172961789567"
2625326263
}
2625426264
},
2625526265
"definitions": {
@@ -28057,8 +28067,8 @@
2805728067
"metadata": {
2805828068
"_generator": {
2805928069
"name": "bicep",
28060-
"version": "0.36.1.42791",
28061-
"templateHash": "1200612323329026557"
28070+
"version": "0.36.177.2456",
28071+
"templateHash": "9150529619101779014"
2806228072
}
2806328073
},
2806428074
"definitions": {
@@ -28211,8 +28221,8 @@
2821128221
"metadata": {
2821228222
"_generator": {
2821328223
"name": "bicep",
28214-
"version": "0.36.1.42791",
28215-
"templateHash": "125568697111155565"
28224+
"version": "0.36.177.2456",
28225+
"templateHash": "18131656256983910282"
2821628226
}
2821728227
},
2821828228
"definitions": {
@@ -28429,8 +28439,8 @@
2842928439
"metadata": {
2843028440
"_generator": {
2843128441
"name": "bicep",
28432-
"version": "0.36.1.42791",
28433-
"templateHash": "4128376395637895528"
28442+
"version": "0.36.177.2456",
28443+
"templateHash": "11270933172961789567"
2843428444
}
2843528445
},
2843628446
"definitions": {
@@ -30238,8 +30248,8 @@
3023830248
"metadata": {
3023930249
"_generator": {
3024030250
"name": "bicep",
30241-
"version": "0.36.1.42791",
30242-
"templateHash": "1200612323329026557"
30251+
"version": "0.36.177.2456",
30252+
"templateHash": "9150529619101779014"
3024330253
}
3024430254
},
3024530255
"definitions": {
@@ -30392,8 +30402,8 @@
3039230402
"metadata": {
3039330403
"_generator": {
3039430404
"name": "bicep",
30395-
"version": "0.36.1.42791",
30396-
"templateHash": "125568697111155565"
30405+
"version": "0.36.177.2456",
30406+
"templateHash": "18131656256983910282"
3039730407
}
3039830408
},
3039930409
"definitions": {
@@ -30633,10 +30643,10 @@
3063330643
"dependsOn": [
3063430644
"avmContainerApp",
3063530645
"avmManagedIdentity",
30646+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3063630647
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3063730648
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3063830649
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
30639-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3064030650
"avmVirtualNetwork",
3064130651
"logAnalyticsWorkspace"
3064230652
]
@@ -32974,8 +32984,8 @@
3297432984
"dependsOn": [
3297532985
"avmContainerApp",
3297632986
"avmManagedIdentity",
32977-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3297832987
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
32988+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3297932989
"avmVirtualNetwork"
3298032990
]
3298132991
},
@@ -33010,8 +33020,8 @@
3301033020
"value": {
3301133021
"destination": "log-analytics",
3301233022
"logAnalyticsConfiguration": {
33013-
"customerId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId]",
33014-
"sharedKey": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').primarySharedKey]"
33023+
"customerId": "[reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value]",
33024+
"sharedKey": "[listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey]"
3301533025
}
3301633026
}
3301733027
},
@@ -42891,7 +42901,7 @@
4289142901
"diagnosticSettings": {
4289242902
"value": [
4289342903
{
42894-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]",
42904+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]",
4289542905
"logCategoriesAndGroups": [
4289642906
{
4289742907
"categoryGroup": "allLogs",
@@ -42989,19 +42999,19 @@
4298942999
},
4299043000
{
4299143001
"name": "APP_STORAGE_BLOB_URL",
42992-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.blob]"
43002+
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.blob]"
4299343003
},
4299443004
{
4299543005
"name": "APP_STORAGE_QUEUE_URL",
42996-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.queue]"
43006+
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.queue]"
4299743007
},
4299843008
{
4299943009
"name": "APP_AI_PROJECT_ENDPOINT",
4300043010
"value": "[reference('avmAiServices').outputs.aiProjectInfo.value.apiEndpoint]"
4300143011
},
4300243012
{
4300343013
"name": "APP_COSMOS_CONNSTR",
43004-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'cosmos-')), '2022-09-01').primaryReadWriteConnectionString]"
43014+
"value": "[listOutputsWithSecureValues('avmCosmosDB', '2022-09-01').primaryReadWriteConnectionString]"
4300543015
}
4300643016
]
4300743017
},

0 commit comments

Comments
 (0)