Skip to content

fix: refactor logic #458

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
oZakari merged 1 commit into from
Nov 15, 2025
Merged

fix: refactor logic #458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 20 additions & 26 deletions src/ALZ/Public/Remove-PlatformLandingZone.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ function Remove-PlatformLandingZone {
}

# Delete deployments from target management groups that are not being deleted
if($managementGroupsFound.Count -ne 0 -and -not $SkipDeploymentDeletion) {
if($managementGroupsFound.Count -ne 0 -and -not $SkipDeploymentDeletion -and -not $DeleteTargetManagementGroups) {
$managementGroupsFound | ForEach-Object -Parallel {
$managementGroupId = $_.Name
$managementGroupDisplayName = $_.DisplayName
Expand All @@ -727,22 +727,20 @@ function Remove-PlatformLandingZone {
$funcRemoveDeploymentsForScope = $using:funcRemoveDeploymentsForScope
${function:Remove-DeploymentsForScope} = $funcRemoveDeploymentsForScope

# Only delete deployments if this management group is not being deleted
if(-not $deleteTargetManagementGroups) {
Remove-DeploymentsForScope `
-ScopeType "management group" `
-ScopeNameForLogs "$managementGroupId ($managementGroupDisplayName)" `
-ScopeId $managementGroupId `
-ThrottleLimit $using:ThrottleLimit `
-PlanMode:$using:PlanMode
} else {
Write-ToConsoleLog "Skipping deployment deletion for management group: $managementGroupId ($managementGroupDisplayName) as it is being deleted" -NoNewLine
}
Remove-DeploymentsForScope `
-ScopeType "management group" `
-ScopeNameForLogs "$managementGroupId ($managementGroupDisplayName)" `
-ScopeId $managementGroupId `
-ThrottleLimit $using:ThrottleLimit `
-PlanMode:$using:PlanMode

} -ThrottleLimit $ThrottleLimit
} else {
Write-ToConsoleLog "Skipping deployment deletion for management groups" -NoNewLine
}

# Delete orphaned role assignments from target management groups that are not being deleted
if($managementGroupsFound.Count -ne 0 -and -not $SkipOrphanedRoleAssignmentDeletion) {
if($managementGroupsFound.Count -ne 0 -and -not $SkipOrphanedRoleAssignmentDeletion -and -not $DeleteTargetManagementGroups) {
$managementGroupsFound | ForEach-Object -Parallel {
$managementGroupId = $_.Name
$managementGroupDisplayName = $_.DisplayName
Expand All @@ -752,20 +750,16 @@ function Remove-PlatformLandingZone {
$funcRemoveOrphanedRoleAssignmentsForScope = $using:funcRemoveOrphanedRoleAssignmentsForScope
${function:Remove-OrphanedRoleAssignmentsForScope} = $funcRemoveOrphanedRoleAssignmentsForScope

# Only delete role assignments if this management group is not being deleted
if(-not $deleteTargetManagementGroups) {
Remove-OrphanedRoleAssignmentsForScope `
-ScopeType "management group" `
-ScopeNameForLogs "$managementGroupId ($managementGroupDisplayName)" `
-ScopeId $managementGroupId `
-ThrottleLimit $using:ThrottleLimit `
-PlanMode:$using:PlanMode
} else {
Write-ToConsoleLog "Skipping orphaned role assignment deletion for management group: $managementGroupId ($managementGroupDisplayName) as it is being deleted" -NoNewLine
}
Remove-OrphanedRoleAssignmentsForScope `
-ScopeType "management group" `
-ScopeNameForLogs "$managementGroupId ($managementGroupDisplayName)" `
-ScopeId $managementGroupId `
-ThrottleLimit $using:ThrottleLimit `
-PlanMode:$using:PlanMode

} -ThrottleLimit $ThrottleLimit
} elseif($managementGroupsFound.Count -ne 0) {
Write-ToConsoleLog "Skipping orphaned role assignment deletion for all management groups as requested" -NoNewLine
} else {
Write-ToConsoleLog "Skipping orphaned role assignment deletion for management groups" -NoNewLine
}
}

Expand Down
Loading