Infra restructure: align flavor routing and AVM/Bicep module layout

Author: Ashwal-Microsoft

azure.yaml

@@ -9,20 +9,14 @@ parameters:
   AzureAiServiceLocation:
     type: string
     default: japaneast
-  deploymentFlavor:
-    type: string
-    default: avm
   Prefix:
     type: string
     default: azdtemp
   baseUrl:
     type: string
     default: 'https://raw.githubusercontent.com/microsoft/Modernize-your-code-solution-accelerator'
-deployment:
-  mode: Incremental
-  template: ./infra/main.bicep  # Path to the main.bicep file inside the 'deployment' folder
-  parameters:
-    AzureAiServiceLocation: ${{ parameters.AzureAiServiceLocation }}
-    deploymentFlavor: ${{ parameters.deploymentFlavor }}
-    Prefix: ${{ parameters.Prefix }}
-    baseUrl: ${{ parameters.baseUrl }}
+infra:
+  provider: bicep
+  path: infra
+  module: main
+  parameters: infra/main.parameters.json

azure_custom.yaml

@@ -9,9 +9,6 @@ parameters:
   azureAiServiceLocation:
     type: string
     default: japaneast
-  deploymentFlavor:
-    type: string
-    default: avm
 
 services:
   backend:
@@ -32,3 +29,5 @@ services:
 infra:
   provider: bicep
   path: infra
+  module: main
+  parameters: infra/main.parameters.json

infra/avm/main.bicep

@@ -320,7 +320,7 @@ module dataCollectionEndpoint 'br/public:avm/res/insights/data-collection-endpoi
 
 
 // Virtual Network with NSGs and Subnets
-module virtualNetwork '../modules/virtualNetwork.bicep' = if (enablePrivateNetworking) {
+module virtualNetwork './modules/networking/virtual-network.bicep' = if (enablePrivateNetworking) {
   name: take('module.virtualNetwork.${solutionSuffix}', 64)
   params: {
     name: 'vnet-${solutionSuffix}'
@@ -754,7 +754,7 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.22.0' = if (e
   }
 }
 
-module aiServices '../modules/ai-foundry/aifoundry.bicep' = {
+module aiServices './modules/ai/ai-foundry-project.bicep' = {
   name: take('module.aifoundry.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency
@@ -845,7 +845,7 @@ module aiFoundryPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12
 
 var appStorageContainerName = 'appstorage'
 
-module storageAccount '../modules/storageAccount.bicep' = {
+module storageAccount './modules/data/storage-account.bicep' = {
   name: take('module.storageAccount.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency
@@ -882,7 +882,7 @@ module storageAccount '../modules/storageAccount.bicep' = {
   }
 }
 
-module cosmosDb '../modules/cosmosDb.bicep' = {
+module cosmosDb './modules/data/cosmos-db.bicep' = {
   name: take('module.cosmosDb.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency

infra/avm/main_custom.bicep

@@ -306,7 +306,7 @@ module applicationInsights 'br/public:avm/res/insights/component:0.7.1' = if (en
 
 
 // Virtual Network with NSGs and Subnets
-module virtualNetwork '../modules/virtualNetwork.bicep' = if (enablePrivateNetworking) {
+module virtualNetwork './modules/networking/virtual-network.bicep' = if (enablePrivateNetworking) {
   name: take('module.virtualNetwork.${solutionSuffix}', 64)
   params: {
     name: 'vnet-${solutionSuffix}'
@@ -663,7 +663,7 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.22.0' = if (e
   }
 }
 
-module aiServices '../modules/ai-foundry/aifoundry.bicep' = {
+module aiServices './modules/ai/ai-foundry-project.bicep' = {
   name: take('module.aifoundry.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency
@@ -754,7 +754,7 @@ module aiFoundryPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12
 
 var appStorageContainerName = 'appstorage'
 
-module storageAccount '../modules/storageAccount.bicep' = {
+module storageAccount './modules/data/storage-account.bicep' = {
   name: take('module.storageAccount.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency
@@ -814,7 +814,7 @@ resource acrPullRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-
   }
 }
 
-module cosmosDb '../modules/cosmosDb.bicep' = {
+module cosmosDb './modules/data/cosmos-db.bicep' = {
   name: take('module.cosmosDb.${solutionSuffix}', 64)
   #disable-next-line no-unnecessary-dependson
   dependsOn: [logAnalyticsWorkspace, virtualNetwork] // required due to optional flags that could change dependency

infra/avm/modules/ai/ai-foundry-connection.bicep

@@ -0,0 +1,11 @@
+metadata name = 'Modernize Base Placeholder Module'
+metadata description = 'Base-repo-owned placeholder module created to align infra structure with reference layout without importing external implementation.'
+
+@description('Optional pass-through settings for future module implementation.')
+param settings object = {}
+
+@description('Optional tags.')
+param tags object = {}
+
+@description('Echoes input settings so callers can safely compose with this module when needed.')
+output settings object = settings

infra/avm/modules/ai/ai-foundry-model-deployment.bicep

@@ -0,0 +1,11 @@
+metadata name = 'Modernize Base Placeholder Module'
+metadata description = 'Base-repo-owned placeholder module created to align infra structure with reference layout without importing external implementation.'
+
+@description('Optional pass-through settings for future module implementation.')
+param settings object = {}
+
+@description('Optional tags.')
+param tags object = {}
+
+@description('Echoes input settings so callers can safely compose with this module when needed.')
+output settings object = settings

infra/modules/ai-foundry/aifoundry.bicep …/avm/modules/ai/ai-foundry-project.bicepinfra/modules/ai-foundry/aifoundry.bicep renamed to infra/avm/modules/ai/ai-foundry-project.bicep infra/modules/ai-foundry/aifoundry.bicep renamed to infra/avm/modules/ai/ai-foundry-project.bicep

@@ -0,0 +1,11 @@
+metadata name = 'Modernize Base Placeholder Module'
+metadata description = 'Base-repo-owned placeholder module created to align infra structure with reference layout without importing external implementation.'
+
+@description('Optional pass-through settings for future module implementation.')
+param settings object = {}
+
+@description('Optional tags.')
+param tags object = {}
+
+@description('Echoes input settings so callers can safely compose with this module when needed.')
+output settings object = settings