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

Sync eng/common directory with azure-sdk-tools for PR 9333 #31666

Merged
merged 5 commits into from
Nov 7, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 9333 #31666

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6246c96
Retry container deletion
benbp Nov 5, 2024
8286e05
Do not try to purge keyvaults with purge protection
benbp Nov 5, 2024
acb5854
Delete all blobs when container has immutability
benbp Nov 5, 2024
0ef259a
Skip missing blob container properties
benbp Nov 5, 2024
e1acf73
Fix null container
benbp Nov 6, 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
30 changes: 20 additions & 10 deletions eng/common/scripts/Helpers/Resource-Helpers.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ filter Remove-PurgeableResources {
switch ($r.AzsdkResourceType) {
'Key Vault' {
if ($r.EnablePurgeProtection) {
# We will try anyway but will ignore errors.
Write-Warning "Key Vault '$($r.VaultName)' has purge protection enabled and may not be purged until $($r.ScheduledPurgeDate)"
continue
}

# Use `-AsJob` to start a lightweight, cancellable job and pass to `Wait-PurgeableResoruceJob` for consistent behavior.
Expand All @@ -134,8 +134,8 @@ filter Remove-PurgeableResources {

'Managed HSM' {
if ($r.EnablePurgeProtection) {
# We will try anyway but will ignore errors.
Write-Warning "Managed HSM '$($r.Name)' has purge protection enabled and may not be purged until $($r.ScheduledPurgeDate)"
continue
}

# Use `GetNewClosure()` on the `-Action` ScriptBlock to make sure variables are captured.
Expand Down Expand Up @@ -313,14 +313,16 @@ function RemoveStorageAccount($Account) {
if ($Account.Kind -eq "FileStorage") { return }

$containers = New-AzStorageContext -StorageAccountName $Account.StorageAccountName | Get-AzStorageContainer
$blobs = $containers | Get-AzStorageBlob
$deleteNow = @()

try {
foreach ($blob in $blobs) {
$shouldDelete = EnableBlobDeletion -Blob $blob -StorageAccountName $Account.StorageAccountName -ResourceGroupName $Account.ResourceGroupName
if ($shouldDelete) {
$deleteNow += $blob
foreach ($container in $containers) {
$blobs = $container | Get-AzStorageBlob
foreach ($blob in $blobs) {
$shouldDelete = EnableBlobDeletion -Blob $blob -Container $container -StorageAccountName $Account.StorageAccountName -ResourceGroupName $Account.ResourceGroupName
if ($shouldDelete) {
$deleteNow += $blob
}
}
}
} catch {
Expand All @@ -342,11 +344,15 @@ function RemoveStorageAccount($Account) {
}

foreach ($container in $containers) {
if (!($container | Get-Member 'BlobContainerProperties')) {
continue
}
if ($container.BlobContainerProperties.HasImmutableStorageWithVersioning) {
try {
# Use AzRm cmdlet as deletion will only work through ARM with the immutability policies defined on the blobs
Remove-AzRmStorageContainer -Name $container.Name -StorageAccountName $Account.StorageAccountName -ResourceGroupName $Account.ResourceGroupName -Force
#$container | Remove-AzStorageContainer
# Add a retry in case blob deletion has not finished in time for container deletion, but not too many that we end up
# getting throttled by ARM/SRP if things are actually in a stuck state
Retry -Attempts 1 -Action { Remove-AzRmStorageContainer -Name $container.Name -StorageAccountName $Account.StorageAccountName -ResourceGroupName $Account.ResourceGroupName -Force }
} catch {
Write-Host "Container removal failed: $($container.Name), account: $($Account.storageAccountName), group: $($Account.ResourceGroupName)"
Write-Warning "Ignoring the error and trying to delete the storage account"
Expand All @@ -360,7 +366,7 @@ function RemoveStorageAccount($Account) {
}
}

function EnableBlobDeletion($Blob, $StorageAccountName, $ResourceGroupName) {
function EnableBlobDeletion($Blob, $Container, $StorageAccountName, $ResourceGroupName) {
# Some properties like immutability policies require the blob to be
# deleted before the container can be deleted
$forceBlobDeletion = $false
Expand Down Expand Up @@ -394,6 +400,10 @@ function EnableBlobDeletion($Blob, $StorageAccountName, $ResourceGroupName) {
$Blob.ICloudBlob.BreakLease()
}

if (($Container | Get-Member 'BlobContainerProperties') -and $Container.BlobContainerProperties.HasImmutableStorageWithVersioning) {
$forceBlobDeletion = $true
}

return $forceBlobDeletion
}

Expand Down
Loading