Skip to content

Commit 716d895

Browse files
azure-sdkmsalaman
andauthored
Sync eng/common directory with azure-sdk-tools for PR 15475 (#46706)
* fix purge date bug * added else --------- Co-authored-by: Marcos Salamanca <masalama@microsoft.com>
1 parent 34539ef commit 716d895

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,14 @@ filter Remove-PurgeableResources {
172172
switch ($r.AzsdkResourceType) {
173173
'Key Vault' {
174174
if ($r.EnablePurgeProtection) {
175-
Write-Verbose "Key Vault '$($r.VaultName)' has purge protection enabled and may not be purged until $($r.ScheduledPurgeDate)" -Verbose:$verboseFlag
175+
$purgeMsg = "Key Vault '$($r.VaultName)' has purge protection enabled"
176+
if ($r.PSObject.Properties['ScheduledPurgeDate'] -and $r.ScheduledPurgeDate) {
177+
$purgeMsg += " and may not be purged until $($r.ScheduledPurgeDate)"
178+
}
179+
else{
180+
$purgeMsg += " and cannot be deleted"
181+
}
182+
Write-Verbose $purgeMsg -Verbose:$verboseFlag
176183
continue
177184
}
178185

@@ -185,7 +192,14 @@ filter Remove-PurgeableResources {
185192

186193
'Managed HSM' {
187194
if ($r.EnablePurgeProtection) {
188-
Write-Verbose "Managed HSM '$($r.Name)' has purge protection enabled and may not be purged until $($r.ScheduledPurgeDate)" -Verbose:$verboseFlag
195+
$purgeMsg = "Managed HSM '$($r.Name)' has purge protection enabled"
196+
if ($r.PSObject.Properties['ScheduledPurgeDate'] -and $r.ScheduledPurgeDate) {
197+
$purgeMsg += " and may not be purged until $($r.ScheduledPurgeDate)"
198+
}
199+
else{
200+
$purgeMsg += " and cannot be deleted"
201+
}
202+
Write-Verbose $purgeMsg -Verbose:$verboseFlag
189203
continue
190204
}
191205

0 commit comments

Comments
 (0)