diff --git a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep b/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep index aff4e435bf..54e601eab2 100644 --- a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_rbac.bicep @@ -25,7 +25,7 @@ var builtInRoleNames = { 'Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '9980e02c-c2be-4d73-94e8-173b1dc7cf3c') } -resource rsv 'Microsoft.RecoveryServices/vaults@2021-08-01' existing = { +resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { name: last(split(resourceId, '/')) } diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep index aaa8464dc0..7bfcef0ea7 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep @@ -54,11 +54,11 @@ module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource rsv 'Microsoft.RecoveryServices/vaults@2021-08-01' existing = { +resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { name: recoveryVaultName } -resource backupConfig 'Microsoft.RecoveryServices/vaults/backupconfig@2021-08-01' = { +resource backupConfig 'Microsoft.RecoveryServices/vaults/backupconfig@2021-10-01' = { name: name parent: rsv properties: { diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md index 530d35af21..0c0096abb1 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md @@ -6,7 +6,7 @@ This module deploys recovery services vault backup config. | Resource Type | API Version | | :-- | :-- | -| `Microsoft.RecoveryServices/vaults/backupconfig` | 2021-08-01 | +| `Microsoft.RecoveryServices/vaults/backupconfig` | 2021-10-01 | ## Parameters diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep index de18d25358..a3e909b846 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep @@ -15,7 +15,7 @@ module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource rsv 'Microsoft.RecoveryServices/vaults@2021-08-01' existing = { +resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { name: recoveryVaultName } diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep index f8fa588a87..d8a3a16df6 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep @@ -24,7 +24,7 @@ module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource rsv 'Microsoft.RecoveryServices/vaults@2021-08-01' existing = { +resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { name: recoveryVaultName } diff --git a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/deploy.bicep index c7020ca09d..6181a968c7 100644 --- a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/deploy.bicep @@ -130,11 +130,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource rsv 'Microsoft.RecoveryServices/vaults@2021-08-01' = { +resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' = { name: name location: location tags: tags - identity: identity + identity: any(identity) sku: { name: 'RS0' tier: 'Standard' diff --git a/arm/Microsoft.RecoveryServices/vaults/readme.md b/arm/Microsoft.RecoveryServices/vaults/readme.md index 78c7dfd2fd..9341155707 100644 --- a/arm/Microsoft.RecoveryServices/vaults/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/readme.md @@ -9,7 +9,7 @@ This module deploys a recovery service vault. | `Microsoft.Authorization/locks` | 2016-09-01 | | `Microsoft.Authorization/roleAssignments` | 2020-04-01-preview | | `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview | -| `Microsoft.RecoveryServices/vaults` | 2021-08-01 | +| `Microsoft.RecoveryServices/vaults` | 2021-12-01 | | `Microsoft.RecoveryServices/vaults/backupconfig` | 2021-08-01 | | `Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers` | 2021-08-01 | | `Microsoft.RecoveryServices/vaults/backupPolicies` | 2021-08-01 | diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 index 4cdc0c2cef..a00be1a89d 100644 --- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 +++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 @@ -66,6 +66,10 @@ function Invoke-ResourceRemoval { $null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop' break } + 'Microsoft.RecoveryServices/vaults/backupstorageconfig' { + # Not a 'resource' that can be removed, but represents settings on the RSV. The config is deleted with the RSV + break + } 'Microsoft.RecoveryServices/vaults' { # Pre-Removal # -----------