Skip to content

Commit 604040e

Browse files
fix: Update tag handling to include existing tags in resource group
2 parents bce8d5b + 48156c7 commit 604040e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

infra/main.bicep

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,18 @@ param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deploy
112112
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
113113
name: 'default'
114114
properties: {
115-
tags: {
116-
... tags
117-
TemplateName: 'KM Generic'
118-
CreatedBy: createdBy
119-
}
115+
tags: union(
116+
reference(
117+
resourceGroup().id,
118+
'2021-04-01',
119+
'Full'
120+
).tags ?? {},
121+
{
122+
TemplateName: 'KM Generic'
123+
CreatedBy: createdBy
124+
},
125+
tags
126+
)
120127
}
121128
}
122129

infra/main.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.37.4.10188",
8-
"templateHash": "10686282742508674905"
8+
"templateHash": "4854945365103887323"
99
}
1010
},
1111
"parameters": {
@@ -187,7 +187,7 @@
187187
"apiVersion": "2021-04-01",
188188
"name": "default",
189189
"properties": {
190-
"tags": "[shallowMerge(createArray(parameters('tags'), createObject('TemplateName', 'KM Generic', 'CreatedBy', parameters('createdBy'))))]"
190+
"tags": "[union(coalesce(reference(resourceGroup().id, '2021-04-01', 'Full').tags, createObject()), createObject('TemplateName', 'KM Generic', 'CreatedBy', parameters('createdBy')), parameters('tags'))]"
191191
}
192192
},
193193
{

0 commit comments

Comments
 (0)