Skip to content

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

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
azure-sdk merged 5 commits into from
Nov 7, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9992a03
Retry container deletion
benbp Nov 5, 2024
afdc9dc
Do not try to purge keyvaults with purge protection
benbp Nov 5, 2024
fb2ce9c
Delete all blobs when container has immutability
benbp Nov 5, 2024
4423bc2
Skip missing blob container properties
benbp Nov 5, 2024
c738500
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
Prev Previous commit
Fix null container
  • Loading branch information
@benbp @azure-sdk
benbp authored and azure-sdk committed Nov 6, 2024
commit c7385009d00184bfe6e64bf9390fa89e8efab7d4
14 changes: 8 additions & 6 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 @@ -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 Down Expand Up @@ -398,7 +400,7 @@ function EnableBlobDeletion($Blob, $Container, $StorageAccountName, $ResourceGro
$Blob.ICloudBlob.BreakLease()
}

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

Expand Down