Skip to content

Commit fed7d5b

Browse files
committed
Improve logging
1 parent 1a6506c commit fed7d5b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/ALZ/Public/Remove-PlatformLandingZone.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ function Remove-PlatformLandingZone {
623623
if (!$result) {
624624
Write-ToConsoleLog "Deleted orphaned role assignment: $($roleAssignment.roleDefinitionName) from $($ScopeType): $ScopeNameForLogs" -NoNewLine
625625
} else {
626-
Write-ToConsoleLog "Failed to delete orphaned role assignment: $($roleAssignment.roleDefinitionName) from $($ScopeType): $ScopeNameForLogs" -IsWarning -NoNewLine
626+
Write-ToConsoleLog "Failed to delete orphaned role assignment: $($roleAssignment.roleDefinitionName) from $($ScopeType): $ScopeNameForLogs", "Full error: $result" -IsWarning -NoNewLine
627627
}
628628
} -ThrottleLimit $using:ThrottleLimit
629629

@@ -723,7 +723,7 @@ function Remove-PlatformLandingZone {
723723
if (!$result) {
724724
Write-ToConsoleLog "Deleted deployment stack: $($deploymentStack.name) from $($scopeType): $scopeNameForLogs" -NoNewLine
725725
} else {
726-
Write-ToConsoleLog "Failed to delete deployment stack: $($deploymentStack.name) from $($scopeType): $scopeNameForLogs" -IsWarning -NoNewLine
726+
Write-ToConsoleLog "Failed to delete deployment stack: $($deploymentStack.name) from $($scopeType): $scopeNameForLogs", "Full error: $result" -IsWarning -NoNewLine
727727
}
728728
} -ThrottleLimit $ThrottleLimit
729729

@@ -781,7 +781,7 @@ function Remove-PlatformLandingZone {
781781
if (!$result) {
782782
Write-ToConsoleLog "Deleted deployment: $deploymentName from $($scopeType): $scopeNameForLogs" -NoNewLine
783783
} else {
784-
Write-ToConsoleLog "Failed to delete deployment: $deploymentName from $($scopeType): $scopeNameForLogs" -IsWarning -NoNewLine
784+
Write-ToConsoleLog "Failed to delete deployment: $deploymentName from $($scopeType): $scopeNameForLogs", "Full error: $result" -IsWarning -NoNewLine
785785
}
786786
} -ThrottleLimit $ThrottleLimit
787787

@@ -884,7 +884,7 @@ function Remove-PlatformLandingZone {
884884
if (!$result) {
885885
Write-ToConsoleLog "Deleted role assignment '$($assignment.name)' of custom role '$roleDefinitionName'" -NoNewLine
886886
} else {
887-
Write-ToConsoleLog "Failed to delete role assignment '$($assignment.name)' of custom role '$roleDefinitionName'" -IsWarning -NoNewLine
887+
Write-ToConsoleLog "Failed to delete role assignment '$($assignment.name)' of custom role '$roleDefinitionName'", "Full error: $result" -IsWarning -NoNewLine
888888
}
889889
}
890890
} -ThrottleLimit $using:ThrottleLimit
@@ -905,7 +905,7 @@ function Remove-PlatformLandingZone {
905905
if (!$result) {
906906
Write-ToConsoleLog "Deleted custom role definition: $($roleDefinition.roleName) (ID: $($roleDefinition.name))" -NoNewLine
907907
} else {
908-
Write-ToConsoleLog "Failed to delete custom role definition: $($roleDefinition.roleName) (ID: $($roleDefinition.name))" -IsWarning -NoNewLine
908+
Write-ToConsoleLog "Failed to delete custom role definition: $($roleDefinition.roleName) (ID: $($roleDefinition.name))", "Full error: $result" -IsWarning -NoNewLine
909909
}
910910
}
911911
}
@@ -1110,7 +1110,7 @@ function Remove-PlatformLandingZone {
11101110
} else {
11111111
$result = (az account management-group subscription add --name $subscriptionsTargetManagementGroup --subscription $subscription.name 2>&1)
11121112
if($result -and $result.ToLower().Contains("Error")) {
1113-
Write-ToConsoleLog "Failed to move subscription to target management group: $($subscriptionsTargetManagementGroup), subscription: $($subscription.displayName), $result" -IsWarning -NoNewLine
1113+
Write-ToConsoleLog "Failed to move subscription to target management group: $($subscriptionsTargetManagementGroup), subscription: $($subscription.displayName)", "Full error: $result" -IsWarning -NoNewLine
11141114
} else {
11151115
Write-ToConsoleLog "Moved subscription to target management group: $($subscriptionsTargetManagementGroup), subscription: $($subscription.displayName)" -NoNewLine
11161116
}
@@ -1125,7 +1125,7 @@ function Remove-PlatformLandingZone {
11251125
} else {
11261126
$result = (az account management-group subscription remove --name $_ --subscription $subscription.name 2>&1)
11271127
if($result -and $result.ToLower().Contains("Error")) {
1128-
Write-ToConsoleLog "Failed to remove subscription from management group: $_, subscription: $($subscription.displayName), $result" -IsWarning -NoNewLine
1128+
Write-ToConsoleLog "Failed to remove subscription from management group: $_, subscription: $($subscription.displayName)", "Full error: $result" -IsWarning -NoNewLine
11291129
} else {
11301130
Write-ToConsoleLog "Removed subscription from management group: $_, subscription: $($subscription.displayName)" -NoNewLine
11311131
}
@@ -1145,7 +1145,7 @@ function Remove-PlatformLandingZone {
11451145
} else {
11461146
$result = (az account management-group delete --name $_ 2>&1)
11471147
if($result -like "*Error*") {
1148-
Write-ToConsoleLog "Failed to delete management group: $_" -IsWarning -NoNewline
1148+
Write-ToConsoleLog "Failed to delete management group: $_", "Full error: $result" -IsWarning -NoNewline
11491149
} else {
11501150
Write-ToConsoleLog "Deleted management group: $_" -NoNewline
11511151
}
@@ -1377,7 +1377,7 @@ function Remove-PlatformLandingZone {
13771377
if (!$result) {
13781378
Write-ToConsoleLog "Deleted resource group for subscription: $($subscription.Name) (ID: $($subscription.Id)), resource group: $($ResourceGroupName)" -NoNewLine
13791379
} else {
1380-
Write-ToConsoleLog "Delete resource group failed for subscription: $($subscription.Name) (ID: $($subscription.Id)), resource group: $($ResourceGroupName)" -NoNewLine
1380+
Write-ToConsoleLog "Delete resource group failed for subscription: $($subscription.Name) (ID: $($subscription.Id)), resource group: $($ResourceGroupName)", "Full error: $result" -NoNewLine
13811381
Write-ToConsoleLog "It will be retried once the other resource groups in the subscription have reported their status." -NoNewLine
13821382
$retries = $using:resourceGroupsToRetry
13831383
$retries.Add($_)

0 commit comments

Comments
 (0)