Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add UDT for all avm/res/sql/server submodules #3807

Merged
merged 10 commits into from
Nov 29, 2024
Merged

feat: Add UDT for all avm/res/sql/server submodules #3807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29ba795
Add UDT for encryption protector parameter
peterbud Nov 12, 2024
2cfd7da
Add UDT for vulnerability assessment parameter
peterbud Nov 12, 2024
90086fc
Add UDT for firewall rules
peterbud Nov 12, 2024
5112bdb
Add UDT for keys parameter
peterbud Nov 12, 2024
1953593
Add UDT for virtual network rules parameter
peterbud Nov 12, 2024
ec6b68e
Add UDT for security alert policy parameter
peterbud Nov 12, 2024
d7235a9
Update version, recompile with latest bicep
peterbud Nov 15, 2024
33a883c
Review parameter descriptions
peterbud Nov 25, 2024
531392c
Remove zoneRedundant from simple tests
peterbud Nov 25, 2024
513af67
Remove zoneRedundant from elastic pool tests as well
peterbud Nov 29, 2024
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
469 changes: 409 additions & 60 deletions avm/res/sql/server/README.md
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions avm/res/sql/server/audit-settings/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "6303070680265885029"
"version": "0.31.92.45157",
"templateHash": "4626140114742164628"
},
"name": "Azure SQL Server Audit Settings",
"description": "This module deploys an Azure SQL Server Audit Settings.",
Expand Down Expand Up @@ -152,8 +152,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "13956215614091387428"
"version": "0.31.92.45157",
"templateHash": "2903956714854050681"
}
},
"parameters": {
Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/database/backup-long-term-retention-policy/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "841731129374883266"
"version": "0.31.92.45157",
"templateHash": "3060709558343951533"
},
"name": "SQL Server Database Long Term Backup Retention Policies",
"description": "This module deploys an Azure SQL Server Database Long-Term Backup Retention Policy.",
Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/database/backup-short-term-retention-policy/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "14890409200962565555"
"version": "0.31.92.45157",
"templateHash": "1465086214783345027"
},
"name": "Azure SQL Server Database Short Term Backup Retention Policies",
"description": "This module deploys an Azure SQL Server Database Short-Term Backup Retention Policy.",
Expand Down
12 changes: 6 additions & 6 deletions avm/res/sql/server/database/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "18018827030977470456"
"version": "0.31.92.45157",
"templateHash": "10088627667414343400"
},
"name": "SQL Server Database",
"description": "This module deploys an Azure SQL Server Database.",
Expand Down Expand Up @@ -721,8 +721,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "14890409200962565555"
"version": "0.31.92.45157",
"templateHash": "1465086214783345027"
},
"name": "Azure SQL Server Database Short Term Backup Retention Policies",
"description": "This module deploys an Azure SQL Server Database Short-Term Backup Retention Policy.",
Expand Down Expand Up @@ -839,8 +839,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "841731129374883266"
"version": "0.31.92.45157",
"templateHash": "3060709558343951533"
},
"name": "SQL Server Database Long Term Backup Retention Policies",
"description": "This module deploys an Azure SQL Server Database Long-Term Backup Retention Policy.",
Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/elastic-pool/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "10024079638382167120"
"version": "0.31.92.45157",
"templateHash": "9050866823207809352"
},
"name": "SQL Server Elastic Pool",
"description": "This module deploys an Azure SQL Server Elastic Pool.",
Expand Down
6 changes: 3 additions & 3 deletions avm/res/sql/server/encryption-protector/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This module deploys an Azure SQL Server Encryption Protector.

| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`autoRotationEnabled`](#parameter-autorotationenabled) | bool | Key auto rotation opt-in. |
| [`autoRotationEnabled`](#parameter-autorotationenabled) | bool | Key auto rotation opt-in flag. |
| [`serverKeyType`](#parameter-serverkeytype) | string | The encryption protector type. |

### Parameter: `serverKeyName`
Expand All @@ -51,11 +51,11 @@ The name of the sql server. Required if the template is used in a standalone dep

### Parameter: `autoRotationEnabled`

Key auto rotation opt-in.
Key auto rotation opt-in flag.

- Required: No
- Type: bool
- Default: `False`
- Default: `True`

### Parameter: `serverKeyType`

Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/encryption-protector/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ param sqlServerName string
@description('Required. The name of the server key.')
param serverKeyName string

@description('Optional. Key auto rotation opt-in.')
param autoRotationEnabled bool = false
@description('Optional. Key auto rotation opt-in flag.')
param autoRotationEnabled bool = true

@description('Optional. The encryption protector type.')
@allowed([
Expand Down
8 changes: 4 additions & 4 deletions avm/res/sql/server/encryption-protector/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "11473914706327458055"
"version": "0.31.92.45157",
"templateHash": "3436938593239210559"
},
"name": "Azure SQL Server Encryption Protector",
"description": "This module deploys an Azure SQL Server Encryption Protector.",
Expand All @@ -26,9 +26,9 @@
},
"autoRotationEnabled": {
"type": "bool",
"defaultValue": false,
"defaultValue": true,
"metadata": {
"description": "Optional. Key auto rotation opt-in."
"description": "Optional. Key auto rotation opt-in flag."
}
},
"serverKeyType": {
Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/firewall-rule/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "6449556555046717103"
"version": "0.31.92.45157",
"templateHash": "16725482503837347177"
},
"name": "Azure SQL Server Firewall Rule",
"description": "This module deploys an Azure SQL Server Firewall Rule.",
Expand Down
8 changes: 4 additions & 4 deletions avm/res/sql/server/key/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ This module deploys an Azure SQL Server Key.
| Parameter | Type | Description |
| :-- | :-- | :-- |
| [`name`](#parameter-name) | string | The name of the key. Must follow the [<keyVaultName>_<keyName>_<keyVersion>] pattern. |
| [`serverKeyType`](#parameter-serverkeytype) | string | The encryption protector type like "ServiceManaged", "AzureKeyVault". |
| [`uri`](#parameter-uri) | string | The URI of the key. If the ServerKeyType is AzureKeyVault, then either the URI or the keyVaultName/keyName combination is required. |
| [`serverKeyType`](#parameter-serverkeytype) | string | The server key type. |
| [`uri`](#parameter-uri) | string | The URI of the server key. If the ServerKeyType is AzureKeyVault, then the URI is required. The AKV URI is required to be in this format: 'https://YourVaultName.azure.net/keys/YourKeyName/YourKeyVersion'. |

### Parameter: `serverName`

Expand All @@ -46,7 +46,7 @@ The name of the key. Must follow the [<keyVaultName>_<keyName>_<keyVersion>] pat

### Parameter: `serverKeyType`

The encryption protector type like "ServiceManaged", "AzureKeyVault".
The server key type.

- Required: No
- Type: string
Expand All @@ -61,7 +61,7 @@ The encryption protector type like "ServiceManaged", "AzureKeyVault".

### Parameter: `uri`

The URI of the key. If the ServerKeyType is AzureKeyVault, then either the URI or the keyVaultName/keyName combination is required.
The URI of the server key. If the ServerKeyType is AzureKeyVault, then the URI is required. The AKV URI is required to be in this format: 'https://YourVaultName.azure.net/keys/YourKeyName/YourKeyVersion'.

- Required: No
- Type: string
Expand Down
4 changes: 2 additions & 2 deletions avm/res/sql/server/key/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ param name string?
@description('Conditional. The name of the parent SQL server. Required if the template is used in a standalone deployment.')
param serverName string

@description('Optional. The encryption protector type like "ServiceManaged", "AzureKeyVault".')
@description('Optional. The server key type.')
@allowed([
'AzureKeyVault'
'ServiceManaged'
])
param serverKeyType string = 'ServiceManaged'

@description('Optional. The URI of the key. If the ServerKeyType is AzureKeyVault, then either the URI or the keyVaultName/keyName combination is required.')
@description('Optional. The URI of the server key. If the ServerKeyType is AzureKeyVault, then the URI is required. The AKV URI is required to be in this format: \'https://YourVaultName.azure.net/keys/YourKeyName/YourKeyVersion\'.')
param uri string = ''

var splittedKeyUri = split(uri, '/')
Expand Down
8 changes: 4 additions & 4 deletions avm/res/sql/server/key/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "17839617504395216689"
"version": "0.31.92.45157",
"templateHash": "16457177770650062823"
},
"name": "Azure SQL Server Keys",
"description": "This module deploys an Azure SQL Server Key.",
Expand Down Expand Up @@ -34,14 +34,14 @@
"ServiceManaged"
],
"metadata": {
"description": "Optional. The encryption protector type like \"ServiceManaged\", \"AzureKeyVault\"."
"description": "Optional. The server key type."
}
},
"uri": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. The URI of the key. If the ServerKeyType is AzureKeyVault, then either the URI or the keyVaultName/keyName combination is required."
"description": "Optional. The URI of the server key. If the ServerKeyType is AzureKeyVault, then the URI is required. The AKV URI is required to be in this format: 'https://YourVaultName.azure.net/keys/YourKeyName/YourKeyVersion'."
}
}
},
Expand Down
Loading