From e8e511a265e1ee22d201ef95562614c85202709e Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:27:00 -0800 Subject: [PATCH] Make sure clean-up scripts return collections (#25447) Co-authored-by: Heath Stewart --- eng/common/scripts/Helpers/Resource-Helpers.ps1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eng/common/scripts/Helpers/Resource-Helpers.ps1 b/eng/common/scripts/Helpers/Resource-Helpers.ps1 index a73cff2f6fb3b..004772fe9ac4d 100644 --- a/eng/common/scripts/Helpers/Resource-Helpers.ps1 +++ b/eng/common/scripts/Helpers/Resource-Helpers.ps1 @@ -5,15 +5,16 @@ function Get-PurgeableGroupResources { [Parameter(Mandatory=$true, Position=0)] [string] $ResourceGroupName ) + $purgeableResources = @() # Discover Managed HSMs first since they are a premium resource. Write-Verbose "Retrieving deleted Managed HSMs from resource group $ResourceGroupName" # Get any Managed HSMs in the resource group, for which soft delete cannot be disabled. - $deletedHsms = Get-AzKeyVaultManagedHsm -ResourceGroupName $ResourceGroupName -ErrorAction Ignore ` + $deletedHsms = @(Get-AzKeyVaultManagedHsm -ResourceGroupName $ResourceGroupName -ErrorAction Ignore ` | Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Managed HSM' -PassThru ` - | Add-Member -MemberType AliasProperty -Name AzsdkName -Value VaultName -PassThru + | Add-Member -MemberType AliasProperty -Name AzsdkName -Value VaultName -PassThru) if ($deletedHsms) { Write-Verbose "Found $($deletedHsms.Count) deleted Managed HSMs to potentially purge." @@ -23,12 +24,12 @@ function Get-PurgeableGroupResources { Write-Verbose "Retrieving deleted Key Vaults from resource group $ResourceGroupName" # Get any Key Vaults that will be deleted so they can be purged later if soft delete is enabled. - $deletedKeyVaults = Get-AzKeyVault -ResourceGroupName $ResourceGroupName -ErrorAction Ignore | ForEach-Object { + $deletedKeyVaults = @(Get-AzKeyVault -ResourceGroupName $ResourceGroupName -ErrorAction Ignore | ForEach-Object { # Enumerating vaults from a resource group does not return all properties we required. Get-AzKeyVault -VaultName $_.VaultName -ErrorAction Ignore | Where-Object { $_.EnableSoftDelete } ` | Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Key Vault' -PassThru ` | Add-Member -MemberType AliasProperty -Name AzsdkName -Value VaultName -PassThru - } + }) if ($deletedKeyVaults) { Write-Verbose "Found $($deletedKeyVaults.Count) deleted Key Vaults to potentially purge." @@ -73,9 +74,9 @@ function Get-PurgeableResources { Write-Verbose "Retrieving deleted Key Vaults from subscription $subscriptionId" # Get deleted Key Vaults for the current subscription. - $deletedKeyVaults = Get-AzKeyVault -InRemovedState ` + $deletedKeyVaults = @(Get-AzKeyVault -InRemovedState ` | Add-Member -MemberType NoteProperty -Name AzsdkResourceType -Value 'Key Vault' -PassThru ` - | Add-Member -MemberType AliasProperty -Name AzsdkName -Value VaultName -PassThru + | Add-Member -MemberType AliasProperty -Name AzsdkName -Value VaultName -PassThru) if ($deletedKeyVaults) { Write-Verbose "Found $($deletedKeyVaults.Count) deleted Key Vaults to potentially purge."