Skip to content

Commit 3db2e5e

Browse files
DongbumleeDongbumlee
committed
sanitized
1 parent 051bb85 commit 3db2e5e

1 file changed

Lines changed: 2 additions & 243 deletions

File tree

‎infra/main.bicep‎

Lines changed: 2 additions & 243 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,6 @@ param gptDeploymentCapacity int
3232
param useLocalBuild string = 'false'
3333

3434
// ============ make up Parameters from bicep parameter module ========== //
35-
// module parammaker 'modules/parameters.bicep' = {
36-
// name: 'parammaker'
37-
// params: {
38-
// environmentName: environmentName
39-
// contentUnderstandingLocation: contentUnderstandingLocation
40-
// deploymentType: deploymentType
41-
// gptModelName: gptModelName
42-
// gptModelVersion: gptModelVersion
43-
// gptDeploymentCapacity: gptDeploymentCapacity
44-
// useLocalBuild: useLocalBuild
45-
// }
46-
// }
47-
48-
// param deployment_parameter default_deployment_param_type
49-
// param ai_deployment_parameter ai_deployment_param_type
50-
// param container_app_parameter container_app_deployment_info_type
5135

5236
// =========== Build Parameters ========== //
5337
param deployment_param default_deployment_param_type = {
@@ -68,9 +52,6 @@ param deployment_param default_deployment_param_type = {
6852
naming_abbrs: loadJsonContent('./abbreviations.json')
6953
}
7054

71-
// ========== Load Abbreviations ========== //
72-
// var abbrs object = loadJsonContent('./abbreviations.json')
73-
7455
param ai_deployment ai_deployment_param_type = {
7556
gpt_deployment_type_name: deploymentType
7657
gpt_model_name: gptModelName
@@ -119,28 +100,6 @@ module avmRoleAssignment 'br/public:avm/ptn/authorization/resource-role-assignme
119100
scope: resourceGroup(resourceGroup().name)
120101
}
121102

122-
// Assign Owner role to the managed identity in the resource group
123-
// module bicepOwnerRoleAssignment 'modules/role_assignment.bicep' = {
124-
// name: format(deployment_param.resource_name_format_string, 'rbac-owner')
125-
// params: {
126-
// managedIdentityResourceId: avmManagedIdentity.outputs.resourceId
127-
// managedIdentityPrincipalId: avmManagedIdentity.outputs.principalId
128-
// roleDefinitionId: subscriptionResourceId(
129-
// 'Microsoft.Authorization/roleDefinitions',
130-
// '8e3af657-a8ff-443c-a75c-2fe8c4bcb635'
131-
// ) // Built-in role 'Owner'
132-
// }
133-
// }
134-
// module managedIdentityModule 'deploy_managed_identity.bicep' = {
135-
// name: 'deploy_managed_identity'
136-
// params: {
137-
// solutionName: solutionPrefix
138-
// miName: '${abbrs.security.managedIdentity}${solutionPrefix}'
139-
// solutionLocation: resourceGroupLocation
140-
// }
141-
// scope: resourceGroup(resourceGroup().name)
142-
// }
143-
144103
// ========== Key Vault Module ========== //
145104
module avmKeyVault './modules/key-vault.bicep' = {
146105
name: format(deployment_param.resource_name_format_string, deployment_param.naming_abbrs.security.keyVault)
@@ -188,16 +147,6 @@ module avmKeyVault_RoleAssignment_appConfig 'br/public:avm/ptn/authorization/res
188147
}
189148
}
190149

191-
// module kvault 'deploy_keyvault.bicep' = {
192-
// name: 'deploy_keyvault'
193-
// params: {
194-
// solutionLocation: resourceGroupLocation
195-
// keyvaultName: '${abbrs.security.keyVault}${solutionPrefix}'
196-
// managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId
197-
// }
198-
// scope: resourceGroup(resourceGroup().name)
199-
// }
200-
201150
// ========== Application insights ========== //
202151
module avmLogAnalyticsWorkspace 'br/public:avm/res/operational-insights/workspace:0.11.2' = {
203152
name: format(
@@ -230,15 +179,7 @@ module avmApplicationInsights 'br/public:avm/res/insights/component:0.6.0' = {
230179
}
231180
}
232181

233-
// module applicationInsights 'deploy_app_insights.bicep' = {
234-
// name: 'deploy_app_insights'
235-
// params: {
236-
// applicationInsightsName: '${abbrs.managementGovernance.applicationInsights}${solutionPrefix}'
237-
// logAnalyticsWorkspaceName: '${abbrs.managementGovernance.logAnalyticsWorkspace}${solutionPrefix}'
238-
// }
239-
// }
240-
241-
// // ========== Container Registry ========== //
182+
// ========== Container Registry ========== //
242183
module avmContainerRegistry 'modules/container-registry.bicep' = {
243184
//name: format(deployment_param.resource_name_format_string, abbrs.containers.containerRegistry)
244185
params: {
@@ -253,13 +194,6 @@ module avmContainerRegistry 'modules/container-registry.bicep' = {
253194
}
254195
}
255196

256-
// module containerRegistry 'deploy_container_registry.bicep' = {
257-
// name: 'deploy_container_registry'
258-
// params: {
259-
// environmentName: environmentName
260-
// }
261-
// }
262-
263197
// // ========== Storage Account ========== //
264198
module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
265199
name: format(deployment_param.resource_name_format_string, deployment_param.naming_abbrs.storage.storageAccount)
@@ -275,14 +209,6 @@ module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
275209
principalId: avmManagedIdentity.outputs.principalId
276210
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
277211
}
278-
// {
279-
// principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId
280-
// roleDefinitionIdOrName: 'Storage Blob Data Contributor'
281-
// }
282-
// {
283-
// principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId
284-
// roleDefinitionIdOrName: 'Storage Queue Data Contributor'
285-
// }
286212
]
287213
networkAcls: {
288214
bypass: 'AzureServices'
@@ -338,29 +264,7 @@ module avmStorageAccount_RoleAssignment_avmContainerApp_API_queue 'br/public:avm
338264
}
339265
}
340266

341-
// module storage 'deploy_storage_account.bicep' = {
342-
// name: 'deploy_storage_account'
343-
// params: {
344-
// solutionLocation: resourceGroupLocation
345-
// managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId
346-
// saName: '${abbrs.storage.storageAccount}${solutionPrefix}'
347-
// }
348-
// }
349-
350267
// // ========== AI Foundry and related resources ========== //
351-
// var aiModelDeployments = [
352-
// {
353-
// name: gptModelName
354-
// model: gptModelName
355-
// version: gptModelVersion
356-
// sku: {
357-
// name: deploymentType
358-
// capacity: gptDeploymentCapacity
359-
// }
360-
// raiPolicyName: 'Microsoft.Default'
361-
// }
362-
// ]
363-
364268
module avmAiServices 'br/public:avm/res/cognitive-services/account:0.10.2' = {
365269
name: format(deployment_param.resource_name_format_string, deployment_param.naming_abbrs.ai.aiServices)
366270

@@ -377,12 +281,6 @@ module avmAiServices 'br/public:avm/res/cognitive-services/account:0.10.2' = {
377281
customSubDomainName: '${deployment_param.naming_abbrs.ai.aiServices}${deployment_param.solution_prefix}'
378282
disableLocalAuth: true
379283
publicNetworkAccess: 'Enabled'
380-
// roleAssignments: [
381-
// {
382-
// principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId
383-
// roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
384-
// }
385-
// ]
386284
deployments: [
387285
{
388286
name: ai_deployment.gpt_model_name
@@ -428,12 +326,6 @@ module avmAiServices_cu 'br/public:avm/res/cognitive-services/account:0.10.2' =
428326
}
429327
customSubDomainName: 'aicu-${deployment_param.solution_prefix}'
430328
disableLocalAuth: true
431-
// roleAssignments: [
432-
// {
433-
// principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId
434-
// roleDefinitionIdOrName: 'Cognitive Services User'
435-
// }
436-
// ]
437329
}
438330
}
439331

@@ -544,24 +436,6 @@ module avmAiProject 'br/public:avm/res/machine-learning-services/workspace:0.12.
544436
}
545437
}
546438

547-
// module aifoundry 'deploy_ai_foundry.bicep' = {
548-
// name: 'deploy_ai_foundry'
549-
// params: {
550-
// solutionName: solutionPrefix
551-
// solutionLocation: resourceGroupLocation
552-
// keyVaultName: kvault.outputs.keyvaultName
553-
// cuLocation: contentUnderstandingLocation
554-
// deploymentType: deploymentType
555-
// gptModelName: gptModelName
556-
// gptModelVersion: gptModelVersion
557-
// gptDeploymentCapacity: gptDeploymentCapacity
558-
// managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId
559-
// containerRegistryId: containerRegistry.outputs.createdAcrId
560-
// applicationInsightsId: applicationInsights.outputs.id
561-
// }
562-
// scope: resourceGroup(resourceGroup().name)
563-
// }
564-
565439
// ========== Container App Environment ========== //
566440
module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.1' = {
567441
name: format(
@@ -615,28 +489,6 @@ module bicepAcrPullRoleAssignment 'br/public:avm/ptn/authorization/resource-role
615489
scope: resourceGroup(resourceGroup().name)
616490
}
617491

618-
// module bicepAcrPullRoleAssignment_ 'modules/role_assignment.bicep' = {
619-
// name: format(deployment_param.resource_name_format_string, 'rbac-acr-pull')
620-
// params: {
621-
// managedIdentityResourceId: avmContainerRegistryReader.outputs.resourceId
622-
// managedIdentityPrincipalId: avmContainerRegistryReader.outputs.principalId
623-
// roleDefinitionId: subscriptionResourceId(
624-
// 'Microsoft.Authorization/roleDefinitions',
625-
// '7f951dda-4ed3-4680-a7ca-43fe172d538d'
626-
// ) // AcrPull role
627-
// }
628-
// }
629-
630-
// module containerAppEnv './container_app/deploy_container_app_env.bicep' = {
631-
// name: 'deploy_container_app_env'
632-
// params: {
633-
// solutionName: solutionPrefix
634-
// containerEnvName: '${abbrs.containers.containerAppsEnvironment}${solutionPrefix}'
635-
// location: secondaryLocation
636-
// logAnalyticsWorkspaceName: applicationInsights.outputs.logAnalyticsWorkspaceName
637-
// }
638-
// }
639-
640492
// ========== Container App ========== //
641493
module avmContainerApp 'br/public:avm/res/app/container-app:0.16.0' = {
642494
name: format(deployment_param.resource_name_format_string, 'caapp-')
@@ -884,28 +736,6 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.16.0' = {
884736
]
885737
}
886738
}
887-
888-
// module containerApps './container_app/deploy_container_app_api_web.bicep' = {
889-
// name: 'deploy_container_app_api_web'
890-
// params: {
891-
// solutionName: solutionPrefix
892-
// location: secondaryLocation
893-
// appConfigEndPoint: ''
894-
// containerAppApiEndpoint: ''
895-
// containerAppWebEndpoint: ''
896-
// azureContainerRegistry: containerImageEndPoint
897-
// containerAppEnvId: containerAppEnv.outputs.containerEnvId
898-
// containerRegistryReaderId: containerAppEnv.outputs.containerRegistryReaderId
899-
// minReplicaContainerApp: minReplicaContainerApp
900-
// maxReplicaContainerApp: maxReplicaContainerApp
901-
// minReplicaContainerApi: minReplicaContainerApi
902-
// maxReplicaContainerApi: maxReplicaContainerApi
903-
// minReplicaContainerWeb: minReplicaContainerWeb
904-
// maxReplicaContainerWeb: maxReplicaContainerWeb
905-
// useLocalBuild: 'false'
906-
// }
907-
// }
908-
909739
// ========== Cosmos Database for Mongo DB ========== //
910740
module avmCosmosDB 'br/public:avm/res/document-db/database-account:0.15.0' = {
911741
name: format(deployment_param.resource_name_format_string, deployment_param.naming_abbrs.databases.cosmosDBDatabase)
@@ -1051,20 +881,6 @@ module avmAppConfig 'br/public:avm/res/app-configuration/configuration-store:0.6
1051881
value: avmCosmosDB.outputs.primaryReadWriteConnectionString
1052882
}
1053883
]
1054-
// roleAssignments: [
1055-
// {
1056-
// principalId: avmContainerApp.outputs.?systemAssignedMIPrincipalId
1057-
// roleDefinitionIdOrName: 'App Configuration Data Reader'
1058-
// }
1059-
// {
1060-
// principalId: avmContainerApp_API.outputs.?systemAssignedMIPrincipalId
1061-
// roleDefinitionIdOrName: 'App Configuration Data Reader'
1062-
// }
1063-
// {
1064-
// principalId: avmContainerApp_Web.outputs.?systemAssignedMIPrincipalId
1065-
// roleDefinitionIdOrName: 'App Configuration Data Reader'
1066-
// }
1067-
// ]
1068884
}
1069885
}
1070886

@@ -1100,64 +916,7 @@ module avmRoleAssignment_container_app_web 'br/public:avm/ptn/authorization/reso
1100916
}
1101917
}
1102918

1103-
// module appconfig 'deploy_app_config_service.bicep' = {
1104-
// name: 'deploy_app_config_service'
1105-
// scope: resourceGroup(resourceGroup().name)
1106-
// params: {
1107-
// appConfigName: '${abbrs.developerTools.appConfigurationStore}${solutionPrefix}'
1108-
// storageBlobUrl: storage.outputs.storageBlobUrl
1109-
// storageQueueUrl: storage.outputs.storageQueueUrl
1110-
// openAIEndpoint: aifoundry.outputs.aiServicesTarget
1111-
// contentUnderstandingEndpoint: aifoundry.outputs.aiServicesCUEndpoint
1112-
// gptModelName: gptModelName
1113-
// keyVaultId: kvault.outputs.keyvaultId
1114-
// aiProjectConnectionString: aifoundry.outputs.aiProjectConnectionString
1115-
// cosmosDbName: cosmosdb.outputs.cosmosAccountName
1116-
// }
1117-
// }
1118-
1119-
// // ========== Role Assignments ========== //
1120-
// module roleAssignments 'deploy_role_assignments.bicep' = {
1121-
// name: 'deploy_role_assignments'
1122-
// params: {
1123-
// appConfigResourceId: appconfig.outputs.appConfigId
1124-
// conainerAppPrincipalIds: [
1125-
// containerApps.outputs.containerAppPrincipalId
1126-
// containerApps.outputs.containerAppApiPrincipalId
1127-
// containerApps.outputs.containerAppWebPrincipalId
1128-
// ]
1129-
// storageResourceId: storage.outputs.storageId
1130-
// storagePrincipalId: storage.outputs.storagePrincipalId
1131-
// containerApiPrincipalId: containerApps.outputs.containerAppApiPrincipalId
1132-
// containerAppPrincipalId: containerApps.outputs.containerAppPrincipalId
1133-
// aiServiceCUId: aifoundry.outputs.aiServicesCuId
1134-
// aiServiceId: aifoundry.outputs.aiServicesId
1135-
// containerRegistryReaderPrincipalId: containerAppEnv.outputs.containerRegistryReaderPrincipalId
1136-
// }
1137-
// }
1138-
1139-
// module updateContainerApp './container_app/deploy_container_app_api_web.bicep' = {
1140-
// name: 'deploy_update_container_app_update'
1141-
// params: {
1142-
// solutionName: solutionPrefix
1143-
// location: secondaryLocation
1144-
// azureContainerRegistry: useLocalBuildLower == 'true' ? containerRegistry.outputs.acrEndpoint : containerImageEndPoint
1145-
// appConfigEndPoint: appconfig.outputs.appConfigEndpoint
1146-
// containerAppEnvId: containerAppEnv.outputs.containerEnvId
1147-
// containerRegistryReaderId: containerAppEnv.outputs.containerRegistryReaderId
1148-
// containerAppWebEndpoint: containerApps.outputs.containweAppWebEndPoint
1149-
// containerAppApiEndpoint: containerApps.outputs.containweAppApiEndPoint
1150-
// minReplicaContainerApp: minReplicaContainerApp
1151-
// maxReplicaContainerApp: maxReplicaContainerApp
1152-
// minReplicaContainerApi: minReplicaContainerApi
1153-
// maxReplicaContainerApi: maxReplicaContainerApi
1154-
// minReplicaContainerWeb: minReplicaContainerWeb
1155-
// maxReplicaContainerWeb: maxReplicaContainerWeb
1156-
// useLocalBuild: useLocalBuildLower
1157-
// }
1158-
// dependsOn: [roleAssignments]
1159-
// }
1160-
919+
// ========== Container App Update Modules ========== //
1161920
module avmContainerApp_update 'br/public:avm/res/app/container-app:0.16.0' = {
1162921
name: format(deployment_param.resource_name_format_string, 'caapp-update-')
1163922
params: {

0 commit comments

Comments
 (0)