Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
47 changes: 22 additions & 25 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ var existingProjectResourceId = trim(existingFoundryProjectResourceId)

// ========== AVM Telemetry ========== //
#disable-next-line no-deployments-resources
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
resource avmTelemetry 'Microsoft.Resources/deployments@2025-04-01' = if (enableTelemetry) {
name: take(
'46d3xbcp.ptn.sa-contentprocessing.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}',
64
Expand Down Expand Up @@ -197,7 +197,7 @@ module virtualNetwork './modules/virtualNetwork.bicep' = if (enablePrivateNetwor

// Azure Bastion Host
var bastionHostName = 'bas-${solutionSuffix}'
module bastionHost 'br/public:avm/res/network/bastion-host:0.8.0' = if (enablePrivateNetworking) {
module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePrivateNetworking) {
name: take('avm.res.network.bastion-host.${bastionHostName}', 64)
params: {
name: bastionHostName
Expand Down Expand Up @@ -230,7 +230,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.0' = if (enablePr

// Jumpbox Virtual Machine
var jumpboxVmName = take('vm-${solutionSuffix}', 15)
module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (enablePrivateNetworking) {
module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.22.0' = if (enablePrivateNetworking) {
name: take('avm.res.compute.virtual-machine.${jumpboxVmName}', 64)
params: {
name: jumpboxVmName
Expand Down Expand Up @@ -331,7 +331,7 @@ module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (enable
}
}

module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-configuration:0.3.2' = if (enablePrivateNetworking) {
module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-configuration:0.4.0' = if (enablePrivateNetworking) {
name: take('avm.res.maintenance-configuration.${jumpboxVmName}', 64)
params: {
name: 'mc-${jumpboxVmName}'
Expand Down Expand Up @@ -369,7 +369,7 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi

var dataCollectionRulesResourceName = 'dcr-${solutionSuffix}'
var dataCollectionRulesLocation = logAnalyticsWorkspace!.outputs.location
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.8.0' = if (enablePrivateNetworking && enableMonitoring) {
module windowsVmDataCollectionRules 'br/public:avm/res/insights/data-collection-rule:0.11.0' = if (enablePrivateNetworking && enableMonitoring) {
name: take('avm.res.insights.data-collection-rule.${dataCollectionRulesResourceName}', 64)
params: {
name: dataCollectionRulesResourceName
Expand Down Expand Up @@ -520,7 +520,7 @@ var dnsZoneIndex = {
}

@batchSize(5)
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.1' = [
for (zone, i) in privateDnsZones: if (enablePrivateNetworking) {
name: take('avm.res.network.private-dns-zone.${split(zone, '.')[1]}', 64)
params: {
Expand All @@ -547,7 +547,7 @@ module logAnalyticsWorkspace 'modules/log-analytics-workspace.bicep' = if (enabl
}
}

module applicationInsights 'br/public:avm/res/insights/component:0.7.0' = if (enableMonitoring) {
module applicationInsights 'br/public:avm/res/insights/component:0.7.1' = if (enableMonitoring) {
name: take('avm.res.insights.component.${solutionSuffix}', 64)
params: {
name: 'appi-${solutionSuffix}'
Expand Down Expand Up @@ -623,7 +623,7 @@ module avmContainerRegistry 'modules/container-registry.bicep' = {
}

// // ========== Storage Account ========== //
module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.28.0' = {
module avmStorageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
name: take('module.storage-account.${solutionSuffix}', 64)
params: {
name: 'st${replace(solutionSuffix, '-', '')}'
Expand Down Expand Up @@ -789,7 +789,7 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
}
}

module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.8.1' = if (enablePrivateNetworking && empty(existingProjectResourceId)) {
module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (enablePrivateNetworking && empty(existingProjectResourceId)) {
name: take('avm.res.network.private-endpoint.${solutionSuffix}', 64)
params: {
name: 'pep-aiservices-${solutionSuffix}'
Expand Down Expand Up @@ -829,7 +829,7 @@ module cognitiveServicePrivateEndpoint 'br/public:avm/res/network/private-endpoi
}
}

module avmAiServices_cu 'br/public:avm/res/cognitive-services/account:0.14.1' = {
module avmAiServices_cu 'br/public:avm/res/cognitive-services/account:0.14.2' = {
name: take('avm.res.cognitive-services.account.content-understanding.${solutionSuffix}', 64)

params: {
Expand Down Expand Up @@ -871,7 +871,7 @@ module avmAiServices_cu 'br/public:avm/res/cognitive-services/account:0.14.1' =
}
}

module contentUnderstandingPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.8.1' = if (enablePrivateNetworking) {
module contentUnderstandingPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (enablePrivateNetworking) {
name: take('avm.res.network.private-endpoint.aicu-${solutionSuffix}', 64)
params: {
name: 'pep-aicu-${solutionSuffix}'
Expand Down Expand Up @@ -908,7 +908,7 @@ module contentUnderstandingPrivateEndpoint 'br/public:avm/res/network/private-en
}

// ========== Container App Environment ========== //
module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.3' = {
module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.13.2' = {
name: take('avm.res.app.managed-environment.${solutionSuffix}', 64)
params: {
name: 'cae-${solutionSuffix}'
Expand All @@ -921,10 +921,7 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.3' = {
appLogsConfiguration: enableMonitoring
? {
destination: 'log-analytics'
logAnalyticsConfiguration: {
customerId: logAnalyticsWorkspace!.outputs.logAnalyticsWorkspaceId
sharedKey: logAnalyticsWorkspace.outputs.primarySharedKey
}
logAnalyticsWorkspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId
}
Comment thread
Abdul-Microsoft marked this conversation as resolved.
: null
workloadProfiles: [
Expand All @@ -948,7 +945,7 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.3' = {
}

// //=========== Managed Identity for Container Registry ========== //
module avmContainerRegistryReader 'br/public:avm/res/managed-identity/user-assigned-identity:0.4.2' = {
module avmContainerRegistryReader 'br/public:avm/res/managed-identity/user-assigned-identity:0.5.0' = {
name: take('avm.res.managed-identity.user-assigned-identity.${solutionSuffix}', 64)
params: {
name: 'id-acr-${solutionSuffix}'
Expand All @@ -959,7 +956,7 @@ module avmContainerRegistryReader 'br/public:avm/res/managed-identity/user-assig
}

// ========== Container App ========== //
module avmContainerApp 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-app'
Expand Down Expand Up @@ -1028,7 +1025,7 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.19.0' = {
}

// ========== Container App API ========== //
module avmContainerApp_API 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-api.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-api'
Expand Down Expand Up @@ -1159,7 +1156,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.19.0' = {
}

//========== Container App Web ========== //
module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-web.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-web'
Expand Down Expand Up @@ -1241,7 +1238,7 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.19.0' = {
}

// ========== Container App Workflow ========== //
module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-wkfl.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-wkfl'
Expand Down Expand Up @@ -1308,7 +1305,7 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.19.0' = {
}

// ========== Cosmos Database for Mongo DB ========== //
module avmCosmosDB 'br/public:avm/res/document-db/database-account:0.18.0' = {
module avmCosmosDB 'br/public:avm/res/document-db/database-account:0.19.0' = {
name: take('avm.res.document-db.database-account.${solutionSuffix}', 64)
params: {
name: 'cosmos-${solutionSuffix}'
Expand Down Expand Up @@ -1620,7 +1617,7 @@ module avmAppConfig_update 'br/public:avm/res/app-configuration/configuration-st
}

// ========== Container App Update Modules ========== //
module avmContainerApp_update 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-update.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-app'
Expand Down Expand Up @@ -1703,7 +1700,7 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.19.0' = {
]
}

module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-api.update.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-api'
Expand Down Expand Up @@ -1838,7 +1835,7 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.19.0' =
}

// ========== Container App Workflow Update ========== //
module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.19.0' = {
module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22.1' = {
name: take('avm.res.app.container-app-wkfl.update.${solutionSuffix}', 64)
params: {
name: 'ca-${solutionSuffix}-wkfl'
Expand Down
Loading
Loading