Skip to content

Commit 6631435

Browse files
fix: AVM and Bicep versions update (#2181)
1 parent 9a89ab9 commit 6631435

29 files changed

Lines changed: 3906 additions & 4530 deletions

File tree

extensions/teams/infra/azure.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ param webAppName string = resourceBaseName
3030
param location string = resourceGroup().location
3131

3232
// Compute resources for your Web App
33-
resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
33+
resource serverfarm 'Microsoft.Web/serverfarms@2024-04-01' = {
3434
kind: 'app'
3535
location: location
3636
name: serverfarmsName
@@ -40,7 +40,7 @@ resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
4040
}
4141

4242
// Web App that hosts your bot
43-
resource webApp 'Microsoft.Web/sites@2021-02-01' = {
43+
resource webApp 'Microsoft.Web/sites@2024-04-01' = {
4444
kind: 'app'
4545
location: location
4646
name: webAppName

infra/main.bicep

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ var replicaLocation = replicaRegionPairs[location]
423423
// ============== //
424424

425425
#disable-next-line no-deployments-resources
426-
resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
426+
resource avmTelemetry 'Microsoft.Resources/deployments@2025-04-01' = if (enableTelemetry) {
427427
name: '46d3xbcp.ptn.sa-chatwithyourdata.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'
428428
properties: {
429429
mode: 'Incremental'
@@ -472,7 +472,7 @@ module virtualNetwork 'modules/virtualNetwork.bicep' = if (enablePrivateNetworki
472472

473473
// Azure Bastion Host
474474
var bastionHostName = 'bas-${solutionSuffix}'
475-
module bastionHost 'br/public:avm/res/network/bastion-host:0.6.1' = if (enablePrivateNetworking) {
475+
module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (enablePrivateNetworking) {
476476
name: take('avm.res.network.bastion-host.${bastionHostName}', 64)
477477
params: {
478478
name: bastionHostName
@@ -495,14 +495,14 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.6.1' = if (enablePr
495495
enableTelemetry: enableTelemetry
496496
publicIPAddressObject: {
497497
name: 'pip-${bastionHostName}'
498-
zones: []
498+
availabilityZones: []
499499
}
500500
}
501501
}
502502

503503
// Jumpbox Virtual Machine
504504
var jumpboxVmName = take('vm-jumpbox-${solutionSuffix}', 15)
505-
module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.15.0' = if (enablePrivateNetworking) {
505+
module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.22.0' = if (enablePrivateNetworking) {
506506
name: take('avm.res.compute.virtual-machine.${jumpboxVmName}', 64)
507507
params: {
508508
name: take(jumpboxVmName, 15) // Shorten VM name to 15 characters to avoid Azure limits
@@ -511,7 +511,7 @@ module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.15.0' = if (enable
511511
adminUsername: !empty(virtualMachineAdminUsername) ? virtualMachineAdminUsername : 'JumpboxAdminUser'
512512
adminPassword: !empty(virtualMachineAdminPassword) ? virtualMachineAdminPassword : 'JumpboxAdminP@ssw0rd1234!'
513513
tags: tags
514-
zone: 0
514+
availabilityZone: 1
515515
imageReference: {
516516
offer: 'WindowsServer'
517517
publisher: 'MicrosoftWindowsServer'
@@ -564,7 +564,7 @@ module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.15.0' = if (enable
564564
// using AVM Virtual Machine module
565565
// https://github.com/Azure/bicep-registry-modules/tree/main/avm/res/compute/virtual-machine
566566

567-
module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-configuration:0.3.1' = if (enablePrivateNetworking) {
567+
module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-configuration:0.4.0' = if (enablePrivateNetworking) {
568568
name: take('avm.res.maintenance.maintenance-configuration.${solutionSuffix}', 64)
569569
params: {
570570
name: 'mc-${solutionSuffix}'
@@ -602,7 +602,7 @@ module maintenanceConfiguration 'br/public:avm/res/maintenance/maintenance-confi
602602

603603
// ========== Managed Identity ========== //
604604
var userAssignedIdentityResourceName = 'id-${solutionSuffix}'
605-
module managedIdentityModule 'br/public:avm/res/managed-identity/user-assigned-identity:0.4.1' = {
605+
module managedIdentityModule 'br/public:avm/res/managed-identity/user-assigned-identity:0.5.0' = {
606606
name: take('avm.res.managed-identity.user-assigned-identity.${userAssignedIdentityResourceName}', 64)
607607
params: {
608608
name: userAssignedIdentityResourceName
@@ -751,7 +751,7 @@ var allowAllIPsFirewall = false
751751
var allowAzureIPsFirewall = true
752752
var postgresResourceName = '${azurePostgresDBAccountName}-postgres'
753753
var postgresDBName = 'postgres'
754-
module postgresDBModule 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.13.1' = if (databaseType == 'PostgreSQL') {
754+
module postgresDBModule 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.15.2' = if (databaseType == 'PostgreSQL') {
755755
name: take('avm.res.db-for-postgre-sql.flexible-server.${azurePostgresDBAccountName}', 64)
756756
params: {
757757
name: postgresResourceName
@@ -1077,7 +1077,7 @@ module speechService 'modules/core/ai/cognitiveservices.bicep' = {
10771077
dependsOn: enablePrivateNetworking ? avmPrivateDnsZones : []
10781078
}
10791079

1080-
resource search 'Microsoft.Search/searchServices@2024-06-01-preview' = if (databaseType == 'CosmosDB') {
1080+
resource search 'Microsoft.Search/searchServices@2025-05-01' = if (databaseType == 'CosmosDB') {
10811081
name: azureAISearchName
10821082
location: location
10831083
sku: {
@@ -1086,7 +1086,7 @@ resource search 'Microsoft.Search/searchServices@2024-06-01-preview' = if (datab
10861086
}
10871087

10881088
// Separate module for Search Service to enable managed identity and update other properties, as this reduces deployment time for the search service
1089-
module searchUpdate 'br/public:avm/res/search/search-service:0.11.1' = if (databaseType == 'CosmosDB') {
1089+
module searchUpdate 'br/public:avm/res/search/search-service:0.12.0' = if (databaseType == 'CosmosDB') {
10901090
name: take('avm.res.search.update.${azureAISearchName}', 64)
10911091
params: {
10921092
// Required parameters
@@ -1101,7 +1101,7 @@ module searchUpdate 'br/public:avm/res/search/search-service:0.11.1' = if (datab
11011101
}
11021102
}
11031103
disableLocalAuth: false
1104-
hostingMode: 'default'
1104+
hostingMode: 'Default'
11051105
networkRuleSet: {
11061106
bypass: 'AzureServices'
11071107
ipRules: []
@@ -1180,7 +1180,7 @@ module searchUpdate 'br/public:avm/res/search/search-service:0.11.1' = if (datab
11801180
// AVM WAF - Server Farm + Web Site conversions
11811181
var webServerFarmResourceName = hostingPlanName
11821182

1183-
module webServerFarm 'br/public:avm/res/web/serverfarm:0.5.0' = {
1183+
module webServerFarm 'br/public:avm/res/web/serverfarm:0.7.0' = {
11841184
name: take('avm.res.web.serverfarm.${webServerFarmResourceName}', 64)
11851185
scope: resourceGroup()
11861186
params: {
@@ -1736,7 +1736,7 @@ module workbook 'modules/app/workbook.bicep' = if (enableMonitoring) {
17361736
}
17371737
}
17381738

1739-
module avmEventGridSystemTopic 'br/public:avm/res/event-grid/system-topic:0.6.3' = {
1739+
module avmEventGridSystemTopic 'br/public:avm/res/event-grid/system-topic:0.6.4' = {
17401740
name: take('avm.res.event-grid.system-topic.${eventGridSystemTopicName}', 64)
17411741
params: {
17421742
name: eventGridSystemTopicName
@@ -1853,7 +1853,7 @@ var azureCosmosDBInfo = string({
18531853
})
18541854

18551855
var azurePostgresDBInfo = string({
1856-
host_name: databaseType == 'PostgreSQL' ? postgresDBModule!.outputs.fqdn : ''
1856+
host_name: databaseType == 'PostgreSQL' ? (postgresDBModule.?outputs.?fqdn ?? '') : ''
18571857
database_name: databaseType == 'PostgreSQL' ? postgresDBName : ''
18581858
user: ''
18591859
})

0 commit comments

Comments
 (0)