sync with PR 3325

Azure · Oct 2, 2024 · e5b9a43 · e5b9a43
1 parent 30a3d42
commit e5b9a43
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 70 deletions.
diff --git a/avm/res/sql/server/README.md b/avm/res/sql/server/README.md
@@ -270,6 +270,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  backupShortTermRetentionPolicy: {
  retentionDays: 14
  }
+ capacity: 0
  collation: 'SQL_Latin1_General_CP1_CI_AS'
  diagnosticSettings: [
  {
@@ -288,7 +289,6 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  licenseType: 'LicenseIncluded'
  maxSizeBytes: 34359738368
  name: 'sqlsmaxdb-001'
- skuCapacity: 0
  skuName: 'ElasticPool'
  skuTier: 'GeneralPurpose'
  }
@@ -438,6 +438,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  "backupShortTermRetentionPolicy": {
  "retentionDays": 14
  },
+ "capacity": 0,
  "collation": "SQL_Latin1_General_CP1_CI_AS",
  "diagnosticSettings": [
  {
@@ -456,7 +457,6 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  "licenseType": "LicenseIncluded",
  "maxSizeBytes": 34359738368,
  "name": "sqlsmaxdb-001",
- "skuCapacity": 0,
  "skuName": "ElasticPool",
  "skuTier": "GeneralPurpose"
  }
@@ -857,6 +857,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  backupShortTermRetentionPolicy: {
  retentionDays: 14
  }
+ capacity: 0
  collation: 'SQL_Latin1_General_CP1_CI_AS'
  diagnosticSettings: [
  {
@@ -875,7 +876,6 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  licenseType: 'LicenseIncluded'
  maxSizeBytes: 34359738368
  name: 'sqlswafdb-001'
- skuCapacity: 0
  skuName: 'ElasticPool'
  skuTier: 'GeneralPurpose'
  }
@@ -988,6 +988,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  "backupShortTermRetentionPolicy": {
  "retentionDays": 14
  },
+ "capacity": 0,
  "collation": "SQL_Latin1_General_CP1_CI_AS",
  "diagnosticSettings": [
  {
@@ -1006,7 +1007,6 @@ module server 'br/public:avm/res/sql/server:<version>' = {
  "licenseType": "LicenseIncluded",
  "maxSizeBytes": 34359738368,
  "name": "sqlswafdb-001",
- "skuCapacity": 0,
  "skuName": "ElasticPool",
  "skuTier": "GeneralPurpose"
  }

diff --git a/avm/res/sql/server/audit-settings/main.json b/avm/res/sql/server/audit-settings/main.json
@@ -5,8 +5,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "2456263707393734456"
+ "version": "0.29.47.4906",
+ "templateHash": "4165841300638093382"
  },
  "name": "Azure SQL Server Audit Settings",
  "description": "This module deploys an Azure SQL Server Audit Settings.",
@@ -144,8 +144,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "13956215614091387428"
+ "version": "0.29.47.4906",
+ "templateHash": "17251889896692066430"
  }
  },
  "parameters": {

diff --git a/avm/res/sql/server/database/backup-long-term-retention-policy/main.json b/avm/res/sql/server/database/backup-long-term-retention-policy/main.json
@@ -4,8 +4,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10064519186693398262"
+ "version": "0.29.47.4906",
+ "templateHash": "2778016138108001251"
  },
  "name": "SQL Server Database Long Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Long-Term Backup Retention Policy.",

diff --git a/avm/res/sql/server/database/backup-short-term-retention-policy/main.json b/avm/res/sql/server/database/backup-short-term-retention-policy/main.json
@@ -4,8 +4,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10836519140305169908"
+ "version": "0.29.47.4906",
+ "templateHash": "8635162595153731245"
  },
  "name": "Azure SQL Server Database Short Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Short-Term Backup Retention Policy.",

diff --git a/avm/res/sql/server/database/main.json b/avm/res/sql/server/database/main.json
@@ -5,8 +5,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "1982363525852346649"
+ "version": "0.29.47.4906",
+ "templateHash": "1805182723135951408"
  },
  "name": "SQL Server Database",
  "description": "This module deploys an Azure SQL Server Database.",
@@ -487,8 +487,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10836519140305169908"
+ "version": "0.29.47.4906",
+ "templateHash": "8635162595153731245"
  },
  "name": "Azure SQL Server Database Short Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Short-Term Backup Retention Policy.",
@@ -597,8 +597,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10064519186693398262"
+ "version": "0.29.47.4906",
+ "templateHash": "2778016138108001251"
  },
  "name": "SQL Server Database Long Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Long-Term Backup Retention Policy.",

diff --git a/avm/res/sql/server/elastic-pool/main.bicep b/avm/res/sql/server/elastic-pool/main.bicep
@@ -68,7 +68,7 @@ resource elasticPool 'Microsoft.Sql/servers/elasticPools@2023-08-01-preview' = {
  properties: {
  highAvailabilityReplicaCount: highAvailabilityReplicaCount
  licenseType: licenseType
- maintenanceConfigurationId: maintenanceConfigurationId
+ maintenanceConfigurationId: !empty(maintenanceConfigurationId) ? maintenanceConfigurationId : null
  maxSizeBytes: maxSizeBytes
  minCapacity: minCapacity
  perDatabaseSettings: {

diff --git a/avm/res/sql/server/elastic-pool/main.json b/avm/res/sql/server/elastic-pool/main.json
@@ -5,8 +5,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "1486548652639885128"
+ "version": "0.29.47.4906",
+ "templateHash": "16491495841511408666"
  },
  "name": "SQL Server Elastic Pool",
  "description": "This module deploys an Azure SQL Server Elastic Pool.",
@@ -142,7 +142,7 @@
  "properties": {
  "highAvailabilityReplicaCount": "[parameters('highAvailabilityReplicaCount')]",
  "licenseType": "[parameters('licenseType')]",
- "maintenanceConfigurationId": "[parameters('maintenanceConfigurationId')]",
+ "maintenanceConfigurationId": "[if(not(empty(parameters('maintenanceConfigurationId'))), parameters('maintenanceConfigurationId'), null())]",
  "maxSizeBytes": "[parameters('maxSizeBytes')]",
  "minCapacity": "[parameters('minCapacity')]",
  "perDatabaseSettings": {

diff --git a/avm/res/sql/server/encryption-protector/main.json b/avm/res/sql/server/encryption-protector/main.json
@@ -4,8 +4,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "11473914706327458055"
+ "version": "0.29.47.4906",
+ "templateHash": "6914924378490463775"
  },
  "name": "Azure SQL Server Encryption Protector",
  "description": "This module deploys an Azure SQL Server Encryption Protector.",

diff --git a/avm/res/sql/server/firewall-rule/main.json b/avm/res/sql/server/firewall-rule/main.json
@@ -4,8 +4,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "6449556555046717103"
+ "version": "0.29.47.4906",
+ "templateHash": "7779473510493338097"
  },
  "name": "Azure SQL Server Firewall Rule",
  "description": "This module deploys an Azure SQL Server Firewall Rule.",

diff --git a/avm/res/sql/server/key/main.json b/avm/res/sql/server/key/main.json
@@ -5,8 +5,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "17839617504395216689"
+ "version": "0.29.47.4906",
+ "templateHash": "5863771213375512760"
  },
  "name": "Azure SQL Server Keys",
  "description": "This module deploys an Azure SQL Server Key.",

diff --git a/avm/res/sql/server/main.json b/avm/res/sql/server/main.json
@@ -5,8 +5,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "7186417096805880461"
+ "version": "0.29.47.4906",
+ "templateHash": "10504263612709234516"
  },
  "name": "Azure SQL Servers",
  "description": "This module deploys an Azure SQL Server.",
@@ -842,8 +842,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "1982363525852346649"
+ "version": "0.29.47.4906",
+ "templateHash": "1805182723135951408"
  },
  "name": "SQL Server Database",
  "description": "This module deploys an Azure SQL Server Database.",
@@ -1324,8 +1324,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10836519140305169908"
+ "version": "0.29.47.4906",
+ "templateHash": "8635162595153731245"
  },
  "name": "Azure SQL Server Database Short Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Short-Term Backup Retention Policy.",
@@ -1434,8 +1434,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "10064519186693398262"
+ "version": "0.29.47.4906",
+ "templateHash": "2778016138108001251"
  },
  "name": "SQL Server Database Long Term Backup Retention Policies",
  "description": "This module deploys an Azure SQL Server Database Long-Term Backup Retention Policy.",
@@ -1630,8 +1630,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "1486548652639885128"
+ "version": "0.29.47.4906",
+ "templateHash": "16491495841511408666"
  },
  "name": "SQL Server Elastic Pool",
  "description": "This module deploys an Azure SQL Server Elastic Pool.",
@@ -1767,7 +1767,7 @@
  "properties": {
  "highAvailabilityReplicaCount": "[parameters('highAvailabilityReplicaCount')]",
  "licenseType": "[parameters('licenseType')]",
- "maintenanceConfigurationId": "[parameters('maintenanceConfigurationId')]",
+ "maintenanceConfigurationId": "[if(not(empty(parameters('maintenanceConfigurationId'))), parameters('maintenanceConfigurationId'), null())]",
  "maxSizeBytes": "[parameters('maxSizeBytes')]",
  "minCapacity": "[parameters('minCapacity')]",
  "perDatabaseSettings": {
@@ -2616,8 +2616,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "6449556555046717103"
+ "version": "0.29.47.4906",
+ "templateHash": "7779473510493338097"
  },
  "name": "Azure SQL Server Firewall Rule",
  "description": "This module deploys an Azure SQL Server Firewall Rule.",
@@ -2724,8 +2724,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "4969955763304077350"
+ "version": "0.29.47.4906",
+ "templateHash": "7859066741604114060"
  },
  "name": "Azure SQL Server Virtual Network Rules",
  "description": "This module deploys an Azure SQL Server Virtual Network Rule.",
@@ -2846,8 +2846,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "15406914222375641032"
+ "version": "0.29.47.4906",
+ "templateHash": "6025191760768766090"
  },
  "name": "Azure SQL Server Security Alert Policies",
  "description": "This module deploys an Azure SQL Server Security Alert Policy.",
@@ -3007,8 +3007,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "11004049200994426011"
+ "version": "0.29.47.4906",
+ "templateHash": "5682596516926040129"
  },
  "name": "Azure SQL Server Vulnerability Assessments",
  "description": "This module deploys an Azure SQL Server Vulnerability Assessment.",
@@ -3110,8 +3110,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "13956215614091387428"
+ "version": "0.29.47.4906",
+ "templateHash": "17251889896692066430"
  }
  },
  "parameters": {
@@ -3203,8 +3203,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "17839617504395216689"
+ "version": "0.29.47.4906",
+ "templateHash": "5863771213375512760"
  },
  "name": "Azure SQL Server Keys",
  "description": "This module deploys an Azure SQL Server Key.",
@@ -3326,8 +3326,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "11473914706327458055"
+ "version": "0.29.47.4906",
+ "templateHash": "6914924378490463775"
  },
  "name": "Azure SQL Server Encryption Protector",
  "description": "This module deploys an Azure SQL Server Encryption Protector.",
@@ -3459,8 +3459,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "2456263707393734456"
+ "version": "0.29.47.4906",
+ "templateHash": "4165841300638093382"
  },
  "name": "Azure SQL Server Audit Settings",
  "description": "This module deploys an Azure SQL Server Audit Settings.",
@@ -3598,8 +3598,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "13956215614091387428"
+ "version": "0.29.47.4906",
+ "templateHash": "17251889896692066430"
  }
  },
  "parameters": {

diff --git a/avm/res/sql/server/security-alert-policy/main.json b/avm/res/sql/server/security-alert-policy/main.json
@@ -4,8 +4,8 @@
  "metadata": {
  "_generator": {
  "name": "bicep",
- "version": "0.30.23.60470",
- "templateHash": "15406914222375641032"
+ "version": "0.29.47.4906",
+ "templateHash": "6025191760768766090"
  },
  "name": "Azure SQL Server Security Alert Policies",
  "description": "This module deploys an Azure SQL Server Security Alert Policy.",

diff --git a/avm/res/sql/server/tests/e2e/max/main.test.bicep b/avm/res/sql/server/tests/e2e/max/main.test.bicep
@@ -11,7 +11,7 @@ metadata description = 'This instance deploys the module with most of its featur
 @maxLength(90)
 param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-rg'
 
-// Enforce uksouth to avoid redundancy availability issues in certain regions
+// Enforce uksouth to avoid restrictions around zone redundancy in certain regions
 #disable-next-line no-hardcoded-location
 var enforcedLocation = 'uksouth'
 
@@ -126,7 +126,7 @@ module testDeployment '../../../main.bicep' = {
  collation: 'SQL_Latin1_General_CP1_CI_AS'
  skuTier: 'GeneralPurpose'
  skuName: 'ElasticPool'
- skuCapacity: 0
+ capacity: 0
  maxSizeBytes: 34359738368
  licenseType: 'LicenseIncluded'
  diagnosticSettings: [