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 @@ -1136,7 +1136,12 @@ module containerAppEnvironment 'br/public:avm/res/app/managed-environment:0.13.1
params: {
name: containerAppEnvironmentResourceName
location: location
tags: tags
tags: {
...resourceGroup().tags
Comment thread
NirajC-Microsoft marked this conversation as resolved.
...existingTags
...allTags
...tags
}
Comment thread
NirajC-Microsoft marked this conversation as resolved.
enableTelemetry: enableTelemetry
// WAF aligned configuration for Private Networking
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
Expand Down
30 changes: 15 additions & 15 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": "8490920419623942773"
"version": "0.43.8.12551",
"templateHash": "1714347084428380969"
},
"name": "Multi-Agent Custom Automation Engine",
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\r\n\r\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\r\n"
Expand Down Expand Up @@ -4991,8 +4991,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "4286500745908716598"
"version": "0.43.8.12551",
"templateHash": "9540091515555271756"
}
},
"definitions": {
Expand Down Expand Up @@ -24308,8 +24308,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "6570260143045999127"
"version": "0.43.8.12551",
"templateHash": "7866379492866507946"
}
},
"definitions": {
Expand Down Expand Up @@ -28012,8 +28012,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "14513113443903512301"
"version": "0.43.8.12551",
"templateHash": "2868048678223903575"
}
},
"parameters": {
Expand Down Expand Up @@ -34109,7 +34109,7 @@
"value": "[parameters('location')]"
},
"tags": {
"value": "[parameters('tags')]"
"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 Expand Up @@ -42561,8 +42561,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "15053339789155096730"
"version": "0.43.8.12551",
"templateHash": "18345308984648474640"
}
},
"definitions": {
Expand Down Expand Up @@ -43593,8 +43593,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "16493651611122310009"
"version": "0.43.8.12551",
"templateHash": "1009721598684973971"
},
"name": "Site App Settings",
"description": "This module deploys a Site App Setting."
Expand Down Expand Up @@ -54840,8 +54840,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.42.1.51946",
"templateHash": "4859654437121510695"
"version": "0.43.8.12551",
"templateHash": "9739523049889844356"
}
},
"parameters": {
Expand Down
5 changes: 4 additions & 1 deletion infra/main.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
},
"MCPContainerRegistryHostname": {
"value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
}
},
"tags": {
"value": "${AZURE_ENV_TAGS}"
}
}
}
5 changes: 4 additions & 1 deletion infra/main.waf.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
},
"MCPContainerRegistryHostname": {
"value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
}
},
"tags": {
"value": "${AZURE_ENV_TAGS}"
}
}
}
7 changes: 6 additions & 1 deletion infra/main_custom.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,12 @@ module containerAppEnvironment 'br/public:avm/res/app/managed-environment:0.13.1
params: {
name: containerAppEnvironmentResourceName
location: location
tags: tags
tags: {
...resourceGroup().tags
Comment thread
NirajC-Microsoft marked this conversation as resolved.
...existingTags
...allTags
...tags
}
Comment thread
NirajC-Microsoft marked this conversation as resolved.
enableTelemetry: enableTelemetry
// WAF aligned configuration for Private Networking
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
Expand Down