Skip to content

Commit ccca218

Browse files
Add tag parameter
1 parent 289fbcc commit ccca218

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

infra/main.bicep

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,11 +1125,9 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
11251125
location: location
11261126
tags: {
11271127
...resourceGroup().tags
1128+
...existingTags
1129+
...allTags
11281130
...tags
1129-
TemplateName: 'Content Processing'
1130-
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
1131-
CreatedBy: createdBy
1132-
DeploymentName: deployment().name
11331131
}
11341132
managedIdentities: { systemAssigned: true }
11351133
appLogsConfiguration: enableMonitoring

infra/main.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.43.8.12551",
9-
"templateHash": "11275932789751936226"
9+
"templateHash": "7630070384569998511"
1010
}
1111
},
1212
"parameters": {
@@ -38363,7 +38363,7 @@
3836338363
"value": "[parameters('location')]"
3836438364
},
3836538365
"tags": {
38366-
"value": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags'), createObject('TemplateName', 'Content Processing', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name)))]"
38366+
"value": "[shallowMerge(createArray(resourceGroup().tags, variables('existingTags'), variables('allTags'), parameters('tags')))]"
3836738367
},
3836838368
"managedIdentities": {
3836938369
"value": {

infra/main.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
},
4141
"imageTag": {
4242
"value": "${AZURE_ENV_IMAGE_TAG}"
43+
},
44+
"tags": {
45+
"value": "${AZURE_ENV_TAGS}"
4346
}
4447
}
4548
}

infra/main.waf.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
},
5656
"vmSize": {
5757
"value": "${AZURE_ENV_VM_SIZE}"
58+
},
59+
"tags": {
60+
"value": "${AZURE_ENV_TAGS}"
5861
}
5962
}
6063
}

infra/main_custom.bicep

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,11 +1078,9 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.11.
10781078
location: location
10791079
tags: {
10801080
...resourceGroup().tags
1081+
...existingTags
1082+
...allTags
10811083
...tags
1082-
TemplateName: 'Content Processing'
1083-
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
1084-
CreatedBy: createdBy
1085-
DeploymentName: deployment().name
10861084
}
10871085
managedIdentities: { systemAssigned: true }
10881086
appLogsConfiguration: enableMonitoring

0 commit comments

Comments
 (0)