Skip to content

[Modules] Fix Data Protection Backup Vault module #1534

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

Merged
eriqua merged 3 commits into from
Jun 16, 2022
Merged

[Modules] Fix Data Protection Backup Vault module #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f0edd1
Align backupVaults to new telemetry and lock strategy
eriqua Jun 15, 2022
96a3d08
Api lock update
eriqua Jun 15, 2022
bd0bc77
lock condition
eriqua Jun 15, 2022
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
3 changes: 3 additions & 0 deletions arm/Microsoft.DataProtection/backupVaults/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"name": {
"value": "<<namePrefix>>-az-bv-x-001"
},
"lock": {
"value": "CanNotDelete"
},
"backupPolicies": {
"value": [
{
Expand Down
12 changes: 6 additions & 6 deletions arm/Microsoft.DataProtection/backupVaults/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ param location string = resourceGroup().location
param roleAssignments array = []

@allowed([
''
'CanNotDelete'
'NotSpecified'
'ReadOnly'
])
@description('Optional. Specify the type of lock.')
param lock string = 'NotSpecified'
param lock string = ''

@description('Optional. Enables system assigned managed identity on the resource.')
param systemAssignedIdentity bool = false
Expand Down Expand Up @@ -52,7 +52,7 @@ var identity = identityType != 'None' ? {
userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null
} : null

var enableChildTelemetry = false
var enableReferencedModulesTelemetry = false

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}'
Expand Down Expand Up @@ -87,14 +87,14 @@ module backupVault_backupPolicies 'backupPolicies/deploy.bicep' = [for (backupPo
backupVaultName: backupVault.name
name: backupPolicy.name
properties: backupPolicy.properties
enableDefaultTelemetry: enableChildTelemetry
enableDefaultTelemetry: enableReferencedModulesTelemetry
}
}]

resource backupVault_lock 'Microsoft.Authorization/locks@2020-05-01' = if (lock != 'NotSpecified') {
resource backupVault_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) {
name: '${backupVault.name}-${lock}-lock'
properties: {
level: lock
level: any(lock)
notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.'
}
scope: backupVault
Expand Down
8 changes: 6 additions & 2 deletions arm/Microsoft.DataProtection/backupVaults/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This module deploys DataProtection BackupVaults.

| Resource Type | API Version |
| :-- | :-- |
| `Microsoft.Authorization/locks` | [2020-05-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
| `Microsoft.Authorization/locks` | [2017-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) |
| `Microsoft.Authorization/roleAssignments` | [2020-10-01-preview](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-10-01-preview/roleAssignments) |
| `Microsoft.DataProtection/backupVaults` | [2022-03-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.DataProtection/2022-03-01/backupVaults) |
| `Microsoft.DataProtection/backupVaults/backupPolicies` | [2022-03-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.DataProtection/2022-03-01/backupVaults/backupPolicies) |
Expand All @@ -32,7 +32,7 @@ This module deploys DataProtection BackupVaults.
| `dataStoreType` | string | `'SnapshotStore'` | `[ArchiveStore, SnapshotStore, VaultStore]` | The datastore type to use. |
| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via the Customer Usage Attribution ID (GUID). |
| `location` | string | `[resourceGroup().location]` | | Location for all resources. |
| `lock` | string | `'NotSpecified'` | `[CanNotDelete, NotSpecified, ReadOnly]` | Specify the type of lock. |
| `lock` | string | `''` | `[, CanNotDelete, ReadOnly]` | Specify the type of lock. |
| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. |
| `systemAssignedIdentity` | bool | `False` | | Enables system assigned managed identity on the resource. |
| `tags` | object | `{object}` | | Tags of the Recovery Service Vault resource. |
Expand Down Expand Up @@ -382,6 +382,9 @@ module backupVaults './Microsoft.DataProtection/backupVaults/deploy.bicep' = {
"name": {
"value": "<<namePrefix>>-az-bv-x-001"
},
"lock": {
"value": "CanNotDelete"
},
"backupPolicies": {
"value": [
{
Expand Down Expand Up @@ -462,6 +465,7 @@ module backupVaults './Microsoft.DataProtection/backupVaults/deploy.bicep' = {
name: '${uniqueString(deployment().name)}-backupVaults'
params: {
name: '<<namePrefix>>-az-bv-x-001'
lock: 'CanNotDelete'
backupPolicies: [
{
name: 'DefaultPolicy'
Expand Down