Skip to content

Commit 2c3839f

Browse files
committed
adding registration resource removal check
1 parent ebeae79 commit 2c3839f

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

Registration/RegisterWithAzure.psm1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ function Remove-RegistrationResource{
18671867

18681868
$currentAttempt = 0
18691869
$maxAttempt = 3
1870-
$sleepSeconds = 10
1870+
$sleepSeconds = 30
18711871
do
18721872
{
18731873
try
@@ -1878,13 +1878,17 @@ function Remove-RegistrationResource{
18781878

18791879
$resourceType = 'Microsoft.Azurestack/registrations'
18801880
$lock = Get-AzResourceLock -LockName 'RegistrationResourceLock' -ResourceGroupName $ResourceGroupName -ResourceType $resourceType -ResourceName $resourceName -ErrorAction SilentlyContinue
1881-
if ($lock)
1882-
{
1881+
if ($lock) {
18831882
Write-Verbose "Removing Registration resource lock 'RegistrationResourceLock'..." -Verbose
18841883
Remove-AzResourceLock -LockId $lock.LockId -Force
18851884
}
18861885

18871886
Remove-AzResource -ResourceId $ResourceId -ApiVersion $azureResourceApiVersion -Force -Verbose
1887+
## check if the remove registration resource is successful
1888+
Write-Verbose "Validating if registration resource removal succeeded." -Verbose
1889+
if (Get-AzResource -ResourceId $ResourceId -ApiVersion $azureResourceApiVersion -ErrorAction SilentlyContinue) {
1890+
throw "Removal of registration resource failed."
1891+
}
18881892
break
18891893
}
18901894
catch

0 commit comments

Comments
 (0)