Skip to content

Commit b5bb2db

Browse files
Merge pull request #821 from microsoft/AVM_Bicep_Versions_Update_Akhileswara
fix: Update Bicep and AVM Modules
2 parents 33c9f90 + e535e24 commit b5bb2db

9 files changed

Lines changed: 541 additions & 260 deletions

infra/main.bicep

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ var dnsZoneIndex = {
507507
}
508508

509509
@batchSize(5)
510-
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
510+
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.1' = [
511511
for (zone, i) in privateDnsZones: if (enablePrivateNetworking) {
512512
name: take('avm.res.network.private-dns-zone.${replace(zone, '.', '-')}', 64)
513513
params: {
@@ -525,7 +525,7 @@ module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
525525
]
526526

527527
// ========== AI Foundry: AI Services ========== //
528-
module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1' = if (!useExistingAiFoundryAiProject) {
528+
module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.2' = if (!useExistingAiFoundryAiProject) {
529529
name: take('avm.res.cognitive-services.account.${aiFoundryAiServicesResourceName}', 64)
530530
params: {
531531
name: aiFoundryAiServicesResourceName
@@ -589,7 +589,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1'
589589
}
590590

591591
// Create private endpoint for AI Services AFTER the account is fully provisioned
592-
module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.11.1' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
592+
module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
593593
name: take('pep-ai-services-${aiFoundryAiServicesResourceName}', 64)
594594
params: {
595595
name: 'pep-${aiFoundryAiServicesResourceName}'
@@ -714,7 +714,7 @@ module aiSearch 'br/public:avm/res/search/search-service:0.12.0' = {
714714
}
715715

716716
// ========== AI Search Connection to AI Services ========== //
717-
resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-09-01' = if (!useExistingAiFoundryAiProject) {
717+
resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-12-01' = if (!useExistingAiFoundryAiProject) {
718718
name: '${aiFoundryAiServicesResourceName}/${aiFoundryAiProjectResourceName}/${aiSearchConnectionName}'
719719
properties: {
720720
category: 'CognitiveSearch'
@@ -735,7 +735,7 @@ var productImagesContainer = 'product-images'
735735
var generatedImagesContainer = 'generated-images'
736736
var dataContainer = 'data'
737737

738-
module storageAccount 'br/public:avm/res/storage/storage-account:0.31.1' = {
738+
module storageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
739739
name: take('avm.res.storage.storage-account.${storageAccountName}', 64)
740740
params: {
741741
name: storageAccountName
@@ -803,7 +803,7 @@ var cosmosDBDatabaseName = 'content_generation_db'
803803
var cosmosDBConversationsContainer = 'conversations'
804804
var cosmosDBProductsContainer = 'products'
805805

806-
module cosmosDB 'br/public:avm/res/document-db/database-account:0.18.0' = {
806+
module cosmosDB 'br/public:avm/res/document-db/database-account:0.19.0' = {
807807
name: take('avm.res.document-db.database-account.${cosmosDBResourceName}', 64)
808808
params: {
809809
name: 'cosmos-${solutionSuffix}'

infra/main.json

Lines changed: 516 additions & 235 deletions
Large diffs are not rendered by default.

infra/main_custom.bicep

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ var dnsZoneIndex = {
540540
}
541541

542542
@batchSize(5)
543-
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
543+
module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.1' = [
544544
for (zone, i) in privateDnsZones: if (enablePrivateNetworking) {
545545
name: take('avm.res.network.private-dns-zone.${replace(zone, '.', '-')}', 64)
546546
params: {
@@ -558,7 +558,7 @@ module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
558558
]
559559

560560
// ========== AI Foundry: AI Services ========== //
561-
module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1' = if (!useExistingAiFoundryAiProject) {
561+
module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.2' = if (!useExistingAiFoundryAiProject) {
562562
name: take('avm.res.cognitive-services.account.${aiFoundryAiServicesResourceName}', 64)
563563
params: {
564564
name: aiFoundryAiServicesResourceName
@@ -622,7 +622,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1'
622622
}
623623

624624
// Create private endpoint for AI Services AFTER the account is fully provisioned
625-
module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.11.1' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
625+
module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
626626
name: take('pep-ai-services-${aiFoundryAiServicesResourceName}', 64)
627627
params: {
628628
name: 'pep-${aiFoundryAiServicesResourceName}'
@@ -747,7 +747,7 @@ module aiSearch 'br/public:avm/res/search/search-service:0.12.0' = {
747747
}
748748

749749
// ========== AI Search Connection to AI Services ========== //
750-
resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-09-01' = if (!useExistingAiFoundryAiProject) {
750+
resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-12-01' = if (!useExistingAiFoundryAiProject) {
751751
name: '${aiFoundryAiServicesResourceName}/${aiFoundryAiProjectResourceName}/${aiSearchConnectionName}'
752752
properties: {
753753
category: 'CognitiveSearch'
@@ -768,7 +768,7 @@ var productImagesContainer = 'product-images'
768768
var generatedImagesContainer = 'generated-images'
769769
var dataContainer = 'data'
770770

771-
module storageAccount 'br/public:avm/res/storage/storage-account:0.31.1' = {
771+
module storageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
772772
name: take('avm.res.storage.storage-account.${storageAccountName}', 64)
773773
params: {
774774
name: storageAccountName
@@ -836,7 +836,7 @@ var cosmosDBDatabaseName = 'content_generation_db'
836836
var cosmosDBConversationsContainer = 'conversations'
837837
var cosmosDBProductsContainer = 'products'
838838

839-
module cosmosDB 'br/public:avm/res/document-db/database-account:0.18.0' = {
839+
module cosmosDB 'br/public:avm/res/document-db/database-account:0.19.0' = {
840840
name: take('avm.res.document-db.database-account.${cosmosDBResourceName}', 64)
841841
params: {
842842
name: 'cosmos-${solutionSuffix}'

infra/modules/ai-project.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ var existingOpenAIEndpoint = useExistingAiFoundryAiProject
2222
: ''
2323

2424
// Reference to cognitive service in current resource group for new projects
25-
resource cogServiceReference 'Microsoft.CognitiveServices/accounts@2025-10-01-preview' existing = {
25+
resource cogServiceReference 'Microsoft.CognitiveServices/accounts@2025-12-01' existing = {
2626
name: aiServicesName
2727
}
2828

29-
resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-10-01-preview' = {
29+
resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-12-01' = {
3030
parent: cogServiceReference
3131
name: name
3232
tags: tags

infra/modules/container-instance.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var isPrivateNetworking = !empty(subnetResourceId)
4141
// ============== //
4242

4343
#disable-next-line no-deployments-resources
44-
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
44+
resource avmTelemetry 'Microsoft.Resources/deployments@2025-04-01' = if (enableTelemetry) {
4545
name: '46d3xbcp.res.containerinstance.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
4646
properties: {
4747
mode: 'Incremental'

infra/modules/deploy_ai_model.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ param aiServicesName string
55
param deployments array = []
66

77
// Reference AI Services account (module is scoped to the correct resource group)
8-
resource aiServices 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' existing = {
8+
resource aiServices 'Microsoft.CognitiveServices/accounts@2025-12-01' existing = {
99
name: aiServicesName
1010
}
1111

1212
// Deploy models to AI Services account
1313
// Using batchSize(1) to avoid concurrent deployment issues
1414
@batchSize(1)
15-
resource modelDeployments 'Microsoft.CognitiveServices/accounts/deployments@2024-10-01' = [
15+
resource modelDeployments 'Microsoft.CognitiveServices/accounts/deployments@2025-12-01' = [
1616
for (deployment, index) in deployments: {
1717
parent: aiServices
1818
name: deployment.name

infra/modules/deploy_foundry_role_assignment.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ resource cognitiveServicesOpenAiUserRole 'Microsoft.Authorization/roleDefinition
3636
// ========== Existing Resources ========== //
3737

3838
// Reference the existing AI Services account
39-
resource existingAiServices 'Microsoft.CognitiveServices/accounts@2025-10-01-preview' existing = {
39+
resource existingAiServices 'Microsoft.CognitiveServices/accounts@2025-12-01' existing = {
4040
name: aiServicesName
4141
}
4242

4343
// Reference the existing AI Project (if provided)
44-
resource existingAiProject 'Microsoft.CognitiveServices/accounts/projects@2025-10-01-preview' existing = if (!empty(aiProjectName)) {
44+
resource existingAiProject 'Microsoft.CognitiveServices/accounts/projects@2025-12-01' existing = if (!empty(aiProjectName)) {
4545
name: aiProjectName
4646
parent: existingAiServices
4747
}

infra/modules/virtualNetwork.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ param resourceSuffix string
212212

213213
// Create NSGs for subnets using AVM Network Security Group module
214214
@batchSize(1)
215-
module nsgs 'br/public:avm/res/network/network-security-group:0.5.2' = [
215+
module nsgs 'br/public:avm/res/network/network-security-group:0.5.3' = [
216216
for (subnet, i) in vnetSubnets: if (!empty(subnet.?networkSecurityGroup)) {
217217
name: take('avm.res.network.network-security-group.${subnet.?networkSecurityGroup.name}.${resourceSuffix}', 64)
218218
params: {
@@ -226,7 +226,7 @@ module nsgs 'br/public:avm/res/network/network-security-group:0.5.2' = [
226226
]
227227

228228
// Create VNet and subnets using AVM Virtual Network module
229-
module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.2' = {
229+
module virtualNetwork 'br/public:avm/res/network/virtual-network:0.8.0' = {
230230
name: take('avm.res.network.virtual-network.${vnetName}', 64)
231231
params: {
232232
name: vnetName

infra/modules/web-sites.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ param clientAffinityEnabled bool = true
3636
@description('Optional. The resource ID of the app service environment to use for this resource.')
3737
param appServiceEnvironmentResourceId string?
3838

39-
import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types:0.5.1'
39+
import { managedIdentityAllType } from 'br/public:avm/utl/types/avm-common-types:0.7.0'
4040
@description('Optional. The managed identity definition for this resource.')
4141
param managedIdentities managedIdentityAllType?
4242

@@ -80,14 +80,14 @@ param configs appSettingsConfigType[]?
8080
@description('Optional. The Function App configuration object.')
8181
param functionAppConfig resourceInput<'Microsoft.Web/sites@2025-03-01'>.properties.functionAppConfig?
8282

83-
import { privateEndpointSingleServiceType } from 'br/public:avm/utl/types/avm-common-types:0.5.1'
83+
import { privateEndpointSingleServiceType } from 'br/public:avm/utl/types/avm-common-types:0.7.0'
8484
@description('Optional. Configuration details for private endpoints.')
8585
param privateEndpoints privateEndpointSingleServiceType[]?
8686

8787
@description('Optional. Tags of the resource.')
8888
param tags object?
8989

90-
import { diagnosticSettingFullType } from 'br/public:avm/utl/types/avm-common-types:0.5.1'
90+
import { diagnosticSettingFullType } from 'br/public:avm/utl/types/avm-common-types:0.7.0'
9191
@description('Optional. The diagnostic settings of the service.')
9292
param diagnosticSettings diagnosticSettingFullType[]?
9393

@@ -266,7 +266,7 @@ resource app_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-0
266266
}
267267
]
268268

269-
module app_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.11.1' = [
269+
module app_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.12.0' = [
270270
for (privateEndpoint, index) in (privateEndpoints ?? []): {
271271
name: '${uniqueString(deployment().name, location)}-app-PrivateEndpoint-${index}'
272272
scope: resourceGroup(

0 commit comments

Comments
 (0)