From ea833ad17b150b39b6bfcb941c55c810aefd4a8b Mon Sep 17 00:00:00 2001
From: Jesper Fajers <jesper@fajers.se>
Date: Sat, 24 Feb 2024 13:39:45 +0000
Subject: [PATCH] Update

---
 src/internal/functions/Remove-AzOpsDeployment.ps1 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/internal/functions/Remove-AzOpsDeployment.ps1 b/src/internal/functions/Remove-AzOpsDeployment.ps1
index a517e854..f5dde2d2 100644
--- a/src/internal/functions/Remove-AzOpsDeployment.ps1
+++ b/src/internal/functions/Remove-AzOpsDeployment.ps1
@@ -333,6 +333,7 @@
                 # Initialize array to store items that need retry
                 $retry = @()
                 $removalJobChanges = Set-AzOpsRemoveOrder -DeletionList $removalJob.results.Changes -Index { (New-AzOpsScope -Scope $_.FullyQualifiedResourceId -WhatIf:$false).Resource }
+                $allResults = @()
                 foreach ($change in $removalJobChanges) {
                     $resource = $null
                     # Check if the resource exists
@@ -344,9 +345,9 @@
                     }
                     if ($resource) {
                         $results = 'What if successful:{1}Performing the operation:{1}Deletion of target resource {0}.' -f $change.FullyQualifiedResourceId, [environment]::NewLine
+                        $allResults += $results
                         Write-AzOpsMessage -LogLevel Verbose -LogString 'Set-AzOpsWhatIfOutput.WhatIfResults' -LogStringValues $results
                         Write-AzOpsMessage -LogLevel InternalComment -LogString 'Set-AzOpsWhatIfOutput.WhatIfFile'
-                        Set-AzOpsWhatIfOutput -FilePath $TemplateFilePath -ParameterFilePath $TemplateParameterFilePath -Results $results -RemoveAzOpsFlag $true
                         # Check if the removal should be performed
                         if ($PSCmdlet.ShouldProcess("Remove $($change.FullyQualifiedResourceId)?")) {
                             $removeAction = Remove-AzResourceRaw -FullyQualifiedResourceId $change.FullyQualifiedResourceId -ScopeObject $ScopeObject -TemplateFilePath $TemplateFilePath -TemplateParameterFilePath $TemplateParameterFilePath
@@ -363,10 +364,12 @@
                         # Log warning if resource not found
                         Write-AzOpsMessage -LogLevel Warning -LogString 'Remove-AzOpsDeployment.ResourceNotFound' -LogStringValues $scopeObject.resource, $change.FullyQualifiedResourceId
                         $results = 'What if operation failed:{1}Deletion of target resource {0}.{1}Resource could not be found' -f $change.FullyQualifiedResourceId, [environment]::NewLine
-                        Set-AzOpsWhatIfOutput -FilePath $TemplateFilePath -ParameterFilePath $TemplateParameterFilePath -Results $results -RemoveAzOpsFlag $true
+                        $allResults += $results
                     }
 
                 }
+                # Log WhatIf Output once for all resources in template
+                Set-AzOpsWhatIfOutput -FilePath $TemplateFilePath -ParameterFilePath $TemplateParameterFilePath -Results $allResults -RemoveAzOpsFlag $true
                 if ($retry.Count -gt 0) {
                     # Retry failed removals recursively
                     Write-AzOpsMessage -LogLevel InternalComment -LogString 'Remove-AzOpsDeployment.Resource.RetryCount' -LogStringValues $retry.Count