Skip to content

Commit eeed8a8

Browse files
heathsazure-sdk
authored andcommitted
Attempt to purge all vaults, managed HSMs
Reverts #1910. Vaults and managed HSMs are automatically purged on their purge date. The point was to purge them daily to preserve capacity. The default purge date is +90 days.
1 parent 728b28b commit eeed8a8

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

eng/common/scripts/Helpers/Resource-Helpers.ps1

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ function Get-PurgeableGroupResources {
77
)
88
$purgeableResources = @()
99

10+
# Discover Managed HSMs first since they are a premium resource.
11+
Write-Verbose "Retrieving deleted Managed HSMs from resource group $ResourceGroupName"
12+
13+
# Get any Managed HSMs in the resource group, for which soft delete cannot be disabled.
14+
$deletedHsms = Get-AzKeyVaultManagedHsm -ResourceGroupName $ResourceGroupName -ErrorAction Ignore `
15+
| Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Managed HSM' -PassThru
16+
17+
if ($deletedHsms) {
18+
Write-Verbose "Found $($deletedHsms.Count) deleted Managed HSMs to potentially purge."
19+
$purgeableResources += $deletedHsms
20+
}
21+
1022
Write-Verbose "Retrieving deleted Key Vaults from resource group $ResourceGroupName"
1123

1224
# Get any Key Vaults that will be deleted so they can be purged later if soft delete is enabled.
@@ -21,34 +33,13 @@ function Get-PurgeableGroupResources {
2133
$purgeableResources += $deletedKeyVaults
2234
}
2335

24-
Write-Verbose "Retrieving deleted Managed HSMs from resource group $ResourceGroupName"
25-
26-
# Get any Managed HSMs in the resource group, for which soft delete cannot be disabled.
27-
$deletedHsms = Get-AzKeyVaultManagedHsm -ResourceGroupName $ResourceGroupName -ErrorAction Ignore `
28-
| Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Managed HSM' -PassThru
29-
30-
if ($deletedHsms) {
31-
Write-Verbose "Found $($deletedHsms.Count) deleted Managed HSMs to potentially purge."
32-
$purgeableResources += $deletedHsms
33-
}
34-
3536
return $purgeableResources
3637
}
3738
function Get-PurgeableResources {
3839
$purgeableResources = @()
3940
$subscriptionId = (Get-AzContext).Subscription.Id
4041

41-
Write-Verbose "Retrieving deleted Key Vaults from subscription $subscriptionId"
42-
43-
# Get deleted Key Vaults for the current subscription.
44-
$deletedKeyVaults = Get-AzKeyVault -InRemovedState `
45-
| Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Key Vault' -PassThru
46-
47-
if ($deletedKeyVaults) {
48-
Write-Verbose "Found $($deletedKeyVaults.Count) deleted Key Vaults to potentially purge."
49-
$purgeableResources += $deletedKeyVaults
50-
}
51-
42+
# Discover Managed HSMs first since they are a premium resource.
5243
Write-Verbose "Retrieving deleted Managed HSMs from subscription $subscriptionId"
5344

5445
# Get deleted Managed HSMs for the current subscription.
@@ -75,6 +66,17 @@ function Get-PurgeableResources {
7566
}
7667
}
7768

69+
Write-Verbose "Retrieving deleted Key Vaults from subscription $subscriptionId"
70+
71+
# Get deleted Key Vaults for the current subscription.
72+
$deletedKeyVaults = Get-AzKeyVault -InRemovedState `
73+
| Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Key Vault' -PassThru
74+
75+
if ($deletedKeyVaults) {
76+
Write-Verbose "Found $($deletedKeyVaults.Count) deleted Key Vaults to potentially purge."
77+
$purgeableResources += $deletedKeyVaults
78+
}
79+
7880
return $purgeableResources
7981
}
8082

0 commit comments

Comments
 (0)