Skip to content

Commit 3466b14

Browse files
infra: convert main.bicep to deployment router, remove old flat modules
Convert top-level infra/main.bicep and main_custom.bicep into thin deployment routers (matching agentic-applications PR pattern) that dispatch to: - ./bicep/main.bicep (vanilla, deploymentFlavor='bicep') - ./avm/main.bicep (AVM, deploymentFlavor='avm' or 'avm-waf') Remove old flat infra/modules/ (6 camelCase files) — replaced by structured subdirectories under infra/bicep/modules/ and infra/avm/modules/ with proper ai/, compute/, data/, identity/, monitoring/, networking/ subfolders. Update main.parameters.json to include deploymentFlavor param. Update main.waf.parameters.json to set deploymentFlavor='avm-waf'. Add SERVICE_* and CONTAINER_FRONTEND_* outputs to bicep/main_custom.bicep. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 68e00d3 commit 3466b14

12 files changed

Lines changed: 41062 additions & 48338 deletions

infra/bicep/main_custom.bicep

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,3 +511,24 @@ output AZURE_RESOURCE_GROUP string = resourceGroup().name
511511

512512
@description('Azure AI Agent service endpoint URL')
513513
output AZURE_AI_AGENT_ENDPOINT string = projectEndpoint
514+
515+
@description('The name of the frontend container app (alias).')
516+
output CONTAINER_FRONTEND_APP_NAME string = ca_frontend.outputs.name
517+
518+
@description('The FQDN of the frontend container app (alias).')
519+
output CONTAINER_FRONTEND_APP_FQDN string = ca_frontend.outputs.fqdn
520+
521+
@description('Backend service name for azd.')
522+
output SERVICE_BACKEND_NAME string = ca_backend_api.outputs.name
523+
524+
@description('Backend service URI for azd.')
525+
output SERVICE_BACKEND_URI string = 'https://${ca_backend_api.outputs.fqdn}'
526+
527+
@description('Processor service name for azd.')
528+
output SERVICE_PROCESSOR_NAME string = ca_processor.outputs.name
529+
530+
@description('Frontend service name for azd.')
531+
output SERVICE_FRONTEND_NAME string = ca_frontend.outputs.name
532+
533+
@description('Frontend service URI for azd.')
534+
output SERVICE_FRONTEND_URI string = 'https://${ca_frontend.outputs.fqdn}'

infra/main.bicep

Lines changed: 164 additions & 1473 deletions
Large diffs are not rendered by default.

infra/main.json

Lines changed: 40720 additions & 44409 deletions
Large diffs are not rendered by default.

infra/main.parameters.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"deploymentFlavor": {
6+
"value": "${AZURE_ENV_DEPLOYMENT_FLAVOR}"
7+
},
58
"solutionName": {
69
"value": "${AZURE_ENV_NAME}"
710
},
@@ -42,7 +45,7 @@
4245
"value": "${AZURE_ENV_IMAGE_TAG}"
4346
},
4447
"tags": {
45-
"value": "${AZURE_ENV_TAGS}"
48+
"value": "${AZURE_ENV_TAGS}"
4649
}
4750
}
4851
}

infra/main.waf.parameters.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"deploymentFlavor": {
6+
"value": "avm-waf"
7+
},
58
"solutionName": {
69
"value": "${AZURE_ENV_NAME}"
710
},
@@ -35,9 +38,6 @@
3538
"enablePrivateNetworking": {
3639
"value": true
3740
},
38-
"enableScalability": {
39-
"value": true
40-
},
4141
"vmAdminUsername": {
4242
"value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
4343
},
@@ -57,7 +57,7 @@
5757
"value": "${AZURE_ENV_VM_SIZE}"
5858
},
5959
"tags": {
60-
"value": "${AZURE_ENV_TAGS}"
60+
"value": "${AZURE_ENV_TAGS}"
6161
}
6262
}
6363
}

0 commit comments

Comments
 (0)