Skip to content

Commit 768d95c

Browse files
authored
pull base content,head:MicrosoftDocs:main,into:wwlpublishsync
2 parents 98cc204 + 9994346 commit 768d95c

File tree

158 files changed

+455
-462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+455
-462
lines changed

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/2-conditional-expression-variable.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resource auditStorageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = if
1818
kind: 'StorageV2'
1919
}
2020

21-
resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2023-08-01-preview' = if (auditingEnabled) {
21+
resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2024-05-01-preview' = if (auditingEnabled) {
2222
parent: server
2323
name: 'default'
2424
properties: {

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/2-conditional-expression.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
])
55
param environmentName string
66

7-
resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2023-08-01-preview' = if (environmentName == 'Production') {
7+
resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2024-05-01-preview' = if (environmentName == 'Production') {
88
parent: server
99
name: 'default'
1010
properties: {

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/3-template.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var sqlDatabaseName = 'TeddyBear'
3030
var auditingEnabled = environmentName == 'Production'
3131
var auditStorageAccountName = take('bearaudit${location}${uniqueString(resourceGroup().id)}', 24)
3232

33-
resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
33+
resource sqlServer 'Microsoft.Sql/servers@2024-05-01-preview' = {
3434
name: sqlServerName
3535
location: location
3636
properties: {
@@ -39,7 +39,7 @@ resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
3939
}
4040
}
4141

42-
resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-08-01-preview' = {
42+
resource sqlDatabase 'Microsoft.Sql/servers/databases@2024-05-01-preview' = {
4343
parent: sqlServer
4444
name: sqlDatabaseName
4545
location: location
@@ -55,12 +55,12 @@ resource auditStorageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = if
5555
kind: 'StorageV2'
5656
}
5757

58-
resource sqlServerAudit 'Microsoft.Sql/servers/auditingSettings@2023-08-01-preview' = if (auditingEnabled) {
58+
resource sqlServerAudit 'Microsoft.Sql/servers/auditingSettings@2024-05-01-preview' = if (auditingEnabled) {
5959
parent: sqlServer
6060
name: 'default'
6161
properties: {
6262
state: 'Enabled'
6363
storageEndpoint: environmentName == 'Production' ? auditStorageAccount.properties.primaryEndpoints.blob : ''
64-
storageAccountAccessKey: environmentName == 'Production' ? listKeys(auditStorageAccount.id, auditStorageAccount.apiVersion).keys[0].value : ''
64+
storageAccountAccessKey: environmentName == 'Production' ? auditStorageAccount.listKeys().keys[0].value : ''
6565
}
6666
}

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/4-loop-condition.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ param sqlServerDetails array = [
1616
}
1717
]
1818

19-
resource sqlServers 'Microsoft.Sql/servers@2023-08-01-preview' = [for sqlServer in sqlServerDetails: if (sqlServer.environmentName == 'Production') {
19+
resource sqlServers 'Microsoft.Sql/servers@2024-05-01-preview' = [for sqlServer in sqlServerDetails: if (sqlServer.environmentName == 'Production') {
2020
name: sqlServer.name
2121
location: sqlServer.location
2222
properties: {

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/4-loop-index.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ param locations array = [
44
'eastasia'
55
]
66

7-
resource sqlServers 'Microsoft.Sql/servers@2023-08-01-preview' = [for (location, i) in locations: {
7+
resource sqlServers 'Microsoft.Sql/servers@2024-05-01-preview' = [for (location, i) in locations: {
88
name: 'sqlserver-${i+1}'
99
location: location
1010
properties: {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@batchSize(1)
22
@batchSize(2)
3-
resource appServiceApp 'Microsoft.Web/sites@2023-12-01' = [for i in range(1,3): {
3+
resource appServiceApp 'Microsoft.Web/sites@2024-04-01' = [for i in range(1,3): {
44
name: 'app${i}'
55
// ...
66
}]

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/6-loop-nested.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param locations array = [
66

77
var subnetCount = 2
88

9-
resource virtualNetworks 'Microsoft.Network/virtualNetworks@2024-01-01' = [for (location, i) in locations : {
9+
resource virtualNetworks 'Microsoft.Network/virtualNetworks@2024-05-01' = [for (location, i) in locations : {
1010
name: 'vnet-${location}'
1111
location: location
1212
properties: {

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/6-loop-property.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ param subnetNames array = [
33
'worker'
44
]
55

6-
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-01-01' = {
6+
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = {
77
name: 'teddybear'
88
location: resourceGroup().location
99
properties: {

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/7-loop-variable.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var subnetsProperty = [for subnet in subnets: {
1717
}
1818
}]
1919

20-
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-01-01' = {
20+
resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = {
2121
name: 'teddybear'
2222
location: resourceGroup().location
2323
properties:{

learn-pr/azure/build-flexible-bicep-templates-conditions-loops/includes/code/8-database.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var sqlDatabaseName = 'TeddyBear'
3030
var auditingEnabled = environmentName == 'Production'
3131
var auditStorageAccountName = take('bearaudit${location}${uniqueString(resourceGroup().id)}', 24)
3232

33-
resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
33+
resource sqlServer 'Microsoft.Sql/servers@2024-05-01-preview' = {
3434
name: sqlServerName
3535
location: location
3636
properties: {
@@ -39,7 +39,7 @@ resource sqlServer 'Microsoft.Sql/servers@2023-08-01-preview' = {
3939
}
4040
}
4141

42-
resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-08-01-preview' = {
42+
resource sqlDatabase 'Microsoft.Sql/servers/databases@2024-05-01-preview' = {
4343
parent: sqlServer
4444
name: sqlDatabaseName
4545
location: location
@@ -55,7 +55,7 @@ resource auditStorageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = if
5555
kind: 'StorageV2'
5656
}
5757

58-
resource sqlServerAudit 'Microsoft.Sql/servers/auditingSettings@2023-08-01-preview' = if (auditingEnabled) {
58+
resource sqlServerAudit 'Microsoft.Sql/servers/auditingSettings@2024-05-01-preview' = if (auditingEnabled) {
5959
parent: sqlServer
6060
name: 'default'
6161
properties: {

0 commit comments

Comments
 (0)