Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
}
]
: []
tags: allTags
tags: {
...resourceGroup().tags
Comment thread
NirajC-Microsoft marked this conversation as resolved.
...existingTags
...allTags
...tags
}
enableTelemetry: enableTelemetry
}
}
Expand Down
54 changes: 27 additions & 27 deletions infra/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "3984182123932774684"
"version": "0.43.8.12551",
"templateHash": "10586044166511921089"
},
"name": "Modernize Your Code Solution Accelerator",
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
Expand Down Expand Up @@ -5095,8 +5095,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "15922750226218572834"
"version": "0.43.8.12551",
"templateHash": "14487392921976794826"
}
},
"definitions": {
Expand Down Expand Up @@ -13106,8 +13106,8 @@
"[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)]",
"dataCollectionEndpoint",
"logAnalyticsWorkspace",
"virtualNetwork"
Expand Down Expand Up @@ -26170,8 +26170,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "9292767591417947872"
"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."
Expand Down Expand Up @@ -27507,8 +27507,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "17679330702241672588"
"version": "0.43.8.12551",
"templateHash": "16530911718603724547"
}
},
"definitions": {
Expand Down Expand Up @@ -29243,8 +29243,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "12801288885438838277"
"version": "0.43.8.12551",
"templateHash": "6748139957584741236"
}
},
"definitions": {
Expand Down Expand Up @@ -29397,8 +29397,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "6439859910553532577"
"version": "0.43.8.12551",
"templateHash": "9014582203949799641"
}
},
"definitions": {
Expand Down Expand Up @@ -29615,8 +29615,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "17679330702241672588"
"version": "0.43.8.12551",
"templateHash": "16530911718603724547"
}
},
"definitions": {
Expand Down Expand Up @@ -31351,8 +31351,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "12801288885438838277"
"version": "0.43.8.12551",
"templateHash": "6748139957584741236"
}
},
"definitions": {
Expand Down Expand Up @@ -31505,8 +31505,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "6439859910553532577"
"version": "0.43.8.12551",
"templateHash": "9014582203949799641"
}
},
"definitions": {
Expand Down Expand Up @@ -32421,9 +32421,9 @@
},
"dependsOn": [
"aiServices",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"virtualNetwork"
]
},
Expand Down Expand Up @@ -32479,8 +32479,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "3598447245043879538"
"version": "0.43.8.12551",
"templateHash": "12228537903958998388"
}
},
"definitions": {
Expand Down Expand Up @@ -40938,8 +40938,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "18406833646069425594"
"version": "0.43.8.12551",
"templateHash": "17453447807793095031"
}
},
"definitions": {
Expand Down Expand Up @@ -44801,8 +44801,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "14534421541012182178"
"version": "0.43.8.12551",
"templateHash": "15722739321567421405"
}
},
"definitions": {
Expand Down Expand Up @@ -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('existingTags'), variables('allTags'), parameters('tags')))]"
},
Comment thread
NirajC-Microsoft marked this conversation as resolved.
"enableTelemetry": {
"value": "[parameters('enableTelemetry')]"
Expand Down
5 changes: 4 additions & 1 deletion infra/main.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
},
"vmAdminPassword": {
"value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
}
},
"tags": {
"value": "${AZURE_ENV_TAGS}"
}
Comment thread
NirajC-Microsoft marked this conversation as resolved.
}
}
5 changes: 4 additions & 1 deletion infra/main.waf.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
},
"enableScalability": {
"value": true
}
},
"tags": {
"value": "${AZURE_ENV_TAGS}"
Comment thread
NirajC-Microsoft marked this conversation as resolved.
}
}
}
7 changes: 6 additions & 1 deletion infra/main_custom.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
}
]
: []
tags: allTags
tags: {
...resourceGroup().tags
Comment thread
NirajC-Microsoft marked this conversation as resolved.
...existingTags
...allTags
...tags
}
enableTelemetry: enableTelemetry
}
}
Expand Down
Loading