Skip to content

fix: Dev to main merge #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Prajwal-Microsoft merged 2 commits into from
Oct 12, 2026
Merged

fix: Dev to main merge #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f586819
resolve the securoty incident
Dhruvkumar-Microsoft Oct 9, 2026
94132b6
Merge pull request #1173 from microsoft/psl-bug-hr
Roopan-Microsoft Oct 9, 2026
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
4 changes: 4 additions & 0 deletions infra/avm/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,10 @@ module containerAppMcp './modules/compute/container-app.bicep' = {
name: 'AZURE_STORAGE_IMAGES_CONTAINER'
value: 'generated-images'
}
{
name: 'APP_ENV'
value: 'prod'
}
{
name: 'BACKEND_URL'
value: 'https://${containerAppName}.${containerAppEnvironment.outputs.defaultDomain}'
Expand Down
120 changes: 62 additions & 58 deletions infra/avm/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "15518088603134439540"
"version": "0.46.1.21595",
"templateHash": "6761827456905004696"
},
"name": "Multi-Agent Custom Automation Engine - AVM",
"description": "AVM orchestrator for the Multi-Agent Custom Automation Engine accelerator. Deploys the same logical resources and preserves the same outputs as infra\\main.bicep using local AVM wrapper modules."
Expand Down Expand Up @@ -749,8 +749,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "14054590446517938662"
"version": "0.46.1.21595",
"templateHash": "657680309568566554"
}
},
"parameters": {
Expand Down Expand Up @@ -4045,8 +4045,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "5783288507350094145"
"version": "0.46.1.21595",
"templateHash": "1077806126224374403"
}
},
"parameters": {
Expand Down Expand Up @@ -4975,8 +4975,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17026638034178729316"
"version": "0.46.1.21595",
"templateHash": "14375623146044395014"
}
},
"definitions": {
Expand Down Expand Up @@ -7838,8 +7838,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "13928883839220797481"
"version": "0.46.1.21595",
"templateHash": "4613446280405157854"
}
},
"parameters": {
Expand Down Expand Up @@ -9742,8 +9742,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "1680554660663753024"
"version": "0.46.1.21595",
"templateHash": "8420279536133240728"
}
},
"parameters": {
Expand Down Expand Up @@ -10282,8 +10282,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "8672261192488019749"
"version": "0.46.1.21595",
"templateHash": "11252391644211280586"
}
},
"parameters": {
Expand Down Expand Up @@ -11739,8 +11739,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "14627790702698637496"
"version": "0.46.1.21595",
"templateHash": "13006336383696924611"
}
},
"parameters": {
Expand Down Expand Up @@ -12239,8 +12239,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "11335675658907249239"
"version": "0.46.1.21595",
"templateHash": "11653979101297837047"
}
},
"parameters": {
Expand Down Expand Up @@ -21588,8 +21588,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "8816372137748980601"
"version": "0.46.1.21595",
"templateHash": "11076758087490966511"
}
},
"parameters": {
Expand Down Expand Up @@ -25078,8 +25078,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17491996720911703910"
"version": "0.46.1.21595",
"templateHash": "12857967541128499898"
}
},
"parameters": {
Expand Down Expand Up @@ -25682,8 +25682,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "15126235746263324029"
"version": "0.46.1.21595",
"templateHash": "8266777043110372909"
}
},
"parameters": {
Expand Down Expand Up @@ -25807,8 +25807,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17292566980983106747"
"version": "0.46.1.21595",
"templateHash": "8582571445356860028"
}
},
"parameters": {
Expand Down Expand Up @@ -28584,8 +28584,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "13733831222630151234"
"version": "0.46.1.21595",
"templateHash": "16072437499473558707"
}
},
"parameters": {
Expand Down Expand Up @@ -28765,8 +28765,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "16421784581434471074"
"version": "0.46.1.21595",
"templateHash": "15329304533697998689"
}
},
"parameters": {
Expand Down Expand Up @@ -31103,8 +31103,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "14126031085782385090"
"version": "0.46.1.21595",
"templateHash": "14116608463414189185"
}
},
"parameters": {
Expand Down Expand Up @@ -31290,8 +31290,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "4231043916662566766"
"version": "0.46.1.21595",
"templateHash": "1338804329793217019"
}
},
"parameters": {
Expand Down Expand Up @@ -39731,8 +39731,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "10123896303259078883"
"version": "0.46.1.21595",
"templateHash": "9044076711049835657"
}
},
"parameters": {
Expand Down Expand Up @@ -45921,8 +45921,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "15183605406224107229"
"version": "0.46.1.21595",
"templateHash": "62199279976532843"
}
},
"parameters": {
Expand Down Expand Up @@ -47307,8 +47307,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "8816372137748980601"
"version": "0.46.1.21595",
"templateHash": "11076758087490966511"
}
},
"parameters": {
Expand Down Expand Up @@ -50804,8 +50804,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "6663544911550543480"
"version": "0.46.1.21595",
"templateHash": "3852019752607765790"
}
},
"parameters": {
Expand Down Expand Up @@ -55039,8 +55039,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "10535819316717631477"
"version": "0.46.1.21595",
"templateHash": "12104474316605623480"
}
},
"parameters": {
Expand Down Expand Up @@ -56962,6 +56962,10 @@
"name": "AZURE_STORAGE_IMAGES_CONTAINER",
"value": "generated-images"
},
{
"name": "APP_ENV",
"value": "prod"
},
{
"name": "BACKEND_URL",
"value": "[format('https://{0}.{1}', variables('containerAppName'), reference('containerAppEnvironment').outputs.defaultDomain.value)]"
Expand All @@ -56978,8 +56982,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "10535819316717631477"
"version": "0.46.1.21595",
"templateHash": "12104474316605623480"
}
},
"parameters": {
Expand Down Expand Up @@ -58797,8 +58801,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "6179990525873682101"
"version": "0.46.1.21595",
"templateHash": "16438169678559886054"
}
},
"parameters": {
Expand Down Expand Up @@ -59708,8 +59712,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "9504607717010385151"
"version": "0.46.1.21595",
"templateHash": "6805363261673404556"
}
},
"definitions": {
Expand Down Expand Up @@ -75258,8 +75262,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "8115715631921296017"
"version": "0.46.1.21595",
"templateHash": "3868776181492554939"
}
},
"parameters": {
Expand Down Expand Up @@ -75539,8 +75543,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17425188716359064959"
"version": "0.46.1.21595",
"templateHash": "3243956187915273142"
}
},
"parameters": {
Expand Down Expand Up @@ -75632,8 +75636,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17425188716359064959"
"version": "0.46.1.21595",
"templateHash": "3243956187915273142"
}
},
"parameters": {
Expand Down Expand Up @@ -75725,8 +75729,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.44.1.10279",
"templateHash": "17425188716359064959"
"version": "0.46.1.21595",
"templateHash": "3243956187915273142"
}
},
"parameters": {
Expand Down
4 changes: 4 additions & 0 deletions infra/bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,10 @@ module mcp_container_app './modules/compute/container-app.bicep' = {
name: 'AZURE_STORAGE_IMAGES_CONTAINER'
value: storageContainerNameGeneratedImages
}
{
name: 'APP_ENV'
value: 'prod'
}
{
name: 'BACKEND_URL'
value: 'https://${backendContainerAppName}.${container_app_environment.outputs.defaultDomain}'
Expand Down
Loading
Loading