From 576fb669d371d9c75c66804fa77a721126512295 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 14:30:04 +0100
Subject: [PATCH 01/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1 |  87 +++---
 .../helper/Remove-GeneralModule.ps1           | 254 +++++++++++++-----
 .../helper/Remove-Resource.ps1                | 138 +++++++++-
 .../helper/Remove-VirtualMachine.ps1          | 115 --------
 .../resourceRemoval/helper/Remove-vWan.ps1    |  92 -------
 5 files changed, 359 insertions(+), 327 deletions(-)
 delete mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
 delete mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 3c288be8e8..da9cf07a02 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -1,9 +1,31 @@
-function Remove-DeployedModule {
+<#
+.SYNOPSIS
+Remove deployed resources based on their deploymentName(s)
+
+.DESCRIPTION
+Remove deployed resources based on their deploymentName(s)
+
+.PARAMETER deploymentName(s)
+Mandatory. The name(s) of the deployment(s)
+
+.PARAMETER templateFilePath
+Mandatory. The path to the template used for the deployment. Used to determine the level/scope (e.g. subscription)
+
+.PARAMETER ResourceGroupName
+Optional. The name of the resource group the deployment was happening in. Relevant for resource-group level deployments.
+
+.EXAMPLE
+Remove-DeployedModule -deploymentName 'virtualWans-20211204T1812029146Z' -templateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
+
+Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep"
+#>
+function Remove-DeployedModule {
 
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
+        [Alias('deploymentName')]
+        [string[]] $deploymentNames,
 
         [Parameter(Mandatory = $true)]
         [string] $templateFilePath,
@@ -14,43 +36,34 @@
 
     $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
 
-    switch ($moduleName) {
-        'virtualWans' {
-            Write-Verbose 'Run vWAN removal script' -Verbose
-            # Load function
-            . (Join-Path $PSScriptRoot 'helper' 'Remove-vWan.ps1')
+    foreach ($deploymentName in $deploymentNames) {
 
-            # Invoke removal
-            $inputObject = @{
-                deploymentName    = $deploymentName
-                ResourceGroupName = $ResourceGroupName
-            }
-            Remove-vWan @inputObject -Verbose
-        }
-        'virtualMachines' {
-            Write-Verbose 'Run virtual machine removal script' -Verbose
-            # Load function
-            . (Join-Path $PSScriptRoot 'helper' 'Remove-VirtualMachine.ps1')
-
-            # Invoke removal
-            $inputObject = @{
-                deploymentName    = $deploymentName
-                ResourceGroupName = $ResourceGroupName
-            }
-            Remove-VirtualMachine @inputObject -Verbose
-        }
-        default {
-            Write-Verbose 'Run default removal script' -Verbose
-            # Load function
-            . (Join-Path $PSScriptRoot 'helper' 'Remove-GeneralModule.ps1')
-
-            # Invoke removal
-            $inputObject = @{
-                deploymentName    = $deploymentName
-                ResourceGroupName = $ResourceGroupName
-                templateFilePath  = $templateFilePath
+        switch ($moduleName) {
+            # '<moduleName>' {
+            #     Write-Verbose 'Run <moduleName> removal script' -Verbose
+            #     # Load function
+            #     . (Join-Path $PSScriptRoot 'helper' '<script>')
+
+            #     # Invoke removal
+            #     $inputObject = @{
+            #         deploymentName    = $deploymentName
+            #         ResourceGroupName = $ResourceGroupName
+            #     }
+            #     <scriptFunction> @inputObject -Verbose
+            # }
+            default {
+                Write-Verbose 'Run default removal script' -Verbose
+                # Load function
+                . (Join-Path $PSScriptRoot 'helper' 'Remove-GeneralModule.ps1')
+
+                # Invoke removal
+                $inputObject = @{
+                    deploymentName    = $deploymentName
+                    ResourceGroupName = $ResourceGroupName
+                    templateFilePath  = $templateFilePath
+                }
+                Remove-GeneralModule @inputObject -Verbose
             }
-            Remove-GeneralModule @inputObject -Verbose
         }
     }
 }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
index 7753f69722..24cc526cf4 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
@@ -5,7 +5,7 @@
 Get all deployments that match a given deployment name in a given scope
 
 .DESCRIPTION
-Get all deployments that match a given deployment name in a given scope
+Get all deployments that match a given deployment name in a given scope. Works recursively through the deployment tree.
 
 .PARAMETER Name
 Mandatory. The deployment name to search for
@@ -41,22 +41,161 @@ function Get-DeploymentByName {
         [string] $Scope
     )
 
+    $resultSet = [System.Collections.ArrayList]@()
     switch ($Scope) {
         'resourceGroup' {
-            return Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName
+            if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
+                [array]$resultSet += (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
+            } else {
+                # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
+                # In case we already have any such resources in the list, we should remove them
+                [array]$resultSet = $resultSet | Where-Object { $_ -notmatch "/resourceGroups/$resourceGroupName/" }
+            }
         }
         'subscription' {
-            return Get-AzDeploymentOperation -DeploymentName $name
+            [array]$resultSet += (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/resourceGroups/') {
+                    # Resource Group Level Child Deployments
+                    $name = Split-Path $deployment -Leaf
+                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
+                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                } else {
+                    # Subscription Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                }
+            }
         }
         'managementGroup' {
-            return Get-AzManagementGroupDeploymentOperation` -DeploymentName $name
+            [array]$resultSet += (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/managementGroup/') {
+                    # Subscription Level Child Deployments
+                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                } else {
+                    # Management Group Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                }
+            }
         }
         'tenant' {
-            return Get-AzTenantDeploymentOperation -DeploymentName $name
+            [array]$resultSet = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/tenant/') {
+                    # Management Group Level Child Deployments
+                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                } else {
+                    # Tenant Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf)
+                }
+            }
         }
     }
+    return $resultSet
+}
+
+
+<#
+.SYNOPSIS
+Format the provide resource IDs into objects of resourceID, name & type
+
+.DESCRIPTION
+Format the provide resource IDs into objects of resourceID, name & type
+
+.PARAMETER resourceIds
+Optional. The resource IDs to process
+
+.EXAMPLE
+Get-FormattedResources -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
+
+Returns an object @{
+    resourceId = '/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01'
+    type       = 'Microsoft.Storage/storageAccounts'
+    name       = 'adpsxxazsaaspar01'
 }
+#>
+function Get-FormattedResources {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string[]] $resourceIds = @()
+    )
+
+    $formattedResources = [System.Collections.ArrayList]@()
+
+    # Optional resourceGroup-level resources to identify implicitly deployed child-resources
+    $allResourceGroupResources = @()
+
+    foreach ($resourceId in $resourceIds) {
+
+        $idElements = $resourceId.Split('/')
+
+        switch ($idElements.Count) {
+            { $PSItem -eq 5 } {
+                # subscription level resource group
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = 'Microsoft.Resources/resourceGroups'
+                }
+                break
+            }
+            { $PSItem -eq 6 } {
+                # subscription level resource
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = $idElements[4, 5] -join '/'
+                }
+                break
+            }
+            { $PSItem -eq 7 } {
+                # resource group level
+                if ($allResourceGroupResources.Count -eq 0) {
+                    $allResourceGroupResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
+                }
+                $expandedResources = $allResources | Where-Object { $_.ResourceId.startswith($resourceId) }
+                $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
+                foreach ($resource in $expandedResources) {
+                    $formattedResources += @{
+                        resourceId = $resource.ResourceId
+                        name       = $resource.Name
+                        type       = $resource.Type
+                    }
+                }
+                break
+            }
+            { $PSItem -ge 8 } {
+                # child-resource level
+                $indexOfResourceType = $idElements.IndexOf(($idElements -like 'Microsoft.**')[0])
+                $type = $idElements[$indexOfResourceType, ($indexOfResourceType + 1)] -join '/'
+
+                # Concat rest of resource type along the ID
+                $partCounter = $indexOfResourceType + 1
+                while (-not ($partCounter + 2 -gt $idElements.Count - 1)) {
+                    $type += ('/{0}' -f $idElements[($partCounter + 2)])
+                    $partCounter = $partCounter + 2
+                }
+
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = $type
+                }
+                break
+            }
+            Default {
+                throw "Failed to process resource ID [$resourceId]"
+            }
+        }
+    }
 
+    return $formattedResources
+}
 #endregion
 
 <#
@@ -119,10 +258,6 @@ function Remove-GeneralModule {
     }
 
     process {
-
-        #####################
-        ## Process Removal ##
-        #####################
         Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
 
         # Gather deployments
@@ -147,9 +282,15 @@ function Remove-GeneralModule {
                 Default { throw "[$armSchema] is a non-supported ARM template schema" }
             }
         }
+        Write-Verbose "Determined deployment scope [$deploymentScope]" -Verbose
+
+        # Fundamental checks
+        if ($deploymentScope -eq 'resourceGroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
+            Write-Verbose "Resource group [$ResourceGroupName] does not exist (anymore). Skipping removal of its contained resources" -Verbose
+            return
+        }
 
-        # Identify resources
-        # ------------------
+        # Fetch deployments
         $searchRetryCount = 1
         do {
             $deployments = Get-DeploymentByName -name $deploymentName -scope $deploymentScope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
@@ -165,76 +306,45 @@ function Remove-GeneralModule {
             throw "No deployment found for [$deploymentName]"
         }
 
-        $resourcesToRemove = @()
-        $rawResourceIdsToRemove = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
+        # Pre-Filter & order items
+        # ========================
+        $rawResourceIdsToRemove = $deployments | Where-Object { $_ -and $_ -notmatch '/deployments/' }
         $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Descending -Unique
 
-        # Process removal
-        # ===============
-        if ($deploymentScope -eq 'subscription') {
-            Write-Verbose 'Handle subscription level removal'
-
-            foreach ($rawResourceIdsToRemove in $rawResourceIdsToRemove) {
-                if ($rawResourceIdsToRemove.Split('/').count -lt 7) {
-                    # resource group
-                    $resourcesToRemove += @{
-                        resourceId = $rawResourceIdsToRemove
-                        name       = $rawResourceIdsToRemove.Split('/')[-1]
-                        type       = 'Microsoft.Resources/resourceGroups'
-                    }
-                } else {
-                    $resourcesToRemove += @{
-                        resourceId = $rawResourceIdsToRemove
-                        name       = $rawResourceIdsToRemove.Split('/')[-1]
-                        type       = $rawResourceIdsToRemove.Split('/')[4, 5] -join '/'
-                    }
-                }
-            }
-        } else {
-            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
-            # Get all child resources and sort from child to parent
-            foreach ($topLevelResource in $rawResourceIdsToRemove) {
-                $expandedResources = $allResources | Where-Object { $_.ResourceId.startswith($topLevelResource) }
-                $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
-                foreach ($resource in $expandedResources) {
-                    $resourcesToRemove += @{
-                        resourceId = $resource.ResourceId
-                        name       = $resource.Name
-                        type       = $resource.Type
-                    }
-                }
-            }
-            if ($resourcesToRemove.Count -gt 1) {
-                $resourcesToRemove = $resourcesToRemove | Sort-Object -Descending -Property 'ResourceId' -Unique
-            }
-
-            # If VMs are available, delete those first
-            if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
-
-                $intermediateResources = @()
-                foreach ($vmInstance in $vmsContained) {
-                    $intermediateResources += @{
-                        resourceId = $vmInstance.ResourceId
-                        name       = $vmInstance.Name
-                        type       = $vmInstance.Type
-                    }
-                }
-                if ($PSCmdlet.ShouldProcess(('[{0}] VM resources' -f $intermediateResources.Count), 'Remove')) {
-                    Remove-Resource -resourceToRemove $intermediateResources -Verbose
-                }
-                # refresh
-                $resourcesToRemove = $resourcesToRemove | Where-Object { $_.ResourceId -notin $intermediateResources.resourceId }
-            }
+        if ($rawResourceIdsToRemove.Count -eq 0) {
+            Write-Verbose 'Found no relevant resources to remove' -Verbose
+            return
         }
 
+        # Format items
+        # ============
+        $resourcesToRemove = Get-FormattedResources -resourceIds $rawResourceIdsToRemove
+
         # Filter all dependency resources
+        # ===============================
         $dependencyResourceNames = Get-DependencyResourceNames
         $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
 
+        # Order resources
+        # ===============
+        # If virutal machines are contained, remove them first
+        if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
+            $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
+        }
+
+        # If resource groups are contained, remove them second
+        if ($rgsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Resources/resourceGroups' }) {
+            $resourcesToRemove = @() + $rgsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Resources/resourceGroups' })
+        }
+
         # Remove resources
-        # ----------------
-        if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
-            Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+        # ================
+        if ($resourcesToRemove.Count -gt 0) {
+            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
+                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+            }
+        } else {
+            Write-Verbose 'Found [0] resources to remove'
         }
     }
 
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index 54429a6032..7e68301a5c 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -18,32 +18,148 @@ function Remove-ResourceInner {
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $false)]
-        [PSObject[]] $resourceToRemove = @()
+        [Hashtable[]] $resourceToRemove = @()
     )
 
     $resourceToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
     $resourcesToRetry = @()
+    $processedResources = @()
     Write-Verbose '----------------------------------' -Verbose
 
     foreach ($resource in $resourceToRemove) {
 
-        Write-Verbose ('Trying to remove resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
-        try {
-            if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                $null = Remove-AzResource -ResourceId $resource.resourceId -Force -ErrorAction 'Stop'
+        if (($processedResources | Where-Object { $resource.resourceId -match $_.resourceId }) -and -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
+            # Skipping
+            Write-Verbose ('Skipping resource [{0}] of type [{1}] as parent resource was already processed' -f $resource.name, $resource.type) -Verbose
+            [array]$processedResources += $resource.resourceId
+            [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
+        } else {
+
+            Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
+            try {
+                if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
+                    Initialize-PreResourceRemoval -resourceToRemove $resource
+                }
+
+                if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
+                    $null = Remove-AzResource -ResourceId $resource.resourceId -Force -ErrorAction 'Stop'
+                }
+
+                # If we removed a parent remove its children
+                [array]$processedResources += $resource.resourceId
+                [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
+            } catch {
+                Write-Warning ('Removal moved back for re-try. Reason: [{0}]' -f $_.Exception.Message)
+                [array]$resourcesToRetry += $resource
             }
+        }
 
-            # If we removed a parent remove its children
-            $resourceToRemove = $resourceToRemove | Where-Object { $_.resourceId -notmatch $resource.resourceId }
-            $resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
-        } catch {
-            Write-Warning ('Removal moved back for re-try. Reason: [{0}]' -f $_.Exception.Message)
-            $resourcesToRetry += $resource
+        if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
+            Initialize-PostResourceRemoval -resourceToRemove $resource
         }
     }
     Write-Verbose '----------------------------------' -Verbose
     return $resourcesToRetry
 }
+
+<#
+.SYNOPSIS
+Prepare the given resource for removal
+
+.DESCRIPTION
+Prepare the given resource for removal. This is required for some resource such as the RSV where we first have to remove its protected items before the RSV itself can be removed
+
+.PARAMETER resourceToRemove
+MAndatory. The resource to prepare.Should have format
+@{
+    name        = '...'
+    resourceID = '...'
+    type        = '...'
+}
+
+.EXAMPLE
+Initialize-PreResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
+
+Prepare resource 'myVault' of type 'Microsoft.RecoveryServices/vaults' for removal
+#>
+function Initialize-PreResourceRemoval {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [hashtable] $resourceToRemove
+    )
+
+    switch ($resourceToRemove.type) {
+        'Microsoft.RecoveryServices/vaults' {
+            # Remove protected VMs
+            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
+                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
+                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
+                }
+            }
+
+            $backupItems = Get-AzRecoveryServicesBackupItem -BackupManagementType 'AzureVM' -WorkloadType 'AzureVM' -VaultId $resourceToRemove.resourceId
+            foreach ($backupItem in $backupItems) {
+                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
+
+                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
+                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
+                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
+                    }
+                }
+
+                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
+                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
+                }
+            }
+        }
+    }
+}
+
+<#
+.SYNOPSIS
+Remove any artifacts that remain of the given resource
+
+.DESCRIPTION
+Remove any artifacts that remain of the given resource. For example, some resources such as key vaults usually go into a soft-delete state from which we want to purge them from.
+
+.PARAMETER resourceToRemove
+Mandatory. The resource to remove. Should have format
+@{
+    name        = '...'
+    resourceID = '...'
+    type        = '...'
+}
+
+.EXAMPLE
+Initialize-PostResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
+
+Purge resource 'myVault' of type 'Microsoft.KeyVault/vaults' if no purge protection is enabled
+#>
+function Initialize-PostResourceRemoval {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [hashtable] $resourceToRemove
+    )
+
+    switch ($resourceToRemove.type) {
+        'Microsoft.KeyVault/vaults' {
+            $name = $resourceToRemove.resourceId.Split('/')[-1]
+            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
+
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $resourceGroupName -eq $resourceGroupName }
+            if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
+                Write-Verbose "Purging key vault [$name]" -Verbose
+                if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
+                    $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location
+                }
+            }
+        }
+    }
+}
 #endregion
 
 <#
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
deleted file mode 100644
index 054f875671..0000000000
--- a/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
+++ /dev/null
@@ -1,115 +0,0 @@
-<#
-.SYNOPSIS
-Remove a Virtual Machine resource with a given deployment name
-
-.DESCRIPTION
-Remove a Virtual Machine resource with a given deployment name
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-VirtualMachine -deploymentname 'keyvault-12345'
-
-Remove a virtual machine with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-VirtualMachine {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
-    }
-
-    process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find VirtualMachine deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
-        }
-
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $resourcesToRemove = [System.Collections.ArrayList] @()
-
-
-        # Handle VM resources
-        $vmIds = $unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }
-        if ($vmIds.Count -gt 0) {
-            $vmName = ($unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }).Split('/')[-1]
-
-            # Fetch all resources that match the VM
-            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name "$vmName*"
-
-            # Sort ascending as we need to remove the VM first
-            $orderedResourceIds = $allResources | Sort-Object -Property { $_.ResourceId.Split('/').Count }
-            $resourcesToRemove += $orderedResourceIds | ForEach-Object {
-                @{
-                    resourceId = $_.ResourceId
-                    name       = $_.Name
-                    type       = $_.Type
-                }
-            }
-        }
-
-        # Handle non-vm resources that are deployed with the VM
-        $otherIds = $unorderedResourceIds | Where-Object { $_ -notmatch '/virtualMachines/' }
-        foreach ($otherResourceId in $otherIds) {
-            $resourcesToRemove += @{
-                resourceId = $otherResourceId
-                name       = $otherResourceId.Split('/')[-1]
-                type       = $otherResourceId.Split('/')[6..7] -join '/'
-            }
-        }
-
-        # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNames
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Remove resources
-        # ----------------
-        if ($resourcesToRemove.count -gt 0) {
-            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-            }
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
deleted file mode 100644
index d5090d3c2e..0000000000
--- a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
+++ /dev/null
@@ -1,92 +0,0 @@
-<#
-.SYNOPSIS
-Remove a vWAN resource with a given deployment name
-
-.DESCRIPTION
-Remove a vWAN resource with a given deployment name
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-vWan -deploymentname 'keyvault-12345'
-
-Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-vWan {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-    }
-
-    process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find vWAN deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
-        }
-
-        $resourcesToRemove = @()
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-
-        $orderedResourceIds = @(
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
-        )
-        $resourcesToRemove = $orderedResourceIds | ForEach-Object {
-            @{
-                resourceId = $_
-                name       = $_.Split('/')[-1]
-                type       = $_.Split('/')[6..7] -join '/'
-            }
-        }
-
-        # Remove resources
-        # ----------------
-        if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-            Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}

From e40e465e361fa45065881efc84137053af749384 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 14:48:18 +0100
Subject: [PATCH 02/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1 |  34 ++++--
 .../helper/Remove-VirtualMachine.ps1          | 115 ++++++++++++++++++
 .../resourceRemoval/helper/Remove-vWan.ps1    |   1 +
 3 files changed, 139 insertions(+), 11 deletions(-)
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index da9cf07a02..970029ce1d 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -39,18 +39,30 @@ function Remove-DeployedModule {
     foreach ($deploymentName in $deploymentNames) {
 
         switch ($moduleName) {
-            # '<moduleName>' {
-            #     Write-Verbose 'Run <moduleName> removal script' -Verbose
-            #     # Load function
-            #     . (Join-Path $PSScriptRoot 'helper' '<script>')
+            'virtualWans' {
+                Write-Verbose 'Run vWAN removal script' -Verbose
+                # Load function
+                . (Join-Path $PSScriptRoot 'helper' 'Remove-vWan.ps1')
 
-            #     # Invoke removal
-            #     $inputObject = @{
-            #         deploymentName    = $deploymentName
-            #         ResourceGroupName = $ResourceGroupName
-            #     }
-            #     <scriptFunction> @inputObject -Verbose
-            # }
+                # Invoke removal
+                $inputObject = @{
+                    deploymentName    = $deploymentName
+                    ResourceGroupName = $ResourceGroupName
+                }
+                Remove-vWan @inputObject -Verbose
+            }
+            'virtualMachines' {
+                Write-Verbose 'Run virtual machine removal script' -Verbose
+                # Load function
+                . (Join-Path $PSScriptRoot 'helper' 'Remove-VirtualMachine.ps1')
+
+                # Invoke removal
+                $inputObject = @{
+                    deploymentName    = $deploymentName
+                    ResourceGroupName = $ResourceGroupName
+                }
+                Remove-VirtualMachine @inputObject -Verbose
+            }
             default {
                 Write-Verbose 'Run default removal script' -Verbose
                 # Load function
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
new file mode 100644
index 0000000000..054f875671
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
@@ -0,0 +1,115 @@
+<#
+.SYNOPSIS
+Remove a Virtual Machine resource with a given deployment name
+
+.DESCRIPTION
+Remove a Virtual Machine resource with a given deployment name
+
+.PARAMETER deploymentName
+Mandatory. The deployment name to use and find resources to remove
+
+.PARAMETER searchRetryLimit
+Optional. The maximum times to retry the search for resources via their removal tag
+
+.PARAMETER searchRetryInterval
+Optional. The time to wait in between the search for resources via their remove tags
+
+.EXAMPLE
+Remove-VirtualMachine -deploymentname 'keyvault-12345'
+
+Remove a virtual machine with deployment name 'keyvault-12345' from resource group 'validation-rg'
+#>
+function Remove-VirtualMachine {
+
+    [Cmdletbinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $deploymentName,
+
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName = 'validation-rg',
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryLimit = 40,
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryInterval = 60
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
+        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
+    }
+
+    process {
+
+        # Identify resources
+        # ------------------
+        $searchRetryCount = 1
+        do {
+            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+            if ($deployments) {
+                break
+            }
+            Write-Verbose ('Did not to find VirtualMachine deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+            Start-Sleep $searchRetryInterval
+            $searchRetryCount++
+        } while ($searchRetryCount -le $searchRetryLimit)
+
+        if (-not $deployments) {
+            throw "No deployment found for [$deploymentName]"
+        }
+
+        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
+        $resourcesToRemove = [System.Collections.ArrayList] @()
+
+
+        # Handle VM resources
+        $vmIds = $unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }
+        if ($vmIds.Count -gt 0) {
+            $vmName = ($unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }).Split('/')[-1]
+
+            # Fetch all resources that match the VM
+            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name "$vmName*"
+
+            # Sort ascending as we need to remove the VM first
+            $orderedResourceIds = $allResources | Sort-Object -Property { $_.ResourceId.Split('/').Count }
+            $resourcesToRemove += $orderedResourceIds | ForEach-Object {
+                @{
+                    resourceId = $_.ResourceId
+                    name       = $_.Name
+                    type       = $_.Type
+                }
+            }
+        }
+
+        # Handle non-vm resources that are deployed with the VM
+        $otherIds = $unorderedResourceIds | Where-Object { $_ -notmatch '/virtualMachines/' }
+        foreach ($otherResourceId in $otherIds) {
+            $resourcesToRemove += @{
+                resourceId = $otherResourceId
+                name       = $otherResourceId.Split('/')[-1]
+                type       = $otherResourceId.Split('/')[6..7] -join '/'
+            }
+        }
+
+        # Filter all dependency resources
+        $dependencyResourceNames = Get-DependencyResourceNames
+        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
+
+        # Remove resources
+        # ----------------
+        if ($resourcesToRemove.count -gt 0) {
+            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
+                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+            }
+        }
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
@@ -0,0 +1 @@
+
\ No newline at end of file

From 22ff68240778be4fd327caeae3e9e77a4e61fa87 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 14:49:03 +0100
Subject: [PATCH 03/78] Update to latest

---
 .../resourceRemoval/helper/Remove-vWan.ps1    | 201 +++++++++++++++++-
 1 file changed, 200 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
index 5f282702bb..140abba2fe 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
@@ -1 +1,200 @@
-
\ No newline at end of file
+<#
+.SYNOPSIS
+Remove a vWAN resource with a given deployment name
+.DESCRIPTION
+Remove a vWAN resource with a given deployment name
+.PARAMETER deploymentName
+Mandatory. The deployment name to use and find resources to remove
+.PARAMETER searchRetryLimit
+Optional. The maximum times to retry the search for resources via their removal tag
+.PARAMETER searchRetryInterval
+Optional. The time to wait in between the search for resources via their remove tags
+.EXAMPLE
+Remove-vWan -deploymentname 'keyvault-12345'
+Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
+#>
+function Remove-vWan {
+
+    [Cmdletbinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $deploymentName,
+
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName = 'validation-rg',
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryLimit = 40,
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryInterval = 60
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
+    }
+
+    process {
+
+        # Identify resources
+        # ------------------
+        $searchRetryCount = 1
+        do {
+            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+            if ($deployments) {
+                break
+            }
+            Write-Verbose ('Did not to find vWAN deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+            Start-Sleep $searchRetryInterval
+            $searchRetryCount++
+        } while ($searchRetryCount -le $searchRetryLimit)
+
+        if (-not $deployments) {
+            throw "No deployment found for [$deploymentName]"
+        }
+
+        $resourcesToRemove = @()
+        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
+
+        $orderedResourceIds = @(
+            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
+            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
+            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
+            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
+        )
+        $resourcesToRemove = $orderedResourceIds | ForEach-Object {
+            @{
+                resourceId = $_
+                name       = $_.Split('/')[-1]
+                type       = $_.Split('/')[6..7] -join '/'
+            }
+        }
+
+        # Remove resources
+        # ----------------
+        if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
+            Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+        }
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}<#
+.SYNOPSIS
+Remove a Virtual Machine resource with a given deployment name
+
+.DESCRIPTION
+Remove a Virtual Machine resource with a given deployment name
+
+.PARAMETER deploymentName
+Mandatory. The deployment name to use and find resources to remove
+
+.PARAMETER searchRetryLimit
+Optional. The maximum times to retry the search for resources via their removal tag
+
+.PARAMETER searchRetryInterval
+Optional. The time to wait in between the search for resources via their remove tags
+
+.EXAMPLE
+Remove-VirtualMachine -deploymentname 'keyvault-12345'
+
+Remove a virtual machine with deployment name 'keyvault-12345' from resource group 'validation-rg'
+#>
+function Remove-VirtualMachine {
+
+    [Cmdletbinding(SupportsShouldProcess)]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $deploymentName,
+
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName = 'validation-rg',
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryLimit = 40,
+
+        [Parameter(Mandatory = $false)]
+        [int] $searchRetryInterval = 60
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
+        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
+    }
+
+    process {
+
+        # Identify resources
+        # ------------------
+        $searchRetryCount = 1
+        do {
+            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+            if ($deployments) {
+                break
+            }
+            Write-Verbose ('Did not to find VirtualMachine deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+            Start-Sleep $searchRetryInterval
+            $searchRetryCount++
+        } while ($searchRetryCount -le $searchRetryLimit)
+
+        if (-not $deployments) {
+            throw "No deployment found for [$deploymentName]"
+        }
+
+        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
+        $resourcesToRemove = [System.Collections.ArrayList] @()
+
+
+        # Handle VM resources
+        $vmIds = $unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }
+        if ($vmIds.Count -gt 0) {
+            $vmName = ($unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }).Split('/')[-1]
+
+            # Fetch all resources that match the VM
+            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name "$vmName*"
+
+            # Sort ascending as we need to remove the VM first
+            $orderedResourceIds = $allResources | Sort-Object -Property { $_.ResourceId.Split('/').Count }
+            $resourcesToRemove += $orderedResourceIds | ForEach-Object {
+                @{
+                    resourceId = $_.ResourceId
+                    name       = $_.Name
+                    type       = $_.Type
+                }
+            }
+        }
+
+        # Handle non-vm resources that are deployed with the VM
+        $otherIds = $unorderedResourceIds | Where-Object { $_ -notmatch '/virtualMachines/' }
+        foreach ($otherResourceId in $otherIds) {
+            $resourcesToRemove += @{
+                resourceId = $otherResourceId
+                name       = $otherResourceId.Split('/')[-1]
+                type       = $otherResourceId.Split('/')[6..7] -join '/'
+            }
+        }
+
+        # Filter all dependency resources
+        $dependencyResourceNames = Get-DependencyResourceNames
+        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
+
+        # Remove resources
+        # ----------------
+        if ($resourcesToRemove.count -gt 0) {
+            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
+                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+            }
+        }
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}

From 662158264d8b2488bf22327c5b649010496984e6 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 14:49:57 +0100
Subject: [PATCH 04/78] Update to latest

---
 .../resourceRemoval/helper/Remove-vWan.ps1    | 120 +-----------------
 1 file changed, 6 insertions(+), 114 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
index 140abba2fe..d5090d3c2e 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
@@ -1,16 +1,22 @@
 <#
 .SYNOPSIS
 Remove a vWAN resource with a given deployment name
+
 .DESCRIPTION
 Remove a vWAN resource with a given deployment name
+
 .PARAMETER deploymentName
 Mandatory. The deployment name to use and find resources to remove
+
 .PARAMETER searchRetryLimit
 Optional. The maximum times to retry the search for resources via their removal tag
+
 .PARAMETER searchRetryInterval
 Optional. The time to wait in between the search for resources via their remove tags
+
 .EXAMPLE
 Remove-vWan -deploymentname 'keyvault-12345'
+
 Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
 #>
 function Remove-vWan {
@@ -80,120 +86,6 @@ function Remove-vWan {
         }
     }
 
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}<#
-.SYNOPSIS
-Remove a Virtual Machine resource with a given deployment name
-
-.DESCRIPTION
-Remove a Virtual Machine resource with a given deployment name
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-VirtualMachine -deploymentname 'keyvault-12345'
-
-Remove a virtual machine with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-VirtualMachine {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
-    }
-
-    process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find VirtualMachine deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
-        }
-
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $resourcesToRemove = [System.Collections.ArrayList] @()
-
-
-        # Handle VM resources
-        $vmIds = $unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }
-        if ($vmIds.Count -gt 0) {
-            $vmName = ($unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }).Split('/')[-1]
-
-            # Fetch all resources that match the VM
-            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name "$vmName*"
-
-            # Sort ascending as we need to remove the VM first
-            $orderedResourceIds = $allResources | Sort-Object -Property { $_.ResourceId.Split('/').Count }
-            $resourcesToRemove += $orderedResourceIds | ForEach-Object {
-                @{
-                    resourceId = $_.ResourceId
-                    name       = $_.Name
-                    type       = $_.Type
-                }
-            }
-        }
-
-        # Handle non-vm resources that are deployed with the VM
-        $otherIds = $unorderedResourceIds | Where-Object { $_ -notmatch '/virtualMachines/' }
-        foreach ($otherResourceId in $otherIds) {
-            $resourcesToRemove += @{
-                resourceId = $otherResourceId
-                name       = $otherResourceId.Split('/')[-1]
-                type       = $otherResourceId.Split('/')[6..7] -join '/'
-            }
-        }
-
-        # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNames
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Remove resources
-        # ----------------
-        if ($resourcesToRemove.count -gt 0) {
-            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-            }
-        }
-    }
-
     end {
         Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
     }

From a6f922f54df5be7bcbbb14818be47be52f58c63f Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 15:50:52 +0100
Subject: [PATCH 05/78] Update to latest

---
 .../helper/Remove-GeneralModule.ps1           | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
index 24cc526cf4..54861e8e38 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
@@ -20,6 +20,12 @@ Mandatory. The scope to search in
 Get-DeploymentByName -Name 'keyvault-12356' -Scope 'resourceGroup'
 
 Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
+
+.NOTES
+Works after the principal:
+- Find all deployments for the given deployment name
+- If any of them are not a deployments, add their target resource to the result set (as they are e.g. a resource)
+- If any of them is are deployments, recursively invoke this function for them to get their contained target resources
 #>
 function Get-DeploymentByName {
 
@@ -45,7 +51,15 @@ function Get-DeploymentByName {
     switch ($Scope) {
         'resourceGroup' {
             if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
-                [array]$resultSet += (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
+                [array]$deploymentTargets = (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
+                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                    [array]$resultSet += $deployment
+                }
+                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
+                    $name = Split-Path $deployment -Leaf
+                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
+                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                }
             } else {
                 # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
                 # In case we already have any such resources in the list, we should remove them
@@ -53,8 +67,11 @@ function Get-DeploymentByName {
             }
         }
         'subscription' {
-            [array]$resultSet += (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+            [array]$deploymentTargets = (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/resourceGroups/') {
                     # Resource Group Level Child Deployments
@@ -68,8 +85,11 @@ function Get-DeploymentByName {
             }
         }
         'managementGroup' {
-            [array]$resultSet += (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+            [array]$deploymentTargets = (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/managementGroup/') {
                     # Subscription Level Child Deployments
@@ -81,8 +101,11 @@ function Get-DeploymentByName {
             }
         }
         'tenant' {
-            [array]$resultSet = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($resultSet | Where-Object { $_ -match '/deployments/' } )) {
+            [array]$deploymentTargets = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/tenant/') {
                     # Management Group Level Child Deployments
@@ -309,7 +332,7 @@ function Remove-GeneralModule {
         # Pre-Filter & order items
         # ========================
         $rawResourceIdsToRemove = $deployments | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Descending -Unique
+        $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Property { $_.Split('/').Count } -Unique
 
         if ($rawResourceIdsToRemove.Count -eq 0) {
             Write-Verbose 'Found no relevant resources to remove' -Verbose

From 989298a6ac82d7dc8077ed99259e0f66d685d69e Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 16:16:02 +0100
Subject: [PATCH 06/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
index 54861e8e38..11082518d1 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
@@ -332,7 +332,7 @@ function Remove-GeneralModule {
         # Pre-Filter & order items
         # ========================
         $rawResourceIdsToRemove = $deployments | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Property { $_.Split('/').Count } -Unique
+        $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Property { $_.Split('/').Count } -Unique -Descending
 
         if ($rawResourceIdsToRemove.Count -eq 0) {
             Write-Verbose 'Found no relevant resources to remove' -Verbose

From 9d4bee87a4613b7ce64192512af2fd53d7f6b6d2 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 17:45:05 +0100
Subject: [PATCH 07/78] Update to latest

---
 .../resourceRemoval/helper/Remove-GeneralModule.ps1          | 5 ++---
 .../pipelines/resourceRemoval/helper/Remove-Resource.ps1     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
index 11082518d1..21f153bc6c 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
@@ -331,8 +331,7 @@ function Remove-GeneralModule {
 
         # Pre-Filter & order items
         # ========================
-        $rawResourceIdsToRemove = $deployments | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $rawResourceIdsToRemove = $rawResourceIdsToRemove | Sort-Object -Property { $_.Split('/').Count } -Unique -Descending
+        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
 
         if ($rawResourceIdsToRemove.Count -eq 0) {
             Write-Verbose 'Found no relevant resources to remove' -Verbose
@@ -350,7 +349,7 @@ function Remove-GeneralModule {
 
         # Order resources
         # ===============
-        # If virutal machines are contained, remove them first
+        # If virtual machines are contained, remove them first
         if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
             $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index 7e68301a5c..e436db6f54 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -28,7 +28,7 @@ function Remove-ResourceInner {
 
     foreach ($resource in $resourceToRemove) {
 
-        if (($processedResources | Where-Object { $resource.resourceId -match $_.resourceId }) -and -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
+        if ((($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) -and -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
             # Skipping
             Write-Verbose ('Skipping resource [{0}] of type [{1}] as parent resource was already processed' -f $resource.name, $resource.type) -Verbose
             [array]$processedResources += $resource.resourceId

From 59d82d35d32444ed726e10cfe9b449f651a3f5cc Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 18:33:24 +0100
Subject: [PATCH 08/78] Update to latest

---
 .../helper/Remove-GeneralModule.ps1           | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
index 21f153bc6c..09507c6651 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
@@ -168,7 +168,7 @@ function Get-FormattedResources {
                 break
             }
             { $PSItem -eq 6 } {
-                # subscription level resource
+                # subscription-level resource group
                 $formattedResources += @{
                     resourceId = $resourceId
                     name       = $idElements[-1]
@@ -177,17 +177,26 @@ function Get-FormattedResources {
                 break
             }
             { $PSItem -eq 7 } {
-                # resource group level
-                if ($allResourceGroupResources.Count -eq 0) {
-                    $allResourceGroupResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
-                }
-                $expandedResources = $allResources | Where-Object { $_.ResourceId.startswith($resourceId) }
-                $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
-                foreach ($resource in $expandedResources) {
+                if (($resourceId.Split('/'))[3] -ne 'resourceGroups') {
+                    # subscription-level resource
                     $formattedResources += @{
-                        resourceId = $resource.ResourceId
-                        name       = $resource.Name
-                        type       = $resource.Type
+                        resourceId = $resourceId
+                        name       = Split-Path $resourceId -Leaf
+                        type       = $idElements[4, 5] -join '/'
+                    }
+                } else {
+                    # resource group-level
+                    if ($allResourceGroupResources.Count -eq 0) {
+                        $allResourceGroupResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
+                    }
+                    $expandedResources = $allResourceGroupResources | Where-Object { $_.ResourceId.startswith($resourceId) }
+                    $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
+                    foreach ($resource in $expandedResources) {
+                        $formattedResources += @{
+                            resourceId = $resource.ResourceId
+                            name       = $resource.Name
+                            type       = $resource.Type
+                        }
                     }
                 }
                 break

From 2a1407723dc95ac393a4cb726cc9c3df0ee60b49 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 8 Dec 2021 19:43:50 +0100
Subject: [PATCH 09/78] Enabled removal for kvlt

---
 .github/workflows/ms.keyvault.vaults.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index 6eb330bda5..93f2b342cd 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -7,7 +7,7 @@ on:
         type: boolean
         description: 'Remove deployed module'
         required: false
-        default: 'false' # Soft-delete prevents re-deployment
+        default: 'true'
       versioningOption:
         type: choice
         description: 'The mode to handle the version increments [major|minor|patch]'

From 64027d4cebb6d868daaba4ad0a85e31daeaec956 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 10:57:33 +0100
Subject: [PATCH 10/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-Resource.ps1      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index e436db6f54..606b1347a2 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -28,9 +28,9 @@ function Remove-ResourceInner {
 
     foreach ($resource in $resourceToRemove) {
 
-        if ((($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) -and -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
+        if ((($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) -or -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
             # Skipping
-            Write-Verbose ('Skipping resource [{0}] of type [{1}] as parent resource was already processed' -f $resource.name, $resource.type) -Verbose
+            Write-Verbose ('Skipping resource [{0}] of type [{1}] as itself or parent resource was already processed' -f $resource.name, $resource.type) -Verbose
             [array]$processedResources += $resource.resourceId
             [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
         } else {

From 81539789ced962c3b48d6d5996153d6613ab5196 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 11:45:36 +0100
Subject: [PATCH 11/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-Resource.ps1  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index 606b1347a2..96b38f30fd 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -28,13 +28,17 @@ function Remove-ResourceInner {
 
     foreach ($resource in $resourceToRemove) {
 
-        if ((($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) -or -not (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue')) {
+        $resourceReference = ($resource.resourceId.split('/').count -gt 5) ?
+            (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue') :
+            (Get-AzResourceGroup -Id $resource.resourceId -ErrorAction 'SilentlyContinue')
+        $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
+
+        if (-not $resourceReference -or $alreadyProcessed) {
             # Skipping
             Write-Verbose ('Skipping resource [{0}] of type [{1}] as itself or parent resource was already processed' -f $resource.name, $resource.type) -Verbose
             [array]$processedResources += $resource.resourceId
             [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
         } else {
-
             Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
             try {
                 if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {

From 55c4940b3a3de7e1d239883a5d4b958b623dc002 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 17:02:07 +0100
Subject: [PATCH 12/78] Update to latest

---
 .../helper/Initialize-PostResourceRemoval.ps1 |  43 ++++++++
 .../helper/Initialize-PreResourceRemoval.ps1  |  54 +++++++++
 .../helper/Remove-Resource.ps1                | 104 +-----------------
 3 files changed, 101 insertions(+), 100 deletions(-)
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1

diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
new file mode 100644
index 0000000000..ebd015d34f
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
@@ -0,0 +1,43 @@
+<#
+.SYNOPSIS
+Remove any artifacts that remain of the given resource
+
+.DESCRIPTION
+Remove any artifacts that remain of the given resource. For example, some resources such as key vaults usually go into a soft-delete state from which we want to purge them from.
+
+.PARAMETER resourceToRemove
+Mandatory. The resource to remove. Should have format
+@{
+    name        = '...'
+    resourceID = '...'
+    type        = '...'
+}
+
+.EXAMPLE
+Initialize-PostResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
+
+Purge resource 'myVault' of type 'Microsoft.KeyVault/vaults' if no purge protection is enabled
+#>
+function Initialize-PostResourceRemoval {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [hashtable] $resourceToRemove
+    )
+
+    switch ($resourceToRemove.type) {
+        'Microsoft.KeyVault/vaults' {
+            $name = $resourceToRemove.resourceId.Split('/')[-1]
+            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
+
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $resourceGroupName -eq $resourceGroupName }
+            if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
+                Write-Verbose "Purging key vault [$name]" -Verbose
+                if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
+                    $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location
+                }
+            }
+        }
+    }
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1
new file mode 100644
index 0000000000..d985819794
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1
@@ -0,0 +1,54 @@
+<#
+.SYNOPSIS
+Prepare the given resource for removal
+
+.DESCRIPTION
+Prepare the given resource for removal. This is required for some resource such as the RSV where we first have to remove its protected items before the RSV itself can be removed
+
+.PARAMETER resourceToRemove
+MAndatory. The resource to prepare.Should have format
+@{
+    name        = '...'
+    resourceID = '...'
+    type        = '...'
+}
+
+.EXAMPLE
+Initialize-PreResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
+
+Prepare resource 'myVault' of type 'Microsoft.RecoveryServices/vaults' for removal
+#>
+function Initialize-PreResourceRemoval {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [hashtable] $resourceToRemove
+    )
+
+    switch ($resourceToRemove.type) {
+        'Microsoft.RecoveryServices/vaults' {
+            # Remove protected VMs
+            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
+                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
+                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
+                }
+            }
+
+            $backupItems = Get-AzRecoveryServicesBackupItem -BackupManagementType 'AzureVM' -WorkloadType 'AzureVM' -VaultId $resourceToRemove.resourceId
+            foreach ($backupItem in $backupItems) {
+                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
+
+                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
+                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
+                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
+                    }
+                }
+
+                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
+                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
+                }
+            }
+        }
+    }
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index 96b38f30fd..0254608fda 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -14,13 +14,16 @@ Remove-ResourceInner -resourceToRemove @( @{ 'Name' = 'resourceName'; Type = 'Mi
 #>
 function Remove-ResourceInner {
 
-
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $false)]
         [Hashtable[]] $resourceToRemove = @()
     )
 
+    # Load functions
+    . (Join-Path $PSScriptRoot 'Initialize-PreResourceRemoval.ps1')
+    . (Join-Path $PSScriptRoot 'Initialize-PostResourceRemoval.ps1')
+
     $resourceToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
     $resourcesToRetry = @()
     $processedResources = @()
@@ -65,105 +68,6 @@ function Remove-ResourceInner {
     Write-Verbose '----------------------------------' -Verbose
     return $resourcesToRetry
 }
-
-<#
-.SYNOPSIS
-Prepare the given resource for removal
-
-.DESCRIPTION
-Prepare the given resource for removal. This is required for some resource such as the RSV where we first have to remove its protected items before the RSV itself can be removed
-
-.PARAMETER resourceToRemove
-MAndatory. The resource to prepare.Should have format
-@{
-    name        = '...'
-    resourceID = '...'
-    type        = '...'
-}
-
-.EXAMPLE
-Initialize-PreResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
-
-Prepare resource 'myVault' of type 'Microsoft.RecoveryServices/vaults' for removal
-#>
-function Initialize-PreResourceRemoval {
-
-    [CmdletBinding(SupportsShouldProcess)]
-    param (
-        [Parameter(Mandatory)]
-        [hashtable] $resourceToRemove
-    )
-
-    switch ($resourceToRemove.type) {
-        'Microsoft.RecoveryServices/vaults' {
-            # Remove protected VMs
-            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
-                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
-                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
-                }
-            }
-
-            $backupItems = Get-AzRecoveryServicesBackupItem -BackupManagementType 'AzureVM' -WorkloadType 'AzureVM' -VaultId $resourceToRemove.resourceId
-            foreach ($backupItem in $backupItems) {
-                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
-
-                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
-                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
-                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
-                    }
-                }
-
-                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
-                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
-                }
-            }
-        }
-    }
-}
-
-<#
-.SYNOPSIS
-Remove any artifacts that remain of the given resource
-
-.DESCRIPTION
-Remove any artifacts that remain of the given resource. For example, some resources such as key vaults usually go into a soft-delete state from which we want to purge them from.
-
-.PARAMETER resourceToRemove
-Mandatory. The resource to remove. Should have format
-@{
-    name        = '...'
-    resourceID = '...'
-    type        = '...'
-}
-
-.EXAMPLE
-Initialize-PostResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
-
-Purge resource 'myVault' of type 'Microsoft.KeyVault/vaults' if no purge protection is enabled
-#>
-function Initialize-PostResourceRemoval {
-
-    [CmdletBinding(SupportsShouldProcess)]
-    param (
-        [Parameter(Mandatory)]
-        [hashtable] $resourceToRemove
-    )
-
-    switch ($resourceToRemove.type) {
-        'Microsoft.KeyVault/vaults' {
-            $name = $resourceToRemove.resourceId.Split('/')[-1]
-            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
-
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $resourceGroupName -eq $resourceGroupName }
-            if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
-                Write-Verbose "Purging key vault [$name]" -Verbose
-                if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
-                    $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location
-                }
-            }
-        }
-    }
-}
 #endregion
 
 <#

From 69e89b34bf45a562dd0b0eda2416a4831ce7512d Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 17:10:34 +0100
Subject: [PATCH 13/78] Structured files & folders

---
 .../resourceRemoval/Remove-DeployedModule.ps1 |  22 +-
 .../helper/Get-DeploymentByName.ps1           | 119 ++++++
 .../Get-ResourceIdsAsFormattedObjectList.ps1  | 107 +++++
 .../helper/Remove-GeneralModule.ps1           | 385 ------------------
 .../orchestrators/Remove-GeneralModule.ps1    | 155 +++++++
 .../Remove-VirtualMachine.ps1                 |   4 +-
 .../{helper => orchestrators}/Remove-vWan.ps1 |   7 +-
 7 files changed, 400 insertions(+), 399 deletions(-)
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
 delete mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
 create mode 100644 utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
 rename utilities/pipelines/resourceRemoval/{helper => orchestrators}/Remove-VirtualMachine.ps1 (95%)
 rename utilities/pipelines/resourceRemoval/{helper => orchestrators}/Remove-vWan.ps1 (88%)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 970029ce1d..8fb1cb5b88 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -51,18 +51,18 @@ function Remove-DeployedModule {
                 }
                 Remove-vWan @inputObject -Verbose
             }
-            'virtualMachines' {
-                Write-Verbose 'Run virtual machine removal script' -Verbose
-                # Load function
-                . (Join-Path $PSScriptRoot 'helper' 'Remove-VirtualMachine.ps1')
+            # 'virtualMachines' {
+            #     Write-Verbose 'Run virtual machine removal script' -Verbose
+            #     # Load function
+            #     . (Join-Path $PSScriptRoot 'helper' 'Remove-VirtualMachine.ps1')
 
-                # Invoke removal
-                $inputObject = @{
-                    deploymentName    = $deploymentName
-                    ResourceGroupName = $ResourceGroupName
-                }
-                Remove-VirtualMachine @inputObject -Verbose
-            }
+            #     # Invoke removal
+            #     $inputObject = @{
+            #         deploymentName    = $deploymentName
+            #         ResourceGroupName = $ResourceGroupName
+            #     }
+            #     Remove-VirtualMachine @inputObject -Verbose
+            # }
             default {
                 Write-Verbose 'Run default removal script' -Verbose
                 # Load function
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
new file mode 100644
index 0000000000..4a6415a0cd
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
@@ -0,0 +1,119 @@
+<#
+.SYNOPSIS
+Get all deployments that match a given deployment name in a given scope
+
+.DESCRIPTION
+Get all deployments that match a given deployment name in a given scope. Works recursively through the deployment tree.
+
+.PARAMETER Name
+Mandatory. The deployment name to search for
+
+.PARAMETER ResourceGroupName
+Optional. The name of the resource group for scope 'resourceGroup'
+
+.PARAMETER Scope
+Mandatory. The scope to search in
+
+.EXAMPLE
+Get-DeploymentByName -Name 'keyvault-12356' -Scope 'resourceGroup'
+
+Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
+
+.NOTES
+Works after the principal:
+- Find all deployments for the given deployment name
+- If any of them are not a deployments, add their target resource to the result set (as they are e.g. a resource)
+- If any of them is are deployments, recursively invoke this function for them to get their contained target resources
+#>
+function Get-DeploymentByName {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $Name,
+
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName,
+
+        [Parameter(Mandatory)]
+        [ValidateSet(
+            'resourceGroup',
+            'subscription',
+            'managementGroup',
+            'tenant'
+        )]
+        [string] $Scope
+    )
+
+    $resultSet = [System.Collections.ArrayList]@()
+    switch ($Scope) {
+        'resourceGroup' {
+            if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
+                [array]$deploymentTargets = (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
+                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                    [array]$resultSet += $deployment
+                }
+                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
+                    $name = Split-Path $deployment -Leaf
+                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
+                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                }
+            } else {
+                # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
+                # In case we already have any such resources in the list, we should remove them
+                [array]$resultSet = $resultSet | Where-Object { $_ -notmatch "/resourceGroups/$resourceGroupName/" }
+            }
+        }
+        'subscription' {
+            [array]$deploymentTargets = (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/resourceGroups/') {
+                    # Resource Group Level Child Deployments
+                    $name = Split-Path $deployment -Leaf
+                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
+                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                } else {
+                    # Subscription Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                }
+            }
+        }
+        'managementGroup' {
+            [array]$deploymentTargets = (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/managementGroup/') {
+                    # Subscription Level Child Deployments
+                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                } else {
+                    # Management Group Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                }
+            }
+        }
+        'tenant' {
+            [array]$deploymentTargets = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                [array]$resultSet += $deployment
+            }
+            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
+                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
+                if ($deployment -match '/tenant/') {
+                    # Management Group Level Child Deployments
+                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                } else {
+                    # Tenant Level Deployments
+                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf)
+                }
+            }
+        }
+    }
+    return $resultSet
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
new file mode 100644
index 0000000000..d39a464dcb
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
@@ -0,0 +1,107 @@
+<#
+.SYNOPSIS
+Format the provide resource IDs into objects of resourceID, name & type
+
+.DESCRIPTION
+Format the provide resource IDs into objects of resourceID, name & type
+
+.PARAMETER resourceIds
+Optional. The resource IDs to process
+
+.EXAMPLE
+Get-ResourceIdsAsFormattedObjects -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
+
+Returns an object @{
+    resourceId = '/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01'
+    type       = 'Microsoft.Storage/storageAccounts'
+    name       = 'adpsxxazsaaspar01'
+}
+#>
+function Get-ResourceIdsAsFormattedObjects {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string[]] $resourceIds = @()
+    )
+
+    $formattedResources = [System.Collections.ArrayList]@()
+
+    # Optional resourceGroup-level resources to identify implicitly deployed child-resources
+    $allResourceGroupResources = @()
+
+    foreach ($resourceId in $resourceIds) {
+
+        $idElements = $resourceId.Split('/')
+
+        switch ($idElements.Count) {
+            { $PSItem -eq 5 } {
+                # subscription level resource group
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = 'Microsoft.Resources/resourceGroups'
+                }
+                break
+            }
+            { $PSItem -eq 6 } {
+                # subscription-level resource group
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = $idElements[4, 5] -join '/'
+                }
+                break
+            }
+            { $PSItem -eq 7 } {
+                if (($resourceId.Split('/'))[3] -ne 'resourceGroups') {
+                    # subscription-level resource
+                    $formattedResources += @{
+                        resourceId = $resourceId
+                        name       = Split-Path $resourceId -Leaf
+                        type       = $idElements[4, 5] -join '/'
+                    }
+                } else {
+                    # resource group-level
+                    if ($allResourceGroupResources.Count -eq 0) {
+                        $allResourceGroupResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
+                    }
+                    $expandedResources = $allResourceGroupResources | Where-Object { $_.ResourceId.startswith($resourceId) }
+                    $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
+                    foreach ($resource in $expandedResources) {
+                        $formattedResources += @{
+                            resourceId = $resource.ResourceId
+                            name       = $resource.Name
+                            type       = $resource.Type
+                        }
+                    }
+                }
+                break
+            }
+            { $PSItem -ge 8 } {
+                # child-resource level
+                $indexOfResourceType = $idElements.IndexOf(($idElements -like 'Microsoft.**')[0])
+                $type = $idElements[$indexOfResourceType, ($indexOfResourceType + 1)] -join '/'
+
+                # Concat rest of resource type along the ID
+                $partCounter = $indexOfResourceType + 1
+                while (-not ($partCounter + 2 -gt $idElements.Count - 1)) {
+                    $type += ('/{0}' -f $idElements[($partCounter + 2)])
+                    $partCounter = $partCounter + 2
+                }
+
+                $formattedResources += @{
+                    resourceId = $resourceId
+                    name       = $idElements[-1]
+                    type       = $type
+                }
+                break
+            }
+            Default {
+                throw "Failed to process resource ID [$resourceId]"
+            }
+        }
+    }
+
+    return $formattedResources
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
deleted file mode 100644
index 09507c6651..0000000000
--- a/utilities/pipelines/resourceRemoval/helper/Remove-GeneralModule.ps1
+++ /dev/null
@@ -1,385 +0,0 @@
-#region helper
-
-<#
-.SYNOPSIS
-Get all deployments that match a given deployment name in a given scope
-
-.DESCRIPTION
-Get all deployments that match a given deployment name in a given scope. Works recursively through the deployment tree.
-
-.PARAMETER Name
-Mandatory. The deployment name to search for
-
-.PARAMETER ResourceGroupName
-Optional. The name of the resource group for scope 'resourceGroup'
-
-.PARAMETER Scope
-Mandatory. The scope to search in
-
-.EXAMPLE
-Get-DeploymentByName -Name 'keyvault-12356' -Scope 'resourceGroup'
-
-Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
-
-.NOTES
-Works after the principal:
-- Find all deployments for the given deployment name
-- If any of them are not a deployments, add their target resource to the result set (as they are e.g. a resource)
-- If any of them is are deployments, recursively invoke this function for them to get their contained target resources
-#>
-function Get-DeploymentByName {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $Name,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName,
-
-        [Parameter(Mandatory)]
-        [ValidateSet(
-            'resourceGroup',
-            'subscription',
-            'managementGroup',
-            'tenant'
-        )]
-        [string] $Scope
-    )
-
-    $resultSet = [System.Collections.ArrayList]@()
-    switch ($Scope) {
-        'resourceGroup' {
-            if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
-                [array]$deploymentTargets = (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
-                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
-                    [array]$resultSet += $deployment
-                }
-                foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
-                    $name = Split-Path $deployment -Leaf
-                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
-                }
-            } else {
-                # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
-                # In case we already have any such resources in the list, we should remove them
-                [array]$resultSet = $resultSet | Where-Object { $_ -notmatch "/resourceGroups/$resourceGroupName/" }
-            }
-        }
-        'subscription' {
-            [array]$deploymentTargets = (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
-                [array]$resultSet += $deployment
-            }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
-                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
-                if ($deployment -match '/resourceGroups/') {
-                    # Resource Group Level Child Deployments
-                    $name = Split-Path $deployment -Leaf
-                    $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
-                } else {
-                    # Subscription Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -Scope 'subscription'
-                }
-            }
-        }
-        'managementGroup' {
-            [array]$deploymentTargets = (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
-                [array]$resultSet += $deployment
-            }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
-                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
-                if ($deployment -match '/managementGroup/') {
-                    # Subscription Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
-                } else {
-                    # Management Group Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
-                }
-            }
-        }
-        'tenant' {
-            [array]$deploymentTargets = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
-                [array]$resultSet += $deployment
-            }
-            foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
-                [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
-                if ($deployment -match '/tenant/') {
-                    # Management Group Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
-                } else {
-                    # Tenant Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf)
-                }
-            }
-        }
-    }
-    return $resultSet
-}
-
-
-<#
-.SYNOPSIS
-Format the provide resource IDs into objects of resourceID, name & type
-
-.DESCRIPTION
-Format the provide resource IDs into objects of resourceID, name & type
-
-.PARAMETER resourceIds
-Optional. The resource IDs to process
-
-.EXAMPLE
-Get-FormattedResources -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
-
-Returns an object @{
-    resourceId = '/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01'
-    type       = 'Microsoft.Storage/storageAccounts'
-    name       = 'adpsxxazsaaspar01'
-}
-#>
-function Get-FormattedResources {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory = $false)]
-        [string[]] $resourceIds = @()
-    )
-
-    $formattedResources = [System.Collections.ArrayList]@()
-
-    # Optional resourceGroup-level resources to identify implicitly deployed child-resources
-    $allResourceGroupResources = @()
-
-    foreach ($resourceId in $resourceIds) {
-
-        $idElements = $resourceId.Split('/')
-
-        switch ($idElements.Count) {
-            { $PSItem -eq 5 } {
-                # subscription level resource group
-                $formattedResources += @{
-                    resourceId = $resourceId
-                    name       = $idElements[-1]
-                    type       = 'Microsoft.Resources/resourceGroups'
-                }
-                break
-            }
-            { $PSItem -eq 6 } {
-                # subscription-level resource group
-                $formattedResources += @{
-                    resourceId = $resourceId
-                    name       = $idElements[-1]
-                    type       = $idElements[4, 5] -join '/'
-                }
-                break
-            }
-            { $PSItem -eq 7 } {
-                if (($resourceId.Split('/'))[3] -ne 'resourceGroups') {
-                    # subscription-level resource
-                    $formattedResources += @{
-                        resourceId = $resourceId
-                        name       = Split-Path $resourceId -Leaf
-                        type       = $idElements[4, 5] -join '/'
-                    }
-                } else {
-                    # resource group-level
-                    if ($allResourceGroupResources.Count -eq 0) {
-                        $allResourceGroupResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name '*'
-                    }
-                    $expandedResources = $allResourceGroupResources | Where-Object { $_.ResourceId.startswith($resourceId) }
-                    $expandedResources = $expandedResources | Sort-Object -Descending -Property { $_.ResourceId.Split('/').Count }
-                    foreach ($resource in $expandedResources) {
-                        $formattedResources += @{
-                            resourceId = $resource.ResourceId
-                            name       = $resource.Name
-                            type       = $resource.Type
-                        }
-                    }
-                }
-                break
-            }
-            { $PSItem -ge 8 } {
-                # child-resource level
-                $indexOfResourceType = $idElements.IndexOf(($idElements -like 'Microsoft.**')[0])
-                $type = $idElements[$indexOfResourceType, ($indexOfResourceType + 1)] -join '/'
-
-                # Concat rest of resource type along the ID
-                $partCounter = $indexOfResourceType + 1
-                while (-not ($partCounter + 2 -gt $idElements.Count - 1)) {
-                    $type += ('/{0}' -f $idElements[($partCounter + 2)])
-                    $partCounter = $partCounter + 2
-                }
-
-                $formattedResources += @{
-                    resourceId = $resourceId
-                    name       = $idElements[-1]
-                    type       = $type
-                }
-                break
-            }
-            Default {
-                throw "Failed to process resource ID [$resourceId]"
-            }
-        }
-    }
-
-    return $formattedResources
-}
-#endregion
-
-<#
-.SYNOPSIS
-Invoke the removal of a deployed module
-
-.DESCRIPTION
-Invoke the removal of a deployed module.
-Requires the resource in question to be tagged with 'removeModule = <moduleName>'
-
-.PARAMETER ModuleName
-Mandatory. The name of the module to remove
-
-.PARAMETER ResourceGroupName
-Mandatory. The resource group of the resource to remove
-
-.PARAMETER SearchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER SearchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.PARAMETER DeploymentName
-Optional. The deployment name to use for the removal
-
-.PARAMETER TemplateFilePath
-Optional. The path to the deployment file
-
-.EXAMPLE
-Remove-GeneralModule -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg'
-
-Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-GeneralModule {
-
-    [CmdletBinding(SupportsShouldProcess)]
-    param (
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName,
-
-        [Parameter(Mandatory = $true)]
-        [string] $DeploymentName,
-
-        [Parameter(Mandatory = $true)]
-        [string] $TemplateFilePath,
-
-        [Parameter(Mandatory = $false)]
-        [int] $SearchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $SearchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
-    }
-
-    process {
-        Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
-
-        # Gather deployments
-        # ==================
-        if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
-            # Bicep
-            $bicepContent = Get-Content $templateFilePath
-            $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
-            if (-not $bicepScope) {
-                $deploymentScope = 'resourceGroup'
-            } else {
-                $deploymentScope = $bicepScope.ToLower().Split('=')[-1].Replace("'", '').Trim()
-            }
-        } else {
-            # ARM
-            $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
-            switch -regex ($armSchema) {
-                '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
-                '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
-                '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
-                '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
-                Default { throw "[$armSchema] is a non-supported ARM template schema" }
-            }
-        }
-        Write-Verbose "Determined deployment scope [$deploymentScope]" -Verbose
-
-        # Fundamental checks
-        if ($deploymentScope -eq 'resourceGroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
-            Write-Verbose "Resource group [$ResourceGroupName] does not exist (anymore). Skipping removal of its contained resources" -Verbose
-            return
-        }
-
-        # Fetch deployments
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-DeploymentByName -name $deploymentName -scope $deploymentScope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find deployments by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
-        }
-
-        # Pre-Filter & order items
-        # ========================
-        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-
-        if ($rawResourceIdsToRemove.Count -eq 0) {
-            Write-Verbose 'Found no relevant resources to remove' -Verbose
-            return
-        }
-
-        # Format items
-        # ============
-        $resourcesToRemove = Get-FormattedResources -resourceIds $rawResourceIdsToRemove
-
-        # Filter all dependency resources
-        # ===============================
-        $dependencyResourceNames = Get-DependencyResourceNames
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Order resources
-        # ===============
-        # If virtual machines are contained, remove them first
-        if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
-            $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
-        }
-
-        # If resource groups are contained, remove them second
-        if ($rgsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Resources/resourceGroups' }) {
-            $resourcesToRemove = @() + $rgsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Resources/resourceGroups' })
-        }
-
-        # Remove resources
-        # ================
-        if ($resourcesToRemove.Count -gt 0) {
-            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
-                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-            }
-        } else {
-            Write-Verbose 'Found [0] resources to remove'
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
new file mode 100644
index 0000000000..4c5c8ef04f
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -0,0 +1,155 @@
+<#
+.SYNOPSIS
+Invoke the removal of a deployed module
+
+.DESCRIPTION
+Invoke the removal of a deployed module.
+Requires the resource in question to be tagged with 'removeModule = <moduleName>'
+
+.PARAMETER ModuleName
+Mandatory. The name of the module to remove
+
+.PARAMETER ResourceGroupName
+Mandatory. The resource group of the resource to remove
+
+.PARAMETER SearchRetryLimit
+Optional. The maximum times to retry the search for resources via their removal tag
+
+.PARAMETER SearchRetryInterval
+Optional. The time to wait in between the search for resources via their remove tags
+
+.PARAMETER DeploymentName
+Optional. The deployment name to use for the removal
+
+.PARAMETER TemplateFilePath
+Optional. The path to the deployment file
+
+.EXAMPLE
+Remove-GeneralModule -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg'
+
+Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
+#>
+function Remove-GeneralModule {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName,
+
+        [Parameter(Mandatory = $true)]
+        [string] $DeploymentName,
+
+        [Parameter(Mandatory = $true)]
+        [string] $TemplateFilePath,
+
+        [Parameter(Mandatory = $false)]
+        [int] $SearchRetryLimit = 40,
+
+        [Parameter(Mandatory = $false)]
+        [int] $SearchRetryInterval = 60
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
+    }
+
+    process {
+        Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
+
+        # Gather deployments
+        # ==================
+        if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
+            # Bicep
+            $bicepContent = Get-Content $templateFilePath
+            $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
+            if (-not $bicepScope) {
+                $deploymentScope = 'resourceGroup'
+            } else {
+                $deploymentScope = $bicepScope.ToLower().Split('=')[-1].Replace("'", '').Trim()
+            }
+        } else {
+            # ARM
+            $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
+            switch -regex ($armSchema) {
+                '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
+                '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
+                '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
+                '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
+                Default { throw "[$armSchema] is a non-supported ARM template schema" }
+            }
+        }
+        Write-Verbose "Determined deployment scope [$deploymentScope]" -Verbose
+
+        # Fundamental checks
+        if ($deploymentScope -eq 'resourceGroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
+            Write-Verbose "Resource group [$ResourceGroupName] does not exist (anymore). Skipping removal of its contained resources" -Verbose
+            return
+        }
+
+        # Fetch deployments
+        $searchRetryCount = 1
+        do {
+            $deployments = Get-DeploymentByName -name $deploymentName -scope $deploymentScope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+            if ($deployments) {
+                break
+            }
+            Write-Verbose ('Did not to find deployments by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+            Start-Sleep $searchRetryInterval
+            $searchRetryCount++
+        } while ($searchRetryCount -le $searchRetryLimit)
+
+        if (-not $deployments) {
+            throw "No deployment found for [$deploymentName]"
+        }
+
+        # Pre-Filter & order items
+        # ========================
+        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
+
+        if ($rawResourceIdsToRemove.Count -eq 0) {
+            Write-Verbose 'Found no relevant resources to remove' -Verbose
+            return
+        }
+
+        # Format items
+        # ============
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $rawResourceIdsToRemove
+
+        # Filter all dependency resources
+        # ===============================
+        $dependencyResourceNames = Get-DependencyResourceNames
+        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
+
+        # Order resources
+        # ===============
+        # If virtual machines are contained, remove them first
+        if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
+            $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
+        }
+
+        # If resource groups are contained, remove them second
+        if ($rgsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Resources/resourceGroups' }) {
+            $resourcesToRemove = @() + $rgsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Resources/resourceGroups' })
+        }
+
+        # Remove resources
+        # ================
+        if ($resourcesToRemove.Count -gt 0) {
+            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
+                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+            }
+        } else {
+            Write-Verbose 'Found [0] resources to remove'
+        }
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
similarity index 95%
rename from utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
rename to utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
index 054f875671..7e9fdc8639 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-VirtualMachine.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
@@ -40,8 +40,8 @@ function Remove-VirtualMachine {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-        . (Join-Path $PSScriptRoot 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
     }
 
     process {
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
similarity index 88%
rename from utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
rename to utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index d5090d3c2e..a0f267f0f9 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -40,7 +40,8 @@ function Remove-vWan {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
     }
 
     process {
@@ -79,6 +80,10 @@ function Remove-vWan {
             }
         }
 
+        # Filter all dependency resources
+        $dependencyResourceNames = Get-DependencyResourceNames
+        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
+
         # Remove resources
         # ----------------
         if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {

From d988863dff9f1ad99772ff8a91670a0303782d1f Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 17:13:18 +0100
Subject: [PATCH 14/78] Update to latest

---
 .../{helper => orchestrators}/Remove-AutomationAccount.ps1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 rename utilities/pipelines/resourceRemoval/{helper => orchestrators}/Remove-AutomationAccount.ps1 (93%)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
similarity index 93%
rename from utilities/pipelines/resourceRemoval/helper/Remove-AutomationAccount.ps1
rename to utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 8867a18695..c7d4b306e5 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -40,7 +40,8 @@ function Remove-AutomationAccount {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
     }
 
     process {
@@ -111,6 +112,10 @@ function Remove-AutomationAccount {
             }
         }
 
+        # Filter all dependency resources
+        $dependencyResourceNames = Get-DependencyResourceNames
+        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
+
         # Remove resources
         # ----------------
         if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {

From 2446675cc5c8c4d06c3c6ffb7a8a5f4dc4a45a1b Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 17:46:09 +0100
Subject: [PATCH 15/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1 | 10 ++-
 .../helper/Get-DeploymentByName.ps1           | 73 ++++++++++++++++++-
 .../Remove-AutomationAccount.ps1              | 36 ++++-----
 .../orchestrators/Remove-GeneralModule.ps1    | 52 ++++---------
 .../orchestrators/Remove-vWan.ps1             | 36 ++++-----
 .../sharedScripts/Get-ScopeOfTemplateFile.ps1 | 53 ++++++++++++++
 6 files changed, 180 insertions(+), 80 deletions(-)
 create mode 100644 utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 152b019c8d..340d61335d 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -42,11 +42,12 @@ function Remove-DeployedModule {
             'virtualWans' {
                 Write-Verbose 'Run vWAN removal script' -Verbose
                 # Load function
-                . (Join-Path $PSScriptRoot 'helper' 'Remove-vWan.ps1')
+                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-vWan.ps1')
 
                 # Invoke removal
                 $inputObject = @{
                     deploymentName    = $deploymentName
+                    templateFilePath  = $templateFilePath
                     ResourceGroupName = $ResourceGroupName
                 }
                 Remove-vWan @inputObject -Verbose
@@ -54,7 +55,7 @@ function Remove-DeployedModule {
             # 'virtualMachines' {
             #     Write-Verbose 'Run virtual machine removal script' -Verbose
             #     # Load function
-            #     . (Join-Path $PSScriptRoot 'helper' 'Remove-VirtualMachine.ps1')
+            #     . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-VirtualMachine.ps1')
 
             #     # Invoke removal
             #     $inputObject = @{
@@ -66,11 +67,12 @@ function Remove-DeployedModule {
             'automationAccounts' {
                 Write-Verbose 'Run automation account removal script' -Verbose
                 # Load function
-                . (Join-Path $PSScriptRoot 'helper' 'Remove-AutomationAccount.ps1')
+                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-AutomationAccount.ps1')
 
                 # Invoke removal
                 $inputObject = @{
                     deploymentName    = $deploymentName
+                    templateFilePath  = $templateFilePath
                     ResourceGroupName = $ResourceGroupName
                 }
                 Remove-AutomationAccount @inputObject -Verbose
@@ -78,7 +80,7 @@ function Remove-DeployedModule {
             default {
                 Write-Verbose 'Run default removal script' -Verbose
                 # Load function
-                . (Join-Path $PSScriptRoot 'helper' 'Remove-GeneralModule.ps1')
+                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-GeneralModule.ps1')
 
                 # Invoke removal
                 $inputObject = @{
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
index 4a6415a0cd..d38c0f6b29 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
@@ -1,4 +1,5 @@
-<#
+#region helper
+<#
 .SYNOPSIS
 Get all deployments that match a given deployment name in a given scope
 
@@ -15,7 +16,7 @@ Optional. The name of the resource group for scope 'resourceGroup'
 Mandatory. The scope to search in
 
 .EXAMPLE
-Get-DeploymentByName -Name 'keyvault-12356' -Scope 'resourceGroup'
+Get-DeploymentByNameInner -Name 'keyvault-12356' -Scope 'resourceGroup'
 
 Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
 
@@ -25,7 +26,7 @@ Works after the principal:
 - If any of them are not a deployments, add their target resource to the result set (as they are e.g. a resource)
 - If any of them is are deployments, recursively invoke this function for them to get their contained target resources
 #>
-function Get-DeploymentByName {
+function Get-DeploymentByNameInner {
 
     [CmdletBinding()]
     param (
@@ -117,3 +118,69 @@ function Get-DeploymentByName {
     }
     return $resultSet
 }
+#endregion
+
+<#
+.SYNOPSIS
+Get all deployments that match a given deployment name in a given scope using a retry mechanic
+
+.DESCRIPTION
+Get all deployments that match a given deployment name in a given scope using a retry mechanic.
+
+.PARAMETER ResourceGroupName
+Mandatory. The resource group of the resource to remove
+
+.PARAMETER Name
+Optional. The deployment name to use for the removal
+
+.PARAMETER scope
+Mandatory. The scope to search in
+
+.PARAMETER SearchRetryLimit
+Optional. The maximum times to retry the search for resources via their removal tag
+
+.PARAMETER SearchRetryInterval
+Optional. The time to wait in between the search for resources via their remove tags
+
+.EXAMPLE
+Get-DeploymentByName -name 'KeyVault' -ResourceGroupName 'validation-rg' -scope 'resourceGroup'
+
+Get all deployments that match name 'KeyVault' in scope 'resourceGroup' of resource group 'validation-rg'
+#>
+function Get-DeploymentByName {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $ResourceGroupName,
+
+        [Parameter(Mandatory = $true)]
+        [string] $name,
+
+        [Parameter(Mandatory = $true)]
+        [string] $scope,
+
+        [Parameter(Mandatory = $false)]
+        [int] $SearchRetryLimit = 40,
+
+        [Parameter(Mandatory = $false)]
+        [int] $SearchRetryInterval = 60
+    )
+
+    $searchRetryCount = 1
+    do {
+        [array]$deployments = Get-DeploymentByName -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+        if ($deployments) {
+            break
+        }
+        Write-Verbose ('Did not to find deployments by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $name, $scope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+        Start-Sleep $searchRetryInterval
+        $searchRetryCount++
+    } while ($searchRetryCount -le $searchRetryLimit)
+
+    if (-not $deployments) {
+        throw "No deployment found for [$name]"
+    }
+
+    return $deployments
+}
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index c7d4b306e5..9d568d4092 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -29,6 +29,9 @@ function Remove-AutomationAccount {
         [Parameter(Mandatory = $false)]
         [string] $ResourceGroupName = 'validation-rg',
 
+        [Parameter(Mandatory = $true)]
+        [string] $TemplateFilePath,
+
         [Parameter(Mandatory = $false)]
         [int] $searchRetryLimit = 40,
 
@@ -40,29 +43,28 @@ function Remove-AutomationAccount {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
     process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('[Failure] not to find Automation Account deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
+        # Prepare data
+        # ============
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
+
+        # Fetch deployments
+        # =================
+        $deploymentsInputObject = @{
+            name              = $deploymentName
+            scope             = $deploymentScope
+            resourceGroupName = $resourceGroupName
         }
+        $deployments = Get-DeploymentByName @deploymentsInputObject
 
+        # Pre-Filter & order items
+        # ========================
         $resourcesToRemove = @()
         $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
         $childDeploymentsIds = $deployments.TargetResource | Where-Object { $_ -and $_ -match '/deployments/' }
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 4c5c8ef04f..fb2f5b6c34 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -25,7 +25,7 @@ Optional. The deployment name to use for the removal
 Optional. The path to the deployment file
 
 .EXAMPLE
-Remove-GeneralModule -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg'
+Remove-GeneralModule -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg' -TemplateFilePath 'C:/deploy.json'
 
 Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
 #>
@@ -53,38 +53,19 @@ function Remove-GeneralModule {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
     process {
         Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
 
-        # Gather deployments
-        # ==================
-        if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
-            # Bicep
-            $bicepContent = Get-Content $templateFilePath
-            $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
-            if (-not $bicepScope) {
-                $deploymentScope = 'resourceGroup'
-            } else {
-                $deploymentScope = $bicepScope.ToLower().Split('=')[-1].Replace("'", '').Trim()
-            }
-        } else {
-            # ARM
-            $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
-            switch -regex ($armSchema) {
-                '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
-                '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
-                '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
-                '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
-                Default { throw "[$armSchema] is a non-supported ARM template schema" }
-            }
-        }
-        Write-Verbose "Determined deployment scope [$deploymentScope]" -Verbose
+        # Prepare data
+        # ============
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
 
         # Fundamental checks
         if ($deploymentScope -eq 'resourceGroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
@@ -93,20 +74,13 @@ function Remove-GeneralModule {
         }
 
         # Fetch deployments
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-DeploymentByName -name $deploymentName -scope $deploymentScope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find deployments by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
+        # =================
+        $deploymentsInputObject = @{
+            name              = $deploymentName
+            scope             = $deploymentScope
+            resourceGroupName = $resourceGroupName
         }
+        $deployments = Get-DeploymentByName @deploymentsInputObject
 
         # Pre-Filter & order items
         # ========================
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index a0f267f0f9..b88825e17a 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -29,6 +29,9 @@ function Remove-vWan {
         [Parameter(Mandatory = $false)]
         [string] $ResourceGroupName = 'validation-rg',
 
+        [Parameter(Mandatory = $true)]
+        [string] $TemplateFilePath,
+
         [Parameter(Mandatory = $false)]
         [int] $searchRetryLimit = 40,
 
@@ -40,29 +43,28 @@ function Remove-vWan {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
     process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find vWAN deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
+        # Prepare data
+        # ============
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
+
+        # Fetch deployments
+        # =================
+        $deploymentsInputObject = @{
+            name              = $deploymentName
+            scope             = $deploymentScope
+            resourceGroupName = $resourceGroupName
         }
+        $deployments = Get-DeploymentByName @deploymentsInputObject
 
+        # Pre-Filter & order items
+        # ========================
         $resourcesToRemove = @()
         $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
 
diff --git a/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1 b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
new file mode 100644
index 0000000000..36b7fb9f3e
--- /dev/null
+++ b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
@@ -0,0 +1,53 @@
+<#
+.SYNOPSIS
+Get the scope of the given template file
+
+.DESCRIPTION
+Get the scope of the given template file (supports ARM & Bicep)
+Will return either
+- resourceGroup
+- subscription
+- managementGroup
+- tenant
+
+.PARAMETER TemplateFilePath
+Mandatory. The path of the template file
+
+.EXAMPLE
+Get-ScopeOfTemplateFile -TemplateFilePath 'C:/deploy.json'
+
+Get the scope of the given deploy.json template.
+#>
+function Get-ScopeOfTemplateFile {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [Alias('Path')]
+        [string] $TemplateFilePath
+    )
+
+    if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
+        # Bicep
+        $bicepContent = Get-Content $templateFilePath
+        $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
+        if (-not $bicepScope) {
+            $deploymentScope = 'resourceGroup'
+        } else {
+            $deploymentScope = $bicepScope.ToLower().Split('=')[-1].Replace("'", '').Trim()
+        }
+    } else {
+        # ARM
+        $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
+        switch -regex ($armSchema) {
+            '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
+            '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
+            '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
+            '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
+            Default { throw "[$armSchema] is a non-supported ARM template schema" }
+        }
+    }
+    Write-Verbose "Determined deployment scope [$deploymentScope]" -Verbose
+
+    return $deploymentScope
+}

From 11308a58db429aaa069cc245734ad68c8b275536 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 17:51:38 +0100
Subject: [PATCH 16/78] Update to latest

---
 .../Remove-AutomationAccount.ps1              | 10 +++------
 .../orchestrators/Remove-vWan.ps1             | 22 +++++++------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 9d568d4092..89ccbcc2df 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -106,13 +106,9 @@ function Remove-AutomationAccount {
             $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
         )
 
-        $resourcesToRemove = $orderedResourceIds | ForEach-Object {
-            @{
-                resourceId = $_
-                name       = $_.Split('/')[-1]
-                type       = $_.Split('/')[6..7] -join '/'
-            }
-        }
+        # Format items
+        # ============
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $orderedResourceIds
 
         # Filter all dependency resources
         $dependencyResourceNames = Get-DependencyResourceNames
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index b88825e17a..48ea5f8fe8 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -65,22 +65,16 @@ function Remove-vWan {
 
         # Pre-Filter & order items
         # ========================
-        $resourcesToRemove = @()
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-
         $orderedResourceIds = @(
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
         )
-        $resourcesToRemove = $orderedResourceIds | ForEach-Object {
-            @{
-                resourceId = $_
-                name       = $_.Split('/')[-1]
-                type       = $_.Split('/')[6..7] -join '/'
-            }
-        }
+
+        # Format items
+        # ============
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $orderedResourceIds
 
         # Filter all dependency resources
         $dependencyResourceNames = Get-DependencyResourceNames

From d696a79f6e5d28315f2a2d76ed68d30ffa1a2e90 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 18:03:43 +0100
Subject: [PATCH 17/78] Update to latest

---
 .../resourceRemoval/orchestrators/Remove-AutomationAccount.ps1  | 2 +-
 .../resourceRemoval/orchestrators/Remove-GeneralModule.ps1      | 2 +-
 .../pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 89ccbcc2df..3b5ce5fad2 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -43,7 +43,7 @@ function Remove-AutomationAccount {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
+        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index fb2f5b6c34..69c4b61c48 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -53,7 +53,7 @@ function Remove-GeneralModule {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
+        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index 48ea5f8fe8..7d1f4c68dd 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -43,7 +43,7 @@ function Remove-vWan {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ScopeOfTemplateFile.ps1')
+        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')

From dc965ff319e210b1cd6cd12f385fb1895b33a50b Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 18:17:18 +0100
Subject: [PATCH 18/78] Update to latest

---
 .../helper/Get-DeploymentByName.ps1           | 16 ++--
 .../Remove-AutomationAccount.ps1              | 76 +++++++++----------
 .../orchestrators/Remove-GeneralModule.ps1    |  3 +-
 .../orchestrators/Remove-vWan.ps1             |  3 +-
 4 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
index d38c0f6b29..2d7ae44908 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
@@ -57,7 +57,7 @@ function Get-DeploymentByNameInner {
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-DeploymentByNameInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
                 }
             } else {
                 # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
@@ -76,10 +76,10 @@ function Get-DeploymentByNameInner {
                     # Resource Group Level Child Deployments
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByName -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-DeploymentByNameInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
                 } else {
                     # Subscription Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf) -Scope 'subscription'
                 }
             }
         }
@@ -92,10 +92,10 @@ function Get-DeploymentByNameInner {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/managementGroup/') {
                     # Subscription Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                    [array]$resultSet += Get-DeploymentByNameInner -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
                 } else {
                     # Management Group Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
                 }
             }
         }
@@ -108,10 +108,10 @@ function Get-DeploymentByNameInner {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/tenant/') {
                     # Management Group Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByName -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-DeploymentByNameInner -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
                 } else {
                     # Tenant Level Deployments
-                    [array]$resultSet += Get-DeploymentByName -name (Split-Path $deployment -Leaf)
+                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf)
                 }
             }
         }
@@ -169,7 +169,7 @@ function Get-DeploymentByName {
 
     $searchRetryCount = 1
     do {
-        [array]$deployments = Get-DeploymentByName -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+        [array]$deployments = Get-DeploymentByNameInner -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
         if ($deployments) {
             break
         }
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 3b5ce5fad2..5824b2a2bd 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -46,6 +46,7 @@ function Remove-AutomationAccount {
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
@@ -61,49 +62,48 @@ function Remove-AutomationAccount {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject
+        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================
-        $resourcesToRemove = @()
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $childDeploymentsIds = $deployments.TargetResource | Where-Object { $_ -and $_ -match '/deployments/' }
-
-        foreach ($childDeploymentId in $childDeploymentsIds) {
-            $searchRetryCount = 1
-            $childDeploymentTokens = $childDeploymentId.Split('/')
-            $childDeploymentName = $childDeploymentTokens[8]
-            $childDeploymentResourceGroup = $childDeploymentTokens[4]
-            do {
-                Write-Verbose ('Searching child deployment named [{0}] in resource group [{1}]. Attempt [{2}/{3}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryCount, $searchRetryLimit) -Verbose
-                $childDeployment = Get-AzResourceGroupDeploymentOperation -DeploymentName $childDeploymentName -ResourceGroupName $childDeploymentResourceGroup -ErrorAction 'SilentlyContinue'
-                if ($childDeployment) {
-                    Write-Verbose ('[Success] Child deployment named [{0}] in resource group [{1}] found' -f $childDeploymentName, $childDeploymentResourceGroup) -Verbose
-                    $unorderedResourceIds += $childDeployment.TargetResource
-                    break
-                }
-                Write-Verbose ('[Failure] Did not to find child deployment named [{0}] in resource group [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-                Start-Sleep $searchRetryInterval
-                $searchRetryCount++
-            } while ($searchRetryCount -le $searchRetryLimit)
-        }
-
-        $unorderedResourceIds = $unorderedResourceIds | Where-Object { $_ `
-                -and ($_ -notmatch '/Microsoft.Insights/diagnosticSettings/') `
-                -and ($_ -notmatch '/variables/') `
-                -and ($_ -notmatch '/softwareUpdateConfigurations/') `
-                -and ($_ -notmatch '/jobSchedules/') `
-                -and ($_ -notmatch '/schedules/') `
-                -and ($_ -notmatch '/runbooks/') `
-                -and ($_ -notmatch '/modules/') `
-                -and ($_ -notmatch '/Microsoft.Authorization/roleAssignments/') `
-        } | Select-Object -Unique
+        # $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
+        # $childDeploymentsIds = $deployments.TargetResource | Where-Object { $_ -and $_ -match '/deployments/' }
+
+        # foreach ($childDeploymentId in $childDeploymentsIds) {
+        #     $searchRetryCount = 1
+        #     $childDeploymentTokens = $childDeploymentId.Split('/')
+        #     $childDeploymentName = $childDeploymentTokens[8]
+        #     $childDeploymentResourceGroup = $childDeploymentTokens[4]
+        #     do {
+        #         Write-Verbose ('Searching child deployment named [{0}] in resource group [{1}]. Attempt [{2}/{3}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryCount, $searchRetryLimit) -Verbose
+        #         $childDeployment = Get-AzResourceGroupDeploymentOperation -DeploymentName $childDeploymentName -ResourceGroupName $childDeploymentResourceGroup -ErrorAction 'SilentlyContinue'
+        #         if ($childDeployment) {
+        #             Write-Verbose ('[Success] Child deployment named [{0}] in resource group [{1}] found' -f $childDeploymentName, $childDeploymentResourceGroup) -Verbose
+        #             $unorderedResourceIds += $childDeployment.TargetResource
+        #             break
+        #         }
+        #         Write-Verbose ('[Failure] Did not to find child deployment named [{0}] in resource group [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
+        #         Start-Sleep $searchRetryInterval
+        #         $searchRetryCount++
+        #     } while ($searchRetryCount -le $searchRetryLimit)
+        # }
+
+        # $unorderedResourceIds = $deployments | Where-Object { $_ `
+        #         -and ($_ -notmatch '/Microsoft.Insights/diagnosticSettings/') `
+        #         -and ($_ -notmatch '/variables/') `
+        #         -and ($_ -notmatch '/softwareUpdateConfigurations/') `
+        #         -and ($_ -notmatch '/jobSchedules/') `
+        #         -and ($_ -notmatch '/schedules/') `
+        #         -and ($_ -notmatch '/runbooks/') `
+        #         -and ($_ -notmatch '/modules/') `
+        #         -and ($_ -notmatch '/Microsoft.Authorization/roleAssignments/') `
+        # } | Select-Object -Unique
 
         $orderedResourceIds = @(
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
-            $unorderedResourceIds | Where-Object { $_ -match 'linkedServices/automation' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
-            $unorderedResourceIds | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
+            $deployments | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
+            $deployments | Where-Object { $_ -match 'linkedServices/automation' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
+            $deployments | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
         )
 
         # Format items
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 69c4b61c48..741e8da4c0 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -56,6 +56,7 @@ function Remove-GeneralModule {
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
@@ -80,7 +81,7 @@ function Remove-GeneralModule {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject
+        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index 7d1f4c68dd..af794f79f0 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -45,6 +45,7 @@ function Remove-vWan {
         # Load helper
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
@@ -61,7 +62,7 @@ function Remove-vWan {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject
+        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================

From abd9d838e5e769ed611dc6b3268d4be1e080cfae Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 18:24:46 +0100
Subject: [PATCH 19/78] Update to latest

---
 ....ps1 => Get-DependencyResourceNameList.ps1} |  4 ++--
 .../Get-ResourceIdsAsFormattedObjectList.ps1   |  4 ++--
 .../orchestrators/Remove-AutomationAccount.ps1 | 18 +++++++++++-------
 .../orchestrators/Remove-GeneralModule.ps1     | 11 +++--------
 .../orchestrators/Remove-VirtualMachine.ps1    |  4 ++--
 .../orchestrators/Remove-vWan.ps1              | 16 +++++++++-------
 6 files changed, 29 insertions(+), 28 deletions(-)
 rename utilities/pipelines/resourceRemoval/helper/{Get-DependencyResourceNames.ps1 => Get-DependencyResourceNameList.ps1} (95%)

diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNames.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
similarity index 95%
rename from utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNames.ps1
rename to utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
index 7e69bcf093..9cb9210564 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNames.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
@@ -10,11 +10,11 @@ Note: It only considers resources that use the 'name' parameter
 Optional. The path the the dependency parameters parent folder. Defaults to 'utilities/pipelines/dependencies'
 
 .EXAMPLE
-Get-DependencyResourceNames
+Get-DependencyResourceNameList
 
 Get the list of all dependency names from the current set of parameter files
 #>
-function Get-DependencyResourceNames {
+function Get-DependencyResourceNameList {
 
     [CmdletBinding()]
     param (
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
index d39a464dcb..d4c4e5bb7d 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
@@ -9,7 +9,7 @@ Format the provide resource IDs into objects of resourceID, name & type
 Optional. The resource IDs to process
 
 .EXAMPLE
-Get-ResourceIdsAsFormattedObjects -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
+Get-ResourceIdsAsFormattedObjectList -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
 
 Returns an object @{
     resourceId = '/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01'
@@ -17,7 +17,7 @@ Returns an object @{
     name       = 'adpsxxazsaaspar01'
 }
 #>
-function Get-ResourceIdsAsFormattedObjects {
+function Get-ResourceIdsAsFormattedObjectList {
 
     [CmdletBinding()]
     param (
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 5824b2a2bd..381691e082 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -45,7 +45,7 @@ function Remove-AutomationAccount {
         # Load helper
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
@@ -64,6 +64,10 @@ function Remove-AutomationAccount {
         }
         $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
 
+        # Pre-Filter & order items
+        # ========================
+        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
+
         # Pre-Filter & order items
         # ========================
         # $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
@@ -100,18 +104,18 @@ function Remove-AutomationAccount {
         # } | Select-Object -Unique
 
         $orderedResourceIds = @(
-            $deployments | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
-            $deployments | Where-Object { $_ -match 'linkedServices/automation' }
-            $deployments | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
-            $deployments | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'linkedServices/automation' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
         )
 
         # Format items
         # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $orderedResourceIds
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $orderedResourceIds
 
         # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNames
+        $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
 
         # Remove resources
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 741e8da4c0..7f2d027f0a 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -57,7 +57,7 @@ function Remove-GeneralModule {
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
@@ -87,18 +87,13 @@ function Remove-GeneralModule {
         # ========================
         $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
 
-        if ($rawResourceIdsToRemove.Count -eq 0) {
-            Write-Verbose 'Found no relevant resources to remove' -Verbose
-            return
-        }
-
         # Format items
         # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $rawResourceIdsToRemove
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $rawResourceIdsToRemove
 
         # Filter all dependency resources
         # ===============================
-        $dependencyResourceNames = Get-DependencyResourceNames
+        $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
 
         # Order resources
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
index 7e9fdc8639..a40e264f8e 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
@@ -41,7 +41,7 @@ function Remove-VirtualMachine {
 
         # Load helper
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
     }
 
     process {
@@ -97,7 +97,7 @@ function Remove-VirtualMachine {
         }
 
         # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNames
+        $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
 
         # Remove resources
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index af794f79f0..2dacdd122a 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -46,7 +46,7 @@ function Remove-vWan {
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNames.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }
 
@@ -66,19 +66,21 @@ function Remove-vWan {
 
         # Pre-Filter & order items
         # ========================
+        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
+
         $orderedResourceIds = @(
-            $deployments | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
-            $deployments | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
-            $deployments | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
-            $deployments | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
         )
 
         # Format items
         # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectLists -resourceIds $orderedResourceIds
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $orderedResourceIds
 
         # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNames
+        $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
 
         # Remove resources

From 26df7b6582b979ff78a7988561649a81c640e5f3 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 18:31:18 +0100
Subject: [PATCH 20/78] Update to latest

---
 .../Remove-AutomationAccount.ps1              | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 381691e082..105b0075a8 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -68,41 +68,6 @@ function Remove-AutomationAccount {
         # ========================
         $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
 
-        # Pre-Filter & order items
-        # ========================
-        # $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        # $childDeploymentsIds = $deployments.TargetResource | Where-Object { $_ -and $_ -match '/deployments/' }
-
-        # foreach ($childDeploymentId in $childDeploymentsIds) {
-        #     $searchRetryCount = 1
-        #     $childDeploymentTokens = $childDeploymentId.Split('/')
-        #     $childDeploymentName = $childDeploymentTokens[8]
-        #     $childDeploymentResourceGroup = $childDeploymentTokens[4]
-        #     do {
-        #         Write-Verbose ('Searching child deployment named [{0}] in resource group [{1}]. Attempt [{2}/{3}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryCount, $searchRetryLimit) -Verbose
-        #         $childDeployment = Get-AzResourceGroupDeploymentOperation -DeploymentName $childDeploymentName -ResourceGroupName $childDeploymentResourceGroup -ErrorAction 'SilentlyContinue'
-        #         if ($childDeployment) {
-        #             Write-Verbose ('[Success] Child deployment named [{0}] in resource group [{1}] found' -f $childDeploymentName, $childDeploymentResourceGroup) -Verbose
-        #             $unorderedResourceIds += $childDeployment.TargetResource
-        #             break
-        #         }
-        #         Write-Verbose ('[Failure] Did not to find child deployment named [{0}] in resource group [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $childDeploymentName, $childDeploymentResourceGroup, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-        #         Start-Sleep $searchRetryInterval
-        #         $searchRetryCount++
-        #     } while ($searchRetryCount -le $searchRetryLimit)
-        # }
-
-        # $unorderedResourceIds = $deployments | Where-Object { $_ `
-        #         -and ($_ -notmatch '/Microsoft.Insights/diagnosticSettings/') `
-        #         -and ($_ -notmatch '/variables/') `
-        #         -and ($_ -notmatch '/softwareUpdateConfigurations/') `
-        #         -and ($_ -notmatch '/jobSchedules/') `
-        #         -and ($_ -notmatch '/schedules/') `
-        #         -and ($_ -notmatch '/runbooks/') `
-        #         -and ($_ -notmatch '/modules/') `
-        #         -and ($_ -notmatch '/Microsoft.Authorization/roleAssignments/') `
-        # } | Select-Object -Unique
-
         $orderedResourceIds = @(
             $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
             $rawResourceIdsToRemove | Where-Object { $_ -match 'linkedServices/automation' }

From e4ce3b09be6243b5fc6e98513fe12b049fec2cd0 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 19:07:49 +0100
Subject: [PATCH 21/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1 |  12 --
 .../orchestrators/Remove-VirtualMachine.ps1   | 115 ------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 340d61335d..1601c90e78 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -52,18 +52,6 @@ function Remove-DeployedModule {
                 }
                 Remove-vWan @inputObject -Verbose
             }
-            # 'virtualMachines' {
-            #     Write-Verbose 'Run virtual machine removal script' -Verbose
-            #     # Load function
-            #     . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-VirtualMachine.ps1')
-
-            #     # Invoke removal
-            #     $inputObject = @{
-            #         deploymentName    = $deploymentName
-            #         ResourceGroupName = $ResourceGroupName
-            #     }
-            #     Remove-VirtualMachine @inputObject -Verbose
-            # }
             'automationAccounts' {
                 Write-Verbose 'Run automation account removal script' -Verbose
                 # Load function
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
deleted file mode 100644
index a40e264f8e..0000000000
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-VirtualMachine.ps1
+++ /dev/null
@@ -1,115 +0,0 @@
-<#
-.SYNOPSIS
-Remove a Virtual Machine resource with a given deployment name
-
-.DESCRIPTION
-Remove a Virtual Machine resource with a given deployment name
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-VirtualMachine -deploymentname 'keyvault-12345'
-
-Remove a virtual machine with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-VirtualMachine {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
-    }
-
-    process {
-
-        # Identify resources
-        # ------------------
-        $searchRetryCount = 1
-        do {
-            $deployments = Get-AzResourceGroupDeploymentOperation -DeploymentName $deploymentName -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
-            if ($deployments) {
-                break
-            }
-            Write-Verbose ('Did not to find VirtualMachine deployment resources by name [{0}] in scope [{1}]. Retrying in [{2}] seconds [{3}/{4}]' -f $deploymentName, $deploymentScope, $searchRetryInterval, $searchRetryCount, $searchRetryLimit) -Verbose
-            Start-Sleep $searchRetryInterval
-            $searchRetryCount++
-        } while ($searchRetryCount -le $searchRetryLimit)
-
-        if (-not $deployments) {
-            throw "No deployment found for [$deploymentName]"
-        }
-
-        $unorderedResourceIds = $deployments.TargetResource | Where-Object { $_ -and $_ -notmatch '/deployments/' }
-        $resourcesToRemove = [System.Collections.ArrayList] @()
-
-
-        # Handle VM resources
-        $vmIds = $unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }
-        if ($vmIds.Count -gt 0) {
-            $vmName = ($unorderedResourceIds | Where-Object { $_ -match '/virtualMachines/' }).Split('/')[-1]
-
-            # Fetch all resources that match the VM
-            $allResources = Get-AzResource -ResourceGroupName $resourceGroupName -Name "$vmName*"
-
-            # Sort ascending as we need to remove the VM first
-            $orderedResourceIds = $allResources | Sort-Object -Property { $_.ResourceId.Split('/').Count }
-            $resourcesToRemove += $orderedResourceIds | ForEach-Object {
-                @{
-                    resourceId = $_.ResourceId
-                    name       = $_.Name
-                    type       = $_.Type
-                }
-            }
-        }
-
-        # Handle non-vm resources that are deployed with the VM
-        $otherIds = $unorderedResourceIds | Where-Object { $_ -notmatch '/virtualMachines/' }
-        foreach ($otherResourceId in $otherIds) {
-            $resourcesToRemove += @{
-                resourceId = $otherResourceId
-                name       = $otherResourceId.Split('/')[-1]
-                type       = $otherResourceId.Split('/')[6..7] -join '/'
-            }
-        }
-
-        # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNameList
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Remove resources
-        # ----------------
-        if ($resourcesToRemove.count -gt 0) {
-            if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-            }
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}

From 0dd238b3c9a65603de13ed7ac29b3741c000201f Mon Sep 17 00:00:00 2001
From: Simone Bertaccini <simonb@microsoft.com>
Date: Thu, 9 Dec 2021 19:21:09 +0100
Subject: [PATCH 22/78] Add private endpoint to removed resources

---
 .../resourceRemoval/orchestrators/Remove-AutomationAccount.ps1  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 105b0075a8..4e13085460 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -71,6 +71,8 @@ function Remove-AutomationAccount {
         $orderedResourceIds = @(
             $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
             $rawResourceIdsToRemove | Where-Object { $_ -match 'linkedServices/automation' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match '/privateDnsZoneGroups/' }
+            $rawResourceIdsToRemove | Where-Object { $_ -match '/Microsoft.Network/privateEndpoints/[^/]+$' }
             $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
             $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
         )

From 71b45ec0766c92df4747d6d54c0ea1349597844b Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 9 Dec 2021 19:32:10 +0100
Subject: [PATCH 23/78] Update to latest

---
 .../New-ModuleDeployment.ps1                  | 24 +++--------------
 .../Test-TemplateWithParameterFile.ps1        | 27 +++----------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 92b699d1ac..788fda71fa 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -77,6 +77,9 @@ function New-ModuleDeployment {
 
     begin {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
     }
 
     process {
@@ -127,26 +130,7 @@ function New-ModuleDeployment {
                 $DeploymentInputs += @{Tags = $parameterFileTags }
             }
 
-            if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
-                # Bicep
-                $bicepContent = Get-Content $templateFilePath
-                $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
-                if (-not $bicepScope) {
-                    $deploymentScope = 'resourceGroup'
-                } else {
-                    $deploymentScope = $bicepScope.ToLower().Replace('targetscope = ', '').Replace("'", '').Trim()
-                }
-            } else {
-                # ARM
-                $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
-                switch -regex ($armSchema) {
-                    '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
-                    '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
-                    '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
-                    '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
-                    Default { throw "[$armSchema] is a non-supported ARM template schema" }
-                }
-            }
+            $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
 
             #######################
             ## INVOKE DEPLOYMENT ##
diff --git a/utilities/pipelines/resourceValidation/Test-TemplateWithParameterFile.ps1 b/utilities/pipelines/resourceValidation/Test-TemplateWithParameterFile.ps1
index 9fcc6ffe99..d8f6ff9452 100644
--- a/utilities/pipelines/resourceValidation/Test-TemplateWithParameterFile.ps1
+++ b/utilities/pipelines/resourceValidation/Test-TemplateWithParameterFile.ps1
@@ -62,6 +62,9 @@ function Test-TemplateWithParameterFile {
 
     begin {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+
+        # Load helper
+        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
     }
 
     process {
@@ -74,29 +77,7 @@ function Test-TemplateWithParameterFile {
         }
         $ValidationErrors = $null
 
-        ################################
-        ## Determine deployment scope ##
-        ################################
-        if ((Split-Path $templateFilePath -Extension) -eq '.bicep') {
-            # Bicep
-            $bicepContent = Get-Content $templateFilePath
-            $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
-            if (-not $bicepScope) {
-                $deploymentScope = 'resourceGroup'
-            } else {
-                $deploymentScope = $bicepScope.ToLower().Replace('targetscope = ', '').Replace("'", '').Trim()
-            }
-        } else {
-            # ARM
-            $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
-            switch -regex ($armSchema) {
-                '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
-                '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
-                '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
-                '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
-                Default { throw "[$armSchema] is a non-supported ARM template schema" }
-            }
-        }
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
 
         #######################
         ## INVOKE DEPLOYMENT ##

From d46357d52ca798a9c9b0b023788f6ddb48955372 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 14:02:31 +0100
Subject: [PATCH 24/78] Update to latest

---
 ...me.ps1 => Get-ResourceIdsOfDeployment.ps1} | 24 +++++++++----------
 .../Remove-AutomationAccount.ps1              |  4 ++--
 .../orchestrators/Remove-GeneralModule.ps1    |  4 ++--
 .../orchestrators/Remove-vWan.ps1             |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename utilities/pipelines/resourceRemoval/helper/{Get-DeploymentByName.ps1 => Get-ResourceIdsOfDeployment.ps1} (83%)

diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
similarity index 83%
rename from utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
rename to utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
index 2d7ae44908..dd4397ffe0 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-DeploymentByName.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
@@ -16,7 +16,7 @@ Optional. The name of the resource group for scope 'resourceGroup'
 Mandatory. The scope to search in
 
 .EXAMPLE
-Get-DeploymentByNameInner -Name 'keyvault-12356' -Scope 'resourceGroup'
+Get-ResourceIdsOfDeploymentInner -Name 'keyvault-12356' -Scope 'resourceGroup'
 
 Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
 
@@ -26,7 +26,7 @@ Works after the principal:
 - If any of them are not a deployments, add their target resource to the result set (as they are e.g. a resource)
 - If any of them is are deployments, recursively invoke this function for them to get their contained target resources
 #>
-function Get-DeploymentByNameInner {
+function Get-ResourceIdsOfDeploymentInner {
 
     [CmdletBinding()]
     param (
@@ -57,7 +57,7 @@ function Get-DeploymentByNameInner {
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByNameInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
                 }
             } else {
                 # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
@@ -76,10 +76,10 @@ function Get-DeploymentByNameInner {
                     # Resource Group Level Child Deployments
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-DeploymentByNameInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
                 } else {
                     # Subscription Level Deployments
-                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf) -Scope 'subscription'
                 }
             }
         }
@@ -92,10 +92,10 @@ function Get-DeploymentByNameInner {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/managementGroup/') {
                     # Subscription Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByNameInner -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
                 } else {
                     # Management Group Level Deployments
-                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
                 }
             }
         }
@@ -108,10 +108,10 @@ function Get-DeploymentByNameInner {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/tenant/') {
                     # Management Group Level Child Deployments
-                    [array]$resultSet += Get-DeploymentByNameInner -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
                 } else {
                     # Tenant Level Deployments
-                    [array]$resultSet += Get-DeploymentByNameInner -name (Split-Path $deployment -Leaf)
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf)
                 }
             }
         }
@@ -143,11 +143,11 @@ Optional. The maximum times to retry the search for resources via their removal
 Optional. The time to wait in between the search for resources via their remove tags
 
 .EXAMPLE
-Get-DeploymentByName -name 'KeyVault' -ResourceGroupName 'validation-rg' -scope 'resourceGroup'
+Get-ResourceIdsOfDeployment -name 'KeyVault' -ResourceGroupName 'validation-rg' -scope 'resourceGroup'
 
 Get all deployments that match name 'KeyVault' in scope 'resourceGroup' of resource group 'validation-rg'
 #>
-function Get-DeploymentByName {
+function Get-ResourceIdsOfDeployment {
 
     [CmdletBinding()]
     param (
@@ -169,7 +169,7 @@ function Get-DeploymentByName {
 
     $searchRetryCount = 1
     do {
-        [array]$deployments = Get-DeploymentByNameInner -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+        [array]$deployments = Get-ResourceIdsOfDeploymentInner -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
         if ($deployments) {
             break
         }
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
index 4e13085460..6c40b2a02f 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
@@ -44,7 +44,7 @@ function Remove-AutomationAccount {
 
         # Load helper
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
@@ -62,7 +62,7 @@ function Remove-AutomationAccount {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
+        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 7f2d027f0a..c8e3274071 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -54,7 +54,7 @@ function Remove-GeneralModule {
 
         # Load helper
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
@@ -81,7 +81,7 @@ function Remove-GeneralModule {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
+        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
index 2dacdd122a..b6a2300cc6 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
@@ -44,7 +44,7 @@ function Remove-vWan {
 
         # Load helper
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DeploymentByName.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
@@ -62,7 +62,7 @@ function Remove-vWan {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-DeploymentByName @deploymentsInputObject -Verbose
+        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================

From 4ecd4be0f8fbd3481e8631de6799fe82f96c5619 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 15:00:37 +0100
Subject: [PATCH 25/78] Update to latest

---
 .../pipelines/resourceRemoval/Remove-DeployedModule.ps1  | 2 +-
 .../orchestrators/Remove-GeneralModule.ps1               | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 1601c90e78..68e82f9f09 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -37,7 +37,7 @@ function Remove-DeployedModule {
     $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
 
     foreach ($deploymentName in $deploymentNames) {
-
+        Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
         switch ($moduleName) {
             'virtualWans' {
                 Write-Verbose 'Run vWAN removal script' -Verbose
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index c8e3274071..7f2d3c4872 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -62,8 +62,6 @@ function Remove-GeneralModule {
     }
 
     process {
-        Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
-
         # Prepare data
         # ============
         $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
@@ -98,7 +96,7 @@ function Remove-GeneralModule {
 
         # Order resources
         # ===============
-        # If virtual machines are contained, remove them first
+        # If virtual machines are contained, remove them third
         if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
             $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
         }
@@ -108,6 +106,11 @@ function Remove-GeneralModule {
             $resourcesToRemove = @() + $rgsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Resources/resourceGroups' })
         }
 
+        # If diagnostic settings are contained, remove them first (to clean up)
+        if ($diagContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Insights/diagnosticSettings' }) {
+            $resourcesToRemove = @() + $diagContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Insights/diagnosticSettings' })
+        }
+
         # Remove resources
         # ================
         if ($resourcesToRemove.Count -gt 0) {

From 50eb523b5929b32fba055c9dc11e1870cc755ed8 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 16:48:09 +0100
Subject: [PATCH 26/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1 | 79 ++++++++++---------
 .../helper/Get-OrderedResourcesList.ps1       | 46 +++++++++++
 .../Get-ResourceIdsAsFormattedObjectList.ps1  |  6 +-
 .../orchestrators/Remove-GeneralModule.ps1    | 18 +----
 4 files changed, 96 insertions(+), 53 deletions(-)
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 68e82f9f09..4e0c2346d3 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -34,50 +34,55 @@ function Remove-DeployedModule {
         [string] $ResourceGroupName = 'validation-rg'
     )
 
-    $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+        # Load functions
+        . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-GeneralModule.ps1')
+    }
 
-    foreach ($deploymentName in $deploymentNames) {
-        Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
-        switch ($moduleName) {
-            'virtualWans' {
-                Write-Verbose 'Run vWAN removal script' -Verbose
-                # Load function
-                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-vWan.ps1')
+    process {
+        $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
 
-                # Invoke removal
-                $inputObject = @{
-                    deploymentName    = $deploymentName
-                    templateFilePath  = $templateFilePath
-                    ResourceGroupName = $ResourceGroupName
-                }
-                Remove-vWan @inputObject -Verbose
-            }
-            'automationAccounts' {
-                Write-Verbose 'Run automation account removal script' -Verbose
-                # Load function
-                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-AutomationAccount.ps1')
+        $removalSequence = @(
+            'Microsoft.Insights/diagnosticSettings',
+            'Microsoft.Resources/resourceGroups',
+            'Microsoft.Compute/virtualMachines'
+        )
 
-                # Invoke removal
-                $inputObject = @{
-                    deploymentName    = $deploymentName
-                    templateFilePath  = $templateFilePath
-                    ResourceGroupName = $ResourceGroupName
+        foreach ($deploymentName in $deploymentNames) {
+            Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
+            switch ($moduleName) {
+                'virtualWans' {
+                    $removalSequence += @(
+                        'Microsoft.Network/vpnGateways',
+                        'Microsoft.Network/virtualHubs',
+                        'Microsoft.Network/vpnSites'
+                    )
+                    break
+                }
+                'automationAccounts' {
+                    $removalSequence += @(
+                        'Microsoft.OperationsManagement/solutions',
+                        'Microsoft.OperationalInsights/workspaces/linkedServices',
+                        'Microsoft.Network/privateEndpoints/privateDnsZoneGroups',
+                        'Microsoft.Network/privateEndpoints'
+                    )
+                    break
                 }
-                Remove-AutomationAccount @inputObject -Verbose
             }
-            default {
-                Write-Verbose 'Run default removal script' -Verbose
-                # Load function
-                . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-GeneralModule.ps1')
 
-                # Invoke removal
-                $inputObject = @{
-                    deploymentName    = $deploymentName
-                    ResourceGroupName = $ResourceGroupName
-                    templateFilePath  = $templateFilePath
-                }
-                Remove-GeneralModule @inputObject -Verbose
+            # Invoke removal
+            $inputObject = @{
+                deploymentName    = $deploymentName
+                ResourceGroupName = $ResourceGroupName
+                templateFilePath  = $templateFilePath
+                removalSequence   = $removalSequence
             }
+            Remove-GeneralModule @inputObject -Verbose
         }
     }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
 }
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1
new file mode 100644
index 0000000000..5eb47e4f55
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1
@@ -0,0 +1,46 @@
+<#
+.SYNOPSIS
+Order the given resources as per the provided ordered resource type list
+
+.DESCRIPTION
+Order the given resources as per the provided ordered resource type list.
+Any resources not in that list will be appended after.
+
+.PARAMETER resourcesToOrder
+Mandatory. The resources to order. Items are stacked as per their order in the list (i.e. the first items is put on top, then the next, etc.)
+Each item should be in format:
+@{
+    name        = '...'
+    resourceID = '...'
+    type        = '...'
+}
+
+.PARAMETER order
+Optional. The order of resource types to apply. If order is provided, the list is returned as is
+
+.EXAMPLE
+Get-OrderedResourcesList -resourcesToOrder @(@{ name = 'myAccount'; resourceId '(..)/Microsoft.Automation/automationAccounts/myAccount'; type = 'Microsoft.Automation/automationAccounts'}) -order @('Microsoft.Insights/diagnosticSettings','Microsoft.Automation/automationAccounts')
+
+Order the given list of resources which would put the diagnostic settings to the front of the list, then the automation account, then the rest. As only one item exists, the list is returned as is.
+#>
+function Get-OrderedResourcesList {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [hashtable[]] $resourcesToOrder,
+
+        [Parameter(Mandatory = $false)]
+        [string[]] $order = @()
+    )
+
+    # Going from back to front of the list to stack in the correct order
+    for ($orderIndex = ($order.Count - 1); $orderIndex -ge 0; $orderIndex--) {
+        $searchItem = $order[$orderIndex]
+        if ($elementsContained = $resourcesToOrder | Where-Object { $_.type -eq $searchItem }) {
+            $resourcesToOrder = @() + $elementsContained + ($resourcesToOrder | Where-Object { $_.type -ne $searchItem })
+        }
+    }
+
+    return $resourcesToOrder
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
index d4c4e5bb7d..417914276d 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
@@ -27,7 +27,7 @@ function Get-ResourceIdsAsFormattedObjectList {
 
     $formattedResources = [System.Collections.ArrayList]@()
 
-    # Optional resourceGroup-level resources to identify implicitly deployed child-resources
+    # If any resource is deployed at a resource group level, we store all resources in this resource group in this array. Essentially it's a cache.
     $allResourceGroupResources = @()
 
     foreach ($resourceId in $resourceIds) {
@@ -80,7 +80,9 @@ function Get-ResourceIdsAsFormattedObjectList {
             }
             { $PSItem -ge 8 } {
                 # child-resource level
-                $indexOfResourceType = $idElements.IndexOf(($idElements -like 'Microsoft.**')[0])
+                # Find the last resource type reference in the resourceId.
+                # E.g. Microsoft.Automation/automationAccounts/provider/Microsoft.Authorization/roleAssignments/... returns the index of 'Microsoft.Authorization'
+                $indexOfResourceType = $idElements.IndexOf(($idElements -like 'Microsoft.**')[-1])
                 $type = $idElements[$indexOfResourceType, ($indexOfResourceType + 1)] -join '/'
 
                 # Concat rest of resource type along the ID
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 7f2d3c4872..ae52b56052 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -42,6 +42,9 @@ function Remove-GeneralModule {
         [Parameter(Mandatory = $true)]
         [string] $TemplateFilePath,
 
+        [Parameter(Mandatory = $false)]
+        [string[]] $RemovalSequence = @(),
+
         [Parameter(Mandatory = $false)]
         [int] $SearchRetryLimit = 40,
 
@@ -96,20 +99,7 @@ function Remove-GeneralModule {
 
         # Order resources
         # ===============
-        # If virtual machines are contained, remove them third
-        if ($vmsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Compute/virtualMachines' }) {
-            $resourcesToRemove = @() + $vmsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Compute/virtualMachines' })
-        }
-
-        # If resource groups are contained, remove them second
-        if ($rgsContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Resources/resourceGroups' }) {
-            $resourcesToRemove = @() + $rgsContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Resources/resourceGroups' })
-        }
-
-        # If diagnostic settings are contained, remove them first (to clean up)
-        if ($diagContained = $resourcesToRemove | Where-Object { $_.type -eq 'Microsoft.Insights/diagnosticSettings' }) {
-            $resourcesToRemove = @() + $diagContained + ($resourcesToRemove | Where-Object { $_.type -ne 'Microsoft.Insights/diagnosticSettings' })
-        }
+        $resourcesToRemove = Get-OrderedResourcesList -resourcesToOrder $resourcesToRemove -order $RemovalSequence
 
         # Remove resources
         # ================

From cc242b0f3763bde13ca7d4c50ea36ae652213be6 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 17:03:07 +0100
Subject: [PATCH 27/78] Added missing reference

---
 .../resourceRemoval/orchestrators/Remove-GeneralModule.ps1      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index ae52b56052..286da21c4b 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -59,7 +59,7 @@ function Remove-GeneralModule {
         . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-OrderedResourcesList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
     }

From fa18b0e5906778b0ee8d52ef5599b9359c2a71d5 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 18:27:05 +0100
Subject: [PATCH 28/78] Update to latest

---
 ...e-Resource.ps1 => Remove-ResourceList.ps1} | 25 ++++++++-----------
 .../orchestrators/Remove-GeneralModule.ps1    |  4 +--
 2 files changed, 13 insertions(+), 16 deletions(-)
 rename utilities/pipelines/resourceRemoval/helper/{Remove-Resource.ps1 => Remove-ResourceList.ps1} (79%)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
similarity index 79%
rename from utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
rename to utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 0254608fda..fcecc22953 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -10,9 +10,9 @@ Remove the given resource(s). Resources that the script fails to removed are ret
 Mandatory. The resource(s) to remove. Each resource must have a name (optional), type (optional) & resourceId property.
 
 .EXAMPLE
-Remove-ResourceInner -resourceToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceListInner -resourceToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 #>
-function Remove-ResourceInner {
+function Remove-ResourceListInner {
 
     [CmdletBinding(SupportsShouldProcess)]
     param(
@@ -31,14 +31,11 @@ function Remove-ResourceInner {
 
     foreach ($resource in $resourceToRemove) {
 
-        $resourceReference = ($resource.resourceId.split('/').count -gt 5) ?
-            (Get-AzResource -ResourceId $resource.resourceId -ErrorAction 'SilentlyContinue') :
-            (Get-AzResourceGroup -Id $resource.resourceId -ErrorAction 'SilentlyContinue')
         $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
 
-        if (-not $resourceReference -or $alreadyProcessed) {
+        if ($alreadyProcessed) {
             # Skipping
-            Write-Verbose ('Skipping resource [{0}] of type [{1}] as itself or parent resource was already processed' -f $resource.name, $resource.type) -Verbose
+            Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f $resource.name, $resource.type) -Verbose
             [array]$processedResources += $resource.resourceId
             [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
         } else {
@@ -81,22 +78,22 @@ Remove all resources in the provided array from Azure. Resources are removed wit
 Optional. The array of resources to remove. Has to contain objects with at least a 'resourceId' property
 
 .EXAMPLE
-Remove-Resource @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceList @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 
 Remove resource with ID 'subscriptions/.../storageAccounts/resourceName'.
 #>
-function Remove-Resource {
+function Remove-ResourceList {
 
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $false)]
-        [PSObject[]] $resourceToRemove = @(),
+        [PSObject[]] $ResourcesToRemove = @(),
 
         [Parameter(Mandatory = $false)]
-        [int] $removalRetryLimit = 3,
+        [int] $RemovalRetryLimit = 3,
 
         [Parameter(Mandatory = $false)]
-        [int] $removalRetryInterval = 15
+        [int] $RemovalRetryInterval = 15
     )
 
     $removalRetryCount = 1
@@ -104,9 +101,9 @@ function Remove-Resource {
 
     do {
         if ($PSCmdlet.ShouldProcess(("[{0}] Resource(s) with a maximum of [$removalRetryLimit] attempts." -f (($resourcesToRetry -is [array]) ? $resourcesToRetry.Count : 1)), 'Remove')) {
-            $resourcesToRetry = Remove-ResourceInner -resourceToRemove $resourcesToRetry -Verbose
+            $resourcesToRetry = Remove-ResourceListInner -resourceToRemove $resourcesToRetry -Verbose
         } else {
-            Remove-ResourceInner -resourceToRemove $resourceToRemove -WhatIf
+            Remove-ResourceListInner -resourceToRemove $resourceToRemove -WhatIf
         }
 
         if (-not $resourcesToRetry) {
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 286da21c4b..329f9012e9 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -61,7 +61,7 @@ function Remove-GeneralModule {
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-OrderedResourcesList.ps1')
         . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
+        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-ResourceList.ps1')
     }
 
     process {
@@ -105,7 +105,7 @@ function Remove-GeneralModule {
         # ================
         if ($resourcesToRemove.Count -gt 0) {
             if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
-                Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
+                Remove-ResourceList -resourceToRemove $resourcesToRemove -Verbose
             }
         } else {
             Write-Verbose 'Found [0] resources to remove'

From ccda94412c8448609d574fa618fa7b6cf4b55a79 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 18:28:35 +0100
Subject: [PATCH 29/78] Update to latest

---
 .../helper/Remove-ResourceList.ps1             | 18 +++++++++---------
 .../orchestrators/Remove-GeneralModule.ps1     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index fcecc22953..dac0d5e2b8 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -6,30 +6,30 @@ Remove the given resource(s)
 .DESCRIPTION
 Remove the given resource(s). Resources that the script fails to removed are returned in an array.
 
-.PARAMETER resourceToRemove
+.PARAMETER resourcesToRemove
 Mandatory. The resource(s) to remove. Each resource must have a name (optional), type (optional) & resourceId property.
 
 .EXAMPLE
-Remove-ResourceListInner -resourceToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceListInner -resourcesToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 #>
 function Remove-ResourceListInner {
 
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $false)]
-        [Hashtable[]] $resourceToRemove = @()
+        [Hashtable[]] $resourcesToRemove = @()
     )
 
     # Load functions
     . (Join-Path $PSScriptRoot 'Initialize-PreResourceRemoval.ps1')
     . (Join-Path $PSScriptRoot 'Initialize-PostResourceRemoval.ps1')
 
-    $resourceToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
+    $resourcesToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
     $resourcesToRetry = @()
     $processedResources = @()
     Write-Verbose '----------------------------------' -Verbose
 
-    foreach ($resource in $resourceToRemove) {
+    foreach ($resource in $resourcesToRemove) {
 
         $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
 
@@ -74,7 +74,7 @@ Remove all resources in the provided array from Azure
 .DESCRIPTION
 Remove all resources in the provided array from Azure. Resources are removed with a retry mechanism.
 
-.PARAMETER resourceToRemove
+.PARAMETER resourcesToRemove
 Optional. The array of resources to remove. Has to contain objects with at least a 'resourceId' property
 
 .EXAMPLE
@@ -97,13 +97,13 @@ function Remove-ResourceList {
     )
 
     $removalRetryCount = 1
-    $resourcesToRetry = $resourceToRemove
+    $resourcesToRetry = $resourcesToRemove
 
     do {
         if ($PSCmdlet.ShouldProcess(("[{0}] Resource(s) with a maximum of [$removalRetryLimit] attempts." -f (($resourcesToRetry -is [array]) ? $resourcesToRetry.Count : 1)), 'Remove')) {
-            $resourcesToRetry = Remove-ResourceListInner -resourceToRemove $resourcesToRetry -Verbose
+            $resourcesToRetry = Remove-ResourceListInner -resourcesToRemove $resourcesToRetry -Verbose
         } else {
-            Remove-ResourceListInner -resourceToRemove $resourceToRemove -WhatIf
+            Remove-ResourceListInner -resourcesToRemove $resourcesToRemove -WhatIf
         }
 
         if (-not $resourcesToRetry) {
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
index 329f9012e9..27536ed21c 100644
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
+++ b/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
@@ -105,7 +105,7 @@ function Remove-GeneralModule {
         # ================
         if ($resourcesToRemove.Count -gt 0) {
             if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
-                Remove-ResourceList -resourceToRemove $resourcesToRemove -Verbose
+                Remove-ResourceList -resourcesToRemove $resourcesToRemove -Verbose
             }
         } else {
             Write-Verbose 'Found [0] resources to remove'

From d86caf46c5ec8f98e4fd0f86e4c4e15016b4dd79 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 18:28:44 +0100
Subject: [PATCH 30/78] Update to latest

---
 .../Remove-AutomationAccount.ps1              | 98 -------------------
 .../orchestrators/Remove-vWan.ps1             | 96 ------------------
 2 files changed, 194 deletions(-)
 delete mode 100644 utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
 delete mode 100644 utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1

diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
deleted file mode 100644
index 6c40b2a02f..0000000000
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-AutomationAccount.ps1
+++ /dev/null
@@ -1,98 +0,0 @@
-<#
-.SYNOPSIS
-Remove Automation account, Log analytics link and Update solution deployed with a given deployment name. Resources will be removed even if Log Analytics is in a different resource group than the Automation Account
-
-.DESCRIPTION
-Remove Automation account, Log analytics link and Update solution deployed with a given deployment name. Resources will be removed even if Log Analytics is in a different resource group than the Automation Account
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-AutomationAccount -deploymentname 'aa-12345'
-
-Remove Automation account, Log analytics link and Update solution deployed starting with the deployment name 'aa-12345'.
-#>
-function Remove-AutomationAccount {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $true)]
-        [string] $TemplateFilePath,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
-    }
-
-    process {
-        # Prepare data
-        # ============
-        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
-
-        # Fetch deployments
-        # =================
-        $deploymentsInputObject = @{
-            name              = $deploymentName
-            scope             = $deploymentScope
-            resourceGroupName = $resourceGroupName
-        }
-        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
-
-        # Pre-Filter & order items
-        # ========================
-        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-
-        $orderedResourceIds = @(
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.OperationsManagement/solutions/Updates' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'linkedServices/automation' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match '/privateDnsZoneGroups/' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match '/Microsoft.Network/privateEndpoints/[^/]+$' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Insights/diagnosticSettings' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Automation/automationAccounts' }
-        )
-
-        # Format items
-        # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $orderedResourceIds
-
-        # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNameList
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Remove resources
-        # ----------------
-        if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-            Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1 b/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
deleted file mode 100644
index b6a2300cc6..0000000000
--- a/utilities/pipelines/resourceRemoval/orchestrators/Remove-vWan.ps1
+++ /dev/null
@@ -1,96 +0,0 @@
-<#
-.SYNOPSIS
-Remove a vWAN resource with a given deployment name
-
-.DESCRIPTION
-Remove a vWAN resource with a given deployment name
-
-.PARAMETER deploymentName
-Mandatory. The deployment name to use and find resources to remove
-
-.PARAMETER searchRetryLimit
-Optional. The maximum times to retry the search for resources via their removal tag
-
-.PARAMETER searchRetryInterval
-Optional. The time to wait in between the search for resources via their remove tags
-
-.EXAMPLE
-Remove-vWan -deploymentname 'keyvault-12345'
-
-Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
-#>
-function Remove-vWan {
-
-    [Cmdletbinding(SupportsShouldProcess)]
-    param(
-        [Parameter(Mandatory = $true)]
-        [string] $deploymentName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $ResourceGroupName = 'validation-rg',
-
-        [Parameter(Mandatory = $true)]
-        [string] $TemplateFilePath,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryLimit = 40,
-
-        [Parameter(Mandatory = $false)]
-        [int] $searchRetryInterval = 60
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsOfDeployment.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-ResourceIdsAsFormattedObjectList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Get-DependencyResourceNameList.ps1')
-        . (Join-Path (Split-Path $PSScriptRoot -Parent) 'helper' 'Remove-Resource.ps1')
-    }
-
-    process {
-        # Prepare data
-        # ============
-        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
-
-        # Fetch deployments
-        # =================
-        $deploymentsInputObject = @{
-            name              = $deploymentName
-            scope             = $deploymentScope
-            resourceGroupName = $resourceGroupName
-        }
-        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
-
-        # Pre-Filter & order items
-        # ========================
-        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-
-        $orderedResourceIds = @(
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/vpnGateways' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/virtualHubs' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/vpnSites' }
-            $rawResourceIdsToRemove | Where-Object { $_ -match 'Microsoft.Network/virtualWans' }
-        )
-
-        # Format items
-        # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $orderedResourceIds
-
-        # Filter all dependency resources
-        $dependencyResourceNames = Get-DependencyResourceNameList
-        $resourcesToRemove = $resourcesToRemove | Where-Object { $_.Name -notin $dependencyResourceNames }
-
-        # Remove resources
-        # ----------------
-        if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f $resourcesToRemove.Count), 'Remove')) {
-            Remove-Resource -resourceToRemove $resourcesToRemove -Verbose
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}

From 46cf29a19289b9fb3bc3b011545d61fde15548e7 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 18:43:26 +0100
Subject: [PATCH 31/78] Update to latest

---
 .../helper/Initialize-PostResourceRemoval.ps1 | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
index ebd015d34f..444b154e58 100644
--- a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
@@ -39,5 +39,34 @@ function Initialize-PostResourceRemoval {
                 }
             }
         }
+        'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
+            # Remove protected VM
+            # Required if e.g. a VM was listed in an RSV and only that VM is removed
+            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
+                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
+                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
+                }
+            }
+
+            $backupItemInputObject = @{
+                BackupManagementType = 'AzureVM'
+                WorkloadType         = 'AzureVM'
+                VaultId              = $resourceToRemove.resourceId.split('/backupFabrics/')[0]
+                Name                 = $resourceToRemove.name
+            }
+            if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject) {
+                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
+
+                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
+                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
+                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
+                    }
+                }
+
+                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
+                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
+                }
+            }
+        }
     }
 }

From 28439d30fff0dfa097f5c43b6a9b33c0bf5e6bb3 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 10 Dec 2021 18:56:15 +0100
Subject: [PATCH 32/78] Update to latest

---
 .../helper/Initialize-PostResourceRemoval.ps1 | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
index 444b154e58..71ea5ae91b 100644
--- a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
@@ -42,31 +42,36 @@ function Initialize-PostResourceRemoval {
         'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
             # Remove protected VM
             # Required if e.g. a VM was listed in an RSV and only that VM is removed
-            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
-                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
-                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
+            $vaultId = $resourceToRemove.resourceId.split('/backupFabrics/')[0]
+            $softDeleteStatus = (Get-AzRecoveryServicesVaultProperty -VaultId $vaultId).SoftDeleteFeatureState
+            if ($softDeleteStatus -ne 'Disabled') {
+                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $vaultId), 'Set')) {
+                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $vaultId -SoftDeleteFeatureState 'Disable'
                 }
             }
 
             $backupItemInputObject = @{
                 BackupManagementType = 'AzureVM'
                 WorkloadType         = 'AzureVM'
-                VaultId              = $resourceToRemove.resourceId.split('/backupFabrics/')[0]
+                VaultId              = $vaultId
                 Name                 = $resourceToRemove.name
             }
-            if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject) {
-                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
+            if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject -ErrorAction 'SilentlyContinue') {
+                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $vaultId) -Verbose
 
                 if ($backupItem.DeleteState -eq 'ToBeDeleted') {
                     if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
-                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
+                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $vaultId -Force
                     }
                 }
 
-                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
-                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
+                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $vaultId), 'Remove')) {
+                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $vaultId -RemoveRecoveryPoints -Force
                 }
             }
+
+            # Undo a potential soft delete state change
+            $null = Set-AzRecoveryServicesVaultProperty -VaultId $vaultId -SoftDeleteFeatureState $softDeleteStatus
         }
     }
 }

From 654845ef5794326ec7189f9dbbe5aa0b51852773 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 00:54:26 +0100
Subject: [PATCH 33/78] Added better support for diagnostic settings removal

---
 .../helper/Initialize-PostResourceRemoval.ps1 |  2 +-
 .../helper/Remove-Resource.ps1                | 25 +++++++++++++++++++
 .../helper/Remove-ResourceList.ps1            |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1

diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
index 71ea5ae91b..507048657e 100644
--- a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
@@ -71,7 +71,7 @@ function Initialize-PostResourceRemoval {
             }
 
             # Undo a potential soft delete state change
-            $null = Set-AzRecoveryServicesVaultProperty -VaultId $vaultId -SoftDeleteFeatureState $softDeleteStatus
+            $null = Set-AzRecoveryServicesVaultProperty -VaultId $vaultId -SoftDeleteFeatureState $softDeleteStatus.TrimEnd('d')
         }
     }
 }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
new file mode 100644
index 0000000000..4476928940
--- /dev/null
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -0,0 +1,25 @@
+function Remove-Resource {
+
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string] $resourceId,
+
+        [Parameter()]
+        [string] $name,
+
+        [Parameter()]
+        [string] $type
+    )
+
+    switch ($type) {
+        'Microsoft.Insights/diagnosticSettings' {
+            $parentResourceId = $resourceId.Split('/providers/{0}' -f $type)[0]
+            $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name $name
+            break
+        }
+        Default {
+            $null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop'
+        }
+    }
+}
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index dac0d5e2b8..107cf39a20 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -46,7 +46,7 @@ function Remove-ResourceListInner {
                 }
 
                 if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                    $null = Remove-AzResource -ResourceId $resource.resourceId -Force -ErrorAction 'Stop'
+                    Remove-Resource -ResourceId $resource.resourceId -name $resource.name -type $resource.type
                 }
 
                 # If we removed a parent remove its children

From c27d5942d551724d0afb3d16fc7b7f1f304f57c6 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 00:57:08 +0100
Subject: [PATCH 34/78] Update to latest

---
 .../helper/Remove-Resource.ps1                | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
index 4476928940..e5bfd84ba1 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
@@ -1,4 +1,25 @@
-function Remove-Resource {
+<#
+.SYNOPSIS
+Remove a specific resource
+
+.DESCRIPTION
+Remove a specific resource. Tries to handle different resource types accordingly
+
+.PARAMETER resourceId
+Mandatory. The resourceID of the resource to remove
+
+.PARAMETER name
+Mandatory. The name of the resource to remove
+
+.PARAMETER type
+Mandatory. The type of the resource to remove
+
+.EXAMPLE
+Remove-Resource -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
+
+Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
+#>
+function Remove-Resource {
 
     [CmdletBinding()]
     param (

From 4a04f0c0f008a04542cb7652ea66c472da66159d Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:18:20 +0100
Subject: [PATCH 35/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-ResourceList.ps1     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 107cf39a20..abf9e01158 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -22,6 +22,7 @@ function Remove-ResourceListInner {
 
     # Load functions
     . (Join-Path $PSScriptRoot 'Initialize-PreResourceRemoval.ps1')
+    . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
     . (Join-Path $PSScriptRoot 'Initialize-PostResourceRemoval.ps1')
 
     $resourcesToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }

From 1df79e78dabbdb41cd8dd2de070e889910aa3546 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:22:42 +0100
Subject: [PATCH 36/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-ResourceList.ps1     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index abf9e01158..4a842dcd87 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -59,6 +59,7 @@ function Remove-ResourceListInner {
             }
         }
 
+        # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
         if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
             Initialize-PostResourceRemoval -resourceToRemove $resource
         }

From 74a7f8ba7549bcda51e069261b012c37e1d0ae05 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:30:41 +0100
Subject: [PATCH 37/78] Update to latest

---
 .../resourceRemoval/Remove-DeployedModule.ps1        |  4 ++--
 ...rceRemoval.ps1 => Invoke-ResourcePostRemoval.ps1} |  4 ++--
 ...urceRemoval.ps1 => Invoke-ResourcePreRemoval.ps1} |  4 ++--
 ...emove-Resource.ps1 => Invoke-ResourceRemoval.ps1} |  4 ++--
 .../Remove-ModuleDeployment.ps1}                     |  0
 .../resourceRemoval/helper/Remove-ResourceList.ps1   | 12 ++++++------
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename utilities/pipelines/resourceRemoval/helper/{Initialize-PostResourceRemoval.ps1 => Invoke-ResourcePostRemoval.ps1} (94%)
 rename utilities/pipelines/resourceRemoval/helper/{Initialize-PreResourceRemoval.ps1 => Invoke-ResourcePreRemoval.ps1} (91%)
 rename utilities/pipelines/resourceRemoval/helper/{Remove-Resource.ps1 => Invoke-ResourceRemoval.ps1} (74%)
 rename utilities/pipelines/resourceRemoval/{orchestrators/Remove-GeneralModule.ps1 => helper/Remove-ModuleDeployment.ps1} (100%)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 4e0c2346d3..0b3b1192ab 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -37,7 +37,7 @@ function Remove-DeployedModule {
     begin {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
         # Load functions
-        . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-GeneralModule.ps1')
+        . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-ModuleDeployment.ps1')
     }
 
     process {
@@ -78,7 +78,7 @@ function Remove-DeployedModule {
                 templateFilePath  = $templateFilePath
                 removalSequence   = $removalSequence
             }
-            Remove-GeneralModule @inputObject -Verbose
+            Remove-ModuleDeployment @inputObject -Verbose
         }
     }
 
diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
similarity index 94%
rename from utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
rename to utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 507048657e..6b2702fdb6 100644
--- a/utilities/pipelines/resourceRemoval/helper/Initialize-PostResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -14,11 +14,11 @@ Mandatory. The resource to remove. Should have format
 }
 
 .EXAMPLE
-Initialize-PostResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
+Invoke-ResourcePostRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
 
 Purge resource 'myVault' of type 'Microsoft.KeyVault/vaults' if no purge protection is enabled
 #>
-function Initialize-PostResourceRemoval {
+function Invoke-ResourcePostRemoval {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
diff --git a/utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1
similarity index 91%
rename from utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1
rename to utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1
index d985819794..db8abdacb3 100644
--- a/utilities/pipelines/resourceRemoval/helper/Initialize-PreResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1
@@ -14,11 +14,11 @@ MAndatory. The resource to prepare.Should have format
 }
 
 .EXAMPLE
-Initialize-PreResourceRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
+Invoke-ResourcePreRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
 
 Prepare resource 'myVault' of type 'Microsoft.RecoveryServices/vaults' for removal
 #>
-function Initialize-PreResourceRemoval {
+function Invoke-ResourcePreRemoval {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
similarity index 74%
rename from utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
rename to utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index e5bfd84ba1..49840c6fa8 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Resource.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -15,11 +15,11 @@ Mandatory. The name of the resource to remove
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Remove-Resource -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
+Invoke-ResourceRemoval -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
 
 Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
 #>
-function Remove-Resource {
+function Invoke-ResourceRemoval {
 
     [CmdletBinding()]
     param (
diff --git a/utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ModuleDeployment.ps1
similarity index 100%
rename from utilities/pipelines/resourceRemoval/orchestrators/Remove-GeneralModule.ps1
rename to utilities/pipelines/resourceRemoval/helper/Remove-ModuleDeployment.ps1
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 4a842dcd87..63b156cb4c 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -21,9 +21,9 @@ function Remove-ResourceListInner {
     )
 
     # Load functions
-    . (Join-Path $PSScriptRoot 'Initialize-PreResourceRemoval.ps1')
-    . (Join-Path $PSScriptRoot 'Remove-Resource.ps1')
-    . (Join-Path $PSScriptRoot 'Initialize-PostResourceRemoval.ps1')
+    . (Join-Path $PSScriptRoot 'Invoke-ResourcePreRemoval.ps1')
+    . (Join-Path $PSScriptRoot 'Invoke-ResourceRemoval.ps1')
+    . (Join-Path $PSScriptRoot 'Invoke-ResourcePostRemoval.ps1')
 
     $resourcesToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
     $resourcesToRetry = @()
@@ -43,11 +43,11 @@ function Remove-ResourceListInner {
             Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
             try {
                 if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                    Initialize-PreResourceRemoval -resourceToRemove $resource
+                    Invoke-ResourcePreRemoval -resourceToRemove $resource
                 }
 
                 if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                    Remove-Resource -ResourceId $resource.resourceId -name $resource.name -type $resource.type
+                    Invoke-ResourceRemoval -ResourceId $resource.resourceId -name $resource.name -type $resource.type
                 }
 
                 # If we removed a parent remove its children
@@ -61,7 +61,7 @@ function Remove-ResourceListInner {
 
         # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
         if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-            Initialize-PostResourceRemoval -resourceToRemove $resource
+            Invoke-ResourcePostRemoval -resourceToRemove $resource
         }
     }
     Write-Verbose '----------------------------------' -Verbose

From 1febecbe050b15f48a04e7b55410e10106284d37 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:32:14 +0100
Subject: [PATCH 38/78] Update to latest

---
 .../helper/Remove-ResourceList.ps1            | 79 +++++++++++--------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 63b156cb4c..8400f86af3 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -20,52 +20,61 @@ function Remove-ResourceListInner {
         [Hashtable[]] $resourcesToRemove = @()
     )
 
-    # Load functions
-    . (Join-Path $PSScriptRoot 'Invoke-ResourcePreRemoval.ps1')
-    . (Join-Path $PSScriptRoot 'Invoke-ResourceRemoval.ps1')
-    . (Join-Path $PSScriptRoot 'Invoke-ResourcePostRemoval.ps1')
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
-    $resourcesToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
-    $resourcesToRetry = @()
-    $processedResources = @()
-    Write-Verbose '----------------------------------' -Verbose
+        # Load functions
+        . (Join-Path $PSScriptRoot 'Invoke-ResourcePreRemoval.ps1')
+        . (Join-Path $PSScriptRoot 'Invoke-ResourceRemoval.ps1')
+        . (Join-Path $PSScriptRoot 'Invoke-ResourcePostRemoval.ps1')
+    }
 
-    foreach ($resource in $resourcesToRemove) {
+    process {
+        $resourcesToRemove | ForEach-Object { Write-Verbose ('- Remove [{0}]' -f $_.resourceId) -Verbose }
+        $resourcesToRetry = @()
+        $processedResources = @()
+        Write-Verbose '----------------------------------' -Verbose
 
-        $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
+        foreach ($resource in $resourcesToRemove) {
 
-        if ($alreadyProcessed) {
-            # Skipping
-            Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f $resource.name, $resource.type) -Verbose
-            [array]$processedResources += $resource.resourceId
-            [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
-        } else {
-            Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
-            try {
-                if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                    Invoke-ResourcePreRemoval -resourceToRemove $resource
-                }
-
-                if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                    Invoke-ResourceRemoval -ResourceId $resource.resourceId -name $resource.name -type $resource.type
-                }
+            $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
 
-                # If we removed a parent remove its children
+            if ($alreadyProcessed) {
+                # Skipping
+                Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f $resource.name, $resource.type) -Verbose
                 [array]$processedResources += $resource.resourceId
                 [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
-            } catch {
-                Write-Warning ('Removal moved back for re-try. Reason: [{0}]' -f $_.Exception.Message)
-                [array]$resourcesToRetry += $resource
+            } else {
+                Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
+                try {
+                    if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
+                        Invoke-ResourcePreRemoval -resourceToRemove $resource
+                    }
+
+                    if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
+                        Invoke-ResourceRemoval -ResourceId $resource.resourceId -name $resource.name -type $resource.type
+                    }
+
+                    # If we removed a parent remove its children
+                    [array]$processedResources += $resource.resourceId
+                    [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
+                } catch {
+                    Write-Warning ('Removal moved back for re-try. Reason: [{0}]' -f $_.Exception.Message)
+                    [array]$resourcesToRetry += $resource
+                }
             }
-        }
 
-        # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
-        if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-            Invoke-ResourcePostRemoval -resourceToRemove $resource
+            # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
+            if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
+                Invoke-ResourcePostRemoval -resourceToRemove $resource
+            }
         }
+        Write-Verbose '----------------------------------' -Verbose
+        return $resourcesToRetry
+    }
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
     }
-    Write-Verbose '----------------------------------' -Verbose
-    return $resourcesToRetry
 }
 #endregion
 

From 3d9dcca6412057dd369a73d9b193e7528a9b267e Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:39:33 +0100
Subject: [PATCH 39/78] Update to latest

---
 .../helper/Invoke-ResourcePreRemoval.ps1      | 54 -------------------
 .../helper/Invoke-ResourceRemoval.ps1         | 35 +++++++++++-
 .../helper/Remove-ResourceList.ps1            |  5 --
 3 files changed, 33 insertions(+), 61 deletions(-)
 delete mode 100644 utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1
deleted file mode 100644
index db8abdacb3..0000000000
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePreRemoval.ps1
+++ /dev/null
@@ -1,54 +0,0 @@
-<#
-.SYNOPSIS
-Prepare the given resource for removal
-
-.DESCRIPTION
-Prepare the given resource for removal. This is required for some resource such as the RSV where we first have to remove its protected items before the RSV itself can be removed
-
-.PARAMETER resourceToRemove
-MAndatory. The resource to prepare.Should have format
-@{
-    name        = '...'
-    resourceID = '...'
-    type        = '...'
-}
-
-.EXAMPLE
-Invoke-ResourcePreRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.RecoveryServices/vaults/myVault'; type = 'Microsoft.RecoveryServices/vaults'}
-
-Prepare resource 'myVault' of type 'Microsoft.RecoveryServices/vaults' for removal
-#>
-function Invoke-ResourcePreRemoval {
-
-    [CmdletBinding(SupportsShouldProcess)]
-    param (
-        [Parameter(Mandatory)]
-        [hashtable] $resourceToRemove
-    )
-
-    switch ($resourceToRemove.type) {
-        'Microsoft.RecoveryServices/vaults' {
-            # Remove protected VMs
-            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId).SoftDeleteFeatureState -ne 'Disabled') {
-                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceToRemove.resourceId), 'Set')) {
-                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceToRemove.resourceId -SoftDeleteFeatureState 'Disable'
-                }
-            }
-
-            $backupItems = Get-AzRecoveryServicesBackupItem -BackupManagementType 'AzureVM' -WorkloadType 'AzureVM' -VaultId $resourceToRemove.resourceId
-            foreach ($backupItem in $backupItems) {
-                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId) -Verbose
-
-                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
-                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
-                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceToRemove.resourceId -Force
-                    }
-                }
-
-                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceToRemove.resourceId), 'Remove')) {
-                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceToRemove.resourceId -RemoveRecoveryPoints -Force
-                }
-            }
-        }
-    }
-}
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index 49840c6fa8..3468d99e64 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -21,7 +21,7 @@ Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Micros
 #>
 function Invoke-ResourceRemoval {
 
-    [CmdletBinding()]
+    [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter()]
         [string] $resourceId,
@@ -36,9 +36,40 @@ function Invoke-ResourceRemoval {
     switch ($type) {
         'Microsoft.Insights/diagnosticSettings' {
             $parentResourceId = $resourceId.Split('/providers/{0}' -f $type)[0]
-            $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name $name
+            if ($PSCmdlet.ShouldProcess("Diagnostic setting [$name]", 'Remove')) {
+                $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name $name
+            }
             break
         }
+        'Microsoft.RecoveryServices/vaults' {
+            # Pre-Removal
+            # -----------
+            # Remove protected VMs
+            if ((Get-AzRecoveryServicesVaultProperty -VaultId $resourceId).SoftDeleteFeatureState -ne 'Disabled') {
+                if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $resourceId), 'Set')) {
+                    $null = Set-AzRecoveryServicesVaultProperty -VaultId $resourceId -SoftDeleteFeatureState 'Disable'
+                }
+            }
+
+            $backupItems = Get-AzRecoveryServicesBackupItem -BackupManagementType 'AzureVM' -WorkloadType 'AzureVM' -VaultId $resourceId
+            foreach ($backupItem in $backupItems) {
+                Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceId) -Verbose
+
+                if ($backupItem.DeleteState -eq 'ToBeDeleted') {
+                    if ($PSCmdlet.ShouldProcess('Soft-deleted backup data removal', 'Undo')) {
+                        $null = Undo-AzRecoveryServicesBackupItemDeletion -Item $backupItem -VaultId $resourceId -Force
+                    }
+                }
+
+                if ($PSCmdlet.ShouldProcess(('Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $resourceId), 'Remove')) {
+                    $null = Disable-AzRecoveryServicesBackupProtection -Item $backupItem -VaultId $resourceId -RemoveRecoveryPoints -Force
+                }
+            }
+
+            # Actual removal
+            # --------------
+            $null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop'
+        }
         Default {
             $null = Remove-AzResource -ResourceId $resourceId -Force -ErrorAction 'Stop'
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 8400f86af3..e4fc995aaa 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -24,7 +24,6 @@ function Remove-ResourceListInner {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
 
         # Load functions
-        . (Join-Path $PSScriptRoot 'Invoke-ResourcePreRemoval.ps1')
         . (Join-Path $PSScriptRoot 'Invoke-ResourceRemoval.ps1')
         . (Join-Path $PSScriptRoot 'Invoke-ResourcePostRemoval.ps1')
     }
@@ -47,10 +46,6 @@ function Remove-ResourceListInner {
             } else {
                 Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
                 try {
-                    if ($PSCmdlet.ShouldProcess(('Pre-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                        Invoke-ResourcePreRemoval -resourceToRemove $resource
-                    }
-
                     if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
                         Invoke-ResourceRemoval -ResourceId $resource.resourceId -name $resource.name -type $resource.type
                     }

From cee645a2994ec271b6a7b4bc3aaedeaf45fad587 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:41:19 +0100
Subject: [PATCH 40/78] Update to latest

---
 utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 0b3b1192ab..70b44eb8fc 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -37,7 +37,7 @@ function Remove-DeployedModule {
     begin {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
         # Load functions
-        . (Join-Path $PSScriptRoot 'orchestrators' 'Remove-ModuleDeployment.ps1')
+        . (Join-Path $PSScriptRoot 'helper' 'Remove-ModuleDeployment.ps1')
     }
 
     process {

From 5786d225f06c9aebf86019395179646888c9bdac Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:43:31 +0100
Subject: [PATCH 41/78] Update to latest

---
 utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 70b44eb8fc..418a760b4a 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -43,6 +43,7 @@ function Remove-DeployedModule {
     process {
         $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
 
+        # The intial sequenc is a general order-recommendation
         $removalSequence = @(
             'Microsoft.Insights/diagnosticSettings',
             'Microsoft.Resources/resourceGroups',

From 2fa727d65cf23246b5721913a1514dbe1e8be9d5 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:43:44 +0100
Subject: [PATCH 42/78] Update to latest

---
 utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 418a760b4a..8d61eaeb6c 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -43,7 +43,7 @@ function Remove-DeployedModule {
     process {
         $moduleName = Split-Path (Split-Path $templateFilePath -Parent) -LeafBase
 
-        # The intial sequenc is a general order-recommendation
+        # The intial sequence is a general order-recommendation
         $removalSequence = @(
             'Microsoft.Insights/diagnosticSettings',
             'Microsoft.Resources/resourceGroups',

From f96972a5689be0993f9ea8341d011c400b296139 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:59:07 +0100
Subject: [PATCH 43/78] Update to latest

---
 .github/actions/templates/deployModule/action.yml         | 4 ++--
 docs/wiki/PipelinesDesign.md                              | 2 +-
 .../pipelines/resourceRemoval/Remove-DeployedModule.ps1   | 8 ++++----
 ...{Remove-ModuleDeployment.ps1 => Remove-Deployment.ps1} | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename utilities/pipelines/resourceRemoval/helper/{Remove-ModuleDeployment.ps1 => Remove-Deployment.ps1} (96%)

diff --git a/.github/actions/templates/deployModule/action.yml b/.github/actions/templates/deployModule/action.yml
index 0ae0391798..4523a1fb3f 100644
--- a/.github/actions/templates/deployModule/action.yml
+++ b/.github/actions/templates/deployModule/action.yml
@@ -115,7 +115,7 @@ runs:
       run: |
         if('${{ inputs.removeDeployment }}' -eq 'true') {
           # Load used function
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceRemoval' 'Remove-DeployedModule.ps1')
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceRemoval' 'Initialize-DeploymentRemoval.ps1')
 
           $functionInput = @{
               deploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
@@ -127,5 +127,5 @@ runs:
           Write-Verbose 'Invoke task with' -Verbose
           Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-          Remove-DeployedModule @functionInput
+          Initialize-DeploymentRemoval @functionInput
         }
diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 87e787d57d..101ea72230 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -94,7 +94,7 @@ Note that, for the deployments we have to account for certain [prerequisites](#p
 
 ### Removal
 
-The removal phase is strongly coupled with the previous deployment phase. Fundamentally, we want to remove any test-deployed resource after its test concluded. If we would not, we would generate unnecessary costs and may temper with any subsequent test. Some resources may require a dedicated logic to be removed. This logic should be stored alongside the generally utilized removal script in the `.utilities/pipelines/resourceRemoval` folder and be referenced by the `Remove-DeployedModule.ps1` script that orchestrates the removal.
+The removal phase is strongly coupled with the previous deployment phase. Fundamentally, we want to remove any test-deployed resource after its test concluded. If we would not, we would generate unnecessary costs and may temper with any subsequent test. Some resources may require a dedicated logic to be removed. This logic should be stored alongside the generally utilized removal script in the `.utilities/pipelines/resourceRemoval` folder and be referenced by the `Initialize-DeploymentRemoval.ps1` script that orchestrates the removal.
 
 Most of the removal scripts rely on the deployment name used during the preceding deployment step. Based on this name in combination with the template file path, the removal script find the corresponding deployment and removes all contained resources.
 
diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
index 8d61eaeb6c..731f866053 100644
--- a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
+++ b/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
@@ -15,11 +15,11 @@ Mandatory. The path to the template used for the deployment. Used to determine t
 Optional. The name of the resource group the deployment was happening in. Relevant for resource-group level deployments.
 
 .EXAMPLE
-Remove-DeployedModule -deploymentName 'virtualWans-20211204T1812029146Z' -templateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
+Initialize-DeploymentRemoval -deploymentName 'virtualWans-20211204T1812029146Z' -templateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
 
 Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep"
 #>
-function Remove-DeployedModule {
+function Initialize-DeploymentRemoval {
 
     [CmdletBinding()]
     param (
@@ -37,7 +37,7 @@ function Remove-DeployedModule {
     begin {
         Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
         # Load functions
-        . (Join-Path $PSScriptRoot 'helper' 'Remove-ModuleDeployment.ps1')
+        . (Join-Path $PSScriptRoot 'helper' 'Remove-Deployment.ps1')
     }
 
     process {
@@ -79,7 +79,7 @@ function Remove-DeployedModule {
                 templateFilePath  = $templateFilePath
                 removalSequence   = $removalSequence
             }
-            Remove-ModuleDeployment @inputObject -Verbose
+            Remove-Deployment @inputObject -Verbose
         }
     }
 
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ModuleDeployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
similarity index 96%
rename from utilities/pipelines/resourceRemoval/helper/Remove-ModuleDeployment.ps1
rename to utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index 27536ed21c..eaa8cba460 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -25,11 +25,11 @@ Optional. The deployment name to use for the removal
 Optional. The path to the deployment file
 
 .EXAMPLE
-Remove-GeneralModule -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg' -TemplateFilePath 'C:/deploy.json'
+Remove-Deployment -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg' -TemplateFilePath 'C:/deploy.json'
 
 Remove a virtual WAN with deployment name 'keyvault-12345' from resource group 'validation-rg'
 #>
-function Remove-GeneralModule {
+function Remove-Deployment {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (

From 4f7c9ce0b514a91f78e1511206af01a3b5663cba Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 01:59:35 +0100
Subject: [PATCH 44/78] Update to latest

---
 ...Remove-DeployedModule.ps1 => Initialize-DeploymentRemoval.ps1} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename utilities/pipelines/resourceRemoval/{Remove-DeployedModule.ps1 => Initialize-DeploymentRemoval.ps1} (100%)

diff --git a/utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
similarity index 100%
rename from utilities/pipelines/resourceRemoval/Remove-DeployedModule.ps1
rename to utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1

From 207a08ca38052189c4f981ba40b410799d417ec8 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 10:33:26 +0100
Subject: [PATCH 45/78] Added missing Az modules

---
 utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
index 590d5181a8..f2f09a9127 100644
--- a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
+++ b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
@@ -102,6 +102,8 @@ function Set-EnvironmentOnAgent {
             @{ Name = 'Az.Network' },
             @{ Name = 'Az.ContainerRegistry' },
             @{ Name = 'Az.KeyVault' },
+            @{ Name = 'Az.RecoveryServices' },
+            @{ Name = 'Az.Monitor' },
             @{ Name = 'Pester'; Version = '5.3.0' }
         )
     )

From a80ba4124bb05900331eabc8ad3a7985962e5cc3 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 19:38:19 +0100
Subject: [PATCH 46/78] Update to latest

---
 .../pipelines/resourceRemoval/helper/Remove-Deployment.ps1    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index eaa8cba460..b19370aede 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -82,11 +82,11 @@ function Remove-Deployment {
             scope             = $deploymentScope
             resourceGroupName = $resourceGroupName
         }
-        $deployments = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
+        $deploymentResourceIds = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
 
         # Pre-Filter & order items
         # ========================
-        $rawResourceIdsToRemove = $deployments | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
+        $rawResourceIdsToRemove = $deploymentResourceIds | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
 
         # Format items
         # ============

From 60b0865b3f6e5d2dd71e5396c40e8836bf29b97a Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:40:03 +0100
Subject: [PATCH 47/78] Update to latest

---
 utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 66e0659b77..2a789b68bb 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -10,7 +10,7 @@ Works on a resource group, subscription, managementgroup and tenant level
 Mandatory. The path to the deployment file
 
 .PARAMETER parameterFilePath
-Mandatory. Path to the parameter file from root. Can be a single file, multiple files, or directory that conains (.json) files.
+Mandatory. Path to the parameter file from root. Can be a single file, multiple files, or directory that contains (.json) files.
 
 .PARAMETER location
 Mandatory. Location to test in. E.g. WestEurope

From 736066178fa5ce6e4d4a2ff0c69403b8285ddb08 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:43:29 +0100
Subject: [PATCH 48/78] Update to latest

---
 .../New-ModuleDeployment.ps1                  | 145 ------------------
 1 file changed, 145 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 2a789b68bb..cb5586b79e 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -217,148 +217,3 @@ function New-ModuleDeployment {
         Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
     }
 }
-    }
-    until ($Stoploop -eq $true -or $retryCount -gt $retryLimit)
-
-    Write-Verbose 'Result' -Verbose
-    Write-Verbose '------' -Verbose
-    Write-Verbose ($res | Out-String) -Verbose
-    return @{
-        deploymentName   = $deploymentName
-        deploymentOutput = $res.Outputs
-    }
-}
-#endregion
-
-<#
-.SYNOPSIS
-Run a template deployment using a given parameter file
-
-.DESCRIPTION
-Run a template deployment using a given parameter file.
-Works on a resource group, subscription, managementgroup and tenant level
-
-.PARAMETER templateFilePath
-Mandatory. The path to the deployment file
-
-.PARAMETER parameterFilePath
-Optional. Path to the parameter file from root. Can be a single file, multiple files, or directory that contains (.json) files.
-
-.PARAMETER location
-Mandatory. Location to test in. E.g. WestEurope
-
-.PARAMETER resourceGroupName
-Optional. Name of the resource group to deploy into. Mandatory if deploying into a resource group (resource group level)
-
-.PARAMETER subscriptionId
-Optional. ID of the subscription to deploy into. Mandatory if deploying into a subscription (subscription level) using a Management groups service connection
-
-.PARAMETER managementGroupId
-Optional. Name of the management group to deploy into. Mandatory if deploying into a management group (management group level)
-
-.PARAMETER additionalTags
-Optional. Provde a Key Value Pair (Object) that will be appended to the Parameter file tags. Example: @{myKey = 'myValue',myKey2 = 'myValue2'}.
-
-.PARAMETER retryLimit
-Optional. Maximum retry limit if the deployment fails. Default is 3.
-
-.PARAMETER doNotThrow
-Optional. Do not throw an exception if it failed. Still returns the error message though
-
-.EXAMPLE
-New-ModuleDeployment -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
-
-Deploy the deploy.json of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
-
-.EXAMPLE
-New-ModuleDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.parameters/parameters.json' -location 'WestEurope'
-
-Deploy the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
-#>
-function New-ModuleDeployment {
-
-    [CmdletBinding(SupportsShouldProcess)]
-    param (
-        [Parameter(Mandatory)]
-        [string] $templateFilePath,
-
-        [Parameter(Mandatory = $false)]
-        [string[]] $parameterFilePath,
-
-        [Parameter(Mandatory)]
-        [string] $location,
-
-        [Parameter(Mandatory = $false)]
-        [string] $resourceGroupName = '',
-
-        [Parameter(Mandatory = $false)]
-        [string] $subscriptionId,
-
-        [Parameter(Mandatory = $false)]
-        [string] $managementGroupId,
-
-        [Parameter(Mandatory = $false)]
-        [Hashtable]$additionalParameters,
-
-        [Parameter(Mandatory = $false)]
-        [PSCustomObject]$additionalTags,
-
-        [Parameter(Mandatory = $false)]
-        [switch] $doNotThrow,
-
-        [Parameter(Mandatory = $false)]
-        [int]$retryLimit = 3
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-
-        # Load helper
-        . (Join-Path (Get-Item -Path $PSScriptRoot).parent.FullName 'sharedScripts' 'Get-ScopeOfTemplateFile.ps1')
-    }
-
-    process {
-        ## Assess Provided Parameter Path
-        if ((-not [String]::IsNullOrEmpty($parameterFilePath)) -and (Test-Path -Path $parameterFilePath -PathType 'Container') -and $parameterFilePath.Length -eq 1) {
-            ## Transform Path to Files
-            $parameterFilePath = Get-ChildItem $parameterFilePath -Recurse -Filter *.json | Select-Object -ExpandProperty FullName
-            Write-Verbose "Detected Parameter File(s)/Directory - Count: `n $($parameterFilePath.Count)"
-        }
-
-        ## Iterate through each file
-        $deploymentInputObject = @{
-            templateFilePath     = $templateFilePath
-            additionalTags       = $additionalTags
-            additionalParameters = $additionalParameters
-            location             = $location
-            resourceGroupName    = $resourceGroupName
-            subscriptionId       = $subscriptionId
-            managementGroupId    = $managementGroupId
-            doNotThrow           = $doNotThrow
-            retryLimit           = $retryLimit
-        }
-        if ($parameterFilePath) {
-            if ($parameterFilePath -is [array]) {
-                $deploymentResult = [System.Collections.ArrayList]@()
-                foreach ($parameterFile in $parameterFilePath) {
-                    if ($PSCmdlet.ShouldProcess("Deployment for parameter file [$parameterFilePath]", 'Trigger')) {
-                        $deploymentResult += New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $parameterFile
-                    }
-                }
-                return $deploymentResult
-            } else {
-                if ($PSCmdlet.ShouldProcess("Deployment for single parameter file [$parameterFilePath]", 'Trigger')) {
-                    return New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $parameterFilePath
-                }
-            }
-        } else {
-            if ($PSCmdlet.ShouldProcess('Deployment without parameter file', 'Trigger')) {
-                return New-DeploymentWithParameterFile @deploymentInputObject
-            }
-        }
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}

From b86edf0c8fb7ee500e552c365b5f9b5b2cf5a7b5 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:49:51 +0100
Subject: [PATCH 49/78] Update to latest

---
 .../New-ModuleDeployment.ps1                  | 356 ++++++++++++------
 1 file changed, 246 insertions(+), 110 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index cb5586b79e..770c9b264b 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -1,3 +1,4 @@
+#region helper
 <#
 .SYNOPSIS
 Run a template deployment using a given parameter file
@@ -10,7 +11,7 @@ Works on a resource group, subscription, managementgroup and tenant level
 Mandatory. The path to the deployment file
 
 .PARAMETER parameterFilePath
-Mandatory. Path to the parameter file from root. Can be a single file, multiple files, or directory that contains (.json) files.
+Optional. Path to the parameter file from root. Can be a single file, multiple files, or directory that contains (.json) files.
 
 .PARAMETER location
 Mandatory. Location to test in. E.g. WestEurope
@@ -34,31 +35,31 @@ Optional. Maximum retry limit if the deployment fails. Default is 3.
 Optional. Do not throw an exception if it failed. Still returns the error message though
 
 .EXAMPLE
-New-ModuleDeployment -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+New-DeploymentWithParameterFile -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
 
 Deploy the deploy.json of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
 
 .EXAMPLE
-New-ModuleDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.parameters/parameters.json' -location 'WestEurope'
+New-DeploymentWithParameterFile -templateFilePath 'C:/ResourceGroup/deploy.json' -location 'WestEurope'
 
-Deploy the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
+Deploy the deploy.json of the ResourceGroup module without a parameter file in location 'WestEurope'
 #>
-function New-ModuleDeployment {
+function New-DeploymentWithParameterFile {
 
-    [CmdletBinding(SupportsShouldProcess)]
+    [CmdletBinding(SupportsShouldProcess = $true)]
     param (
         [Parameter(Mandatory)]
         [string] $templateFilePath,
 
-        [Parameter(Mandatory)]
-        [string[]] $parameterFilePath,
+        [Parameter(Mandatory = $false)]
+        [string] $parameterFilePath,
+
+        [Parameter(Mandatory = $false)]
+        [string] $resourceGroupName = '',
 
         [Parameter(Mandatory)]
         [string] $location,
 
-        [Parameter(Mandatory = $false)]
-        [string] $resourceGroupName,
-
         [Parameter(Mandatory = $false)]
         [string] $subscriptionId,
 
@@ -68,6 +69,9 @@ function New-ModuleDeployment {
         [Parameter(Mandatory = $false)]
         [PSCustomObject]$additionalTags,
 
+        [Parameter(Mandatory = $false)]
+        [Hashtable]$additionalParameters,
+
         [Parameter(Mandatory = $false)]
         [switch] $doNotThrow,
 
@@ -83,133 +87,265 @@ function New-ModuleDeployment {
     }
 
     process {
-
         $moduleName = Split-Path -Path (Split-Path $templateFilePath -Parent) -LeafBase
 
-        ## Assess Provided Parameter Path
-        if ((Test-Path -Path $parameterFilePath -PathType Container) -and $parameterFilePath.Length -eq 1) {
-            ## Transform Path to Files
-            $parameterFilePath = Get-ChildItem $parameterFilePath -Recurse -Filter *.json | Select-Object -ExpandProperty FullName
-            Write-Verbose "Detected Parameter File(s)/Directory - Count: `n $($parameterFilePath.Count)"
+        [bool]$Stoploop = $false
+        [int]$retryCount = 1
+
+        # Generate a valid deployment name. Must match ^[-\w\._\(\)]+$
+        do {
+            $deploymentName = "$moduleName-$(-join (Get-Date -Format yyyyMMddTHHMMssffffZ)[0..63])"
+        } while ($deploymentName -notmatch '^[-\w\._\(\)]+$')
+
+        Write-Verbose "Deploying with deployment name [$deploymentName]" -Verbose
+
+        $DeploymentInputs = @{
+            DeploymentName = $deploymentName
+            TemplateFile   = $templateFilePath
+            Verbose        = $true
+            ErrorAction    = 'Stop'
         }
 
-        ## Iterate through each file
-        foreach ($parameterFile in $parameterFilePath) {
+        if ($additionalParameters) {
+            $DeploymentInputs += $additionalParameters
+        }
+
+        if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
+            $DeploymentInputs['TemplateParameterFile'] = $parameterFile
             $fileProperties = Get-Item -Path $parameterFile
             Write-Verbose "Deploying: $($fileProperties.Name)"
-            [bool]$Stoploop = $false
-            [int]$retryCount = 1
-
-            # Generate a valid deployment name. Must match ^[-\w\._\(\)]+$
-            do {
-                $deploymentName = "$moduleName-$(-join (Get-Date -Format yyyyMMddTHHMMssffffZ)[0..63])"
-            } while ($deploymentName -notmatch '^[-\w\._\(\)]+$')
-
-            Write-Verbose "Deploying with deployment name [$deploymentName]" -Verbose
-
-            $DeploymentInputs = @{
-                DeploymentName        = $deploymentName
-                TemplateFile          = $templateFilePath
-                TemplateParameterFile = $parameterFile
-                Verbose               = $true
-                ErrorAction           = 'Stop'
-            }
+        }
 
-            ## Append Tags to Parameters if Resource supports them (all tags must be in one object)
-            if ($additionalTags) {
+        ## Append Tags to Parameters if Resource supports them (all tags must be in one object)
+        if ($additionalTags) {
 
-                # Parameter tags
+            # Parameter tags
+            if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
                 $parameterFileTags = (ConvertFrom-Json (Get-Content -Raw -Path $parameterFile) -AsHashtable).parameters.tags.value
-                if ($parameterFileTags) { $parameterFileTags = @{} }
+            }
+            if (-not $parameterFileTags) { $parameterFileTags = @{} }
 
-                # Pipeline tags
-                if ($additionalTags) { $parameterFileTags += $additionalTags } # If additionalTags object is provided, append tag to the resource
+            # Pipeline tags
+            if ($additionalTags) { $parameterFileTags += $additionalTags } # If additionalTags object is provided, append tag to the resource
 
-                # Overwrites parameter file tags parameter
-                Write-Verbose ("additionalTags: $(($additionalTags) ? ($additionalTags | ConvertTo-Json) : '[]')")
-                $DeploymentInputs += @{Tags = $parameterFileTags }
-            }
+            # Overwrites parameter file tags parameter
+            Write-Verbose ("additionalTags: $(($additionalTags) ? ($additionalTags | ConvertTo-Json) : '[]')")
+            $DeploymentInputs += @{Tags = $parameterFileTags }
+        }
 
-            $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
-
-            #######################
-            ## INVOKE DEPLOYMENT ##
-            #######################
-            do {
-                try {
-                    switch ($deploymentScope) {
-                        'resourceGroup' {
-                            if ($subscriptionId) {
-                                $Context = Get-AzContext -ListAvailable | Where-Object Subscription -Match $subscriptionId
-                                if ($Context) {
-                                    $null = $Context | Set-AzContext
-                                }
-                            }
-                            if (-not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
-                                if ($PSCmdlet.ShouldProcess("Resource group [$resourceGroupName] in location [$location]", 'Create')) {
-                                    New-AzResourceGroup -Name $resourceGroupName -Location $location
-                                }
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
+
+        #######################
+        ## INVOKE DEPLOYMENT ##
+        #######################
+        do {
+            try {
+                switch ($deploymentScope) {
+                    'resourceGroup' {
+                        if ($subscriptionId) {
+                            $Context = Get-AzContext -ListAvailable | Where-Object Subscription -Match $subscriptionId
+                            if ($Context) {
+                                $null = $Context | Set-AzContext
                             }
-                            if ($PSCmdlet.ShouldProcess('Resource group level deployment', 'Create')) {
-                                $res = New-AzResourceGroupDeployment @DeploymentInputs -ResourceGroupName $resourceGroupName
-                            }
-                            break
                         }
-                        'subscription' {
-                            if ($subscriptionId) {
-                                $Context = Get-AzContext -ListAvailable | Where-Object Subscription -Match $subscriptionId
-                                if ($Context) {
-                                    $null = $Context | Set-AzContext
-                                }
-                            }
-                            if ($PSCmdlet.ShouldProcess('Subscription level deployment', 'Create')) {
-                                $res = New-AzSubscriptionDeployment @DeploymentInputs -Location $location
+                        if (-not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
+                            if ($PSCmdlet.ShouldProcess("Resource group [$resourceGroupName] in location [$location]", 'Create')) {
+                                New-AzResourceGroup -Name $resourceGroupName -Location $location
                             }
-                            break
                         }
-                        'managementGroup' {
-                            if ($PSCmdlet.ShouldProcess('Management group level deployment', 'Create')) {
-                                $res = New-AzManagementGroupDeployment @DeploymentInputs -Location $location -ManagementGroupId $managementGroupId
-                            }
-                            break
+                        if ($PSCmdlet.ShouldProcess('Resource group level deployment', 'Create')) {
+                            $res = New-AzResourceGroupDeployment @DeploymentInputs -ResourceGroupName $resourceGroupName
                         }
-                        'tenant' {
-                            if ($PSCmdlet.ShouldProcess('Tenant level deployment', 'Create')) {
-                                $res = New-AzTenantDeployment @DeploymentInputs -Location $location
+                        break
+                    }
+                    'subscription' {
+                        if ($subscriptionId) {
+                            $Context = Get-AzContext -ListAvailable | Where-Object Subscription -Match $subscriptionId
+                            if ($Context) {
+                                $null = $Context | Set-AzContext
                             }
-                            break
                         }
-                        default {
-                            throw "[$deploymentScope] is a non-supported template scope"
-                            $Stoploop = $true
+                        if ($PSCmdlet.ShouldProcess('Subscription level deployment', 'Create')) {
+                            $res = New-AzSubscriptionDeployment @DeploymentInputs -Location $location
                         }
+                        break
                     }
-                    $Stoploop = $true
-                } catch {
-                    if ($retryCount -ge $retryLimit) {
-                        if ($doNotThrow) {
-                            return @{
-                                DeploymentName = $deploymentName
-                                Exception      = $PSitem.Exception.Message
-                            }
-                        } else {
-                            throw $PSitem.Exception.Message
+                    'managementGroup' {
+                        if ($PSCmdlet.ShouldProcess('Management group level deployment', 'Create')) {
+                            $res = New-AzManagementGroupDeployment @DeploymentInputs -Location $location -ManagementGroupId $managementGroupId
                         }
+                        break
+                    }
+                    'tenant' {
+                        if ($PSCmdlet.ShouldProcess('Tenant level deployment', 'Create')) {
+                            $res = New-AzTenantDeployment @DeploymentInputs -Location $location
+                        }
+                        break
+                    }
+                    default {
+                        throw "[$deploymentScope] is a non-supported template scope"
                         $Stoploop = $true
+                    }
+                }
+                $Stoploop = $true
+            } catch {
+                if ($retryCount -ge $retryLimit) {
+                    if ($doNotThrow) {
+                        return @{
+                            DeploymentName = $deploymentName
+                            Exception      = $PSitem.Exception.Message
+                        }
                     } else {
-                        Write-Verbose "Resource deployment Failed.. ($retryCount/$retryLimit) Retrying in 5 Seconds.. `n"
-                        Write-Verbose ($PSitem.Exception.Message | Out-String) -Verbose
-                        Start-Sleep -Seconds 5
-                        $retryCount++
+                        throw $PSitem.Exception.Message
                     }
+                    $Stoploop = $true
+                } else {
+                    Write-Verbose "Resource deployment Failed.. ($retryCount/$retryLimit) Retrying in 5 Seconds.. `n"
+                    Write-Verbose ($PSitem.Exception.Message | Out-String) -Verbose
+                    Start-Sleep -Seconds 5
+                    $retryCount++
                 }
             }
-            until ($Stoploop -eq $true -or $retryCount -gt $retryLimit)
+        }
+        until ($Stoploop -eq $true -or $retryCount -gt $retryLimit)
+
+        Write-Verbose 'Result' -Verbose
+        Write-Verbose '------' -Verbose
+        Write-Verbose ($res | Out-String) -Verbose
+        return @{
+            deploymentName   = $deploymentName
+            deploymentOutput = $res.Outputs
+        }
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}
+#endregion
+
+<#
+.SYNOPSIS
+Run a template deployment using a given parameter file
+
+.DESCRIPTION
+Run a template deployment using a given parameter file.
+Works on a resource group, subscription, managementgroup and tenant level
+
+.PARAMETER templateFilePath
+Mandatory. The path to the deployment file
+
+.PARAMETER parameterFilePath
+Optional. Path to the parameter file from root. Can be a single file, multiple files, or directory that contains (.json) files.
+
+.PARAMETER location
+Mandatory. Location to test in. E.g. WestEurope
+
+.PARAMETER resourceGroupName
+Optional. Name of the resource group to deploy into. Mandatory if deploying into a resource group (resource group level)
+
+.PARAMETER subscriptionId
+Optional. ID of the subscription to deploy into. Mandatory if deploying into a subscription (subscription level) using a Management groups service connection
 
-            Write-Verbose 'Result' -Verbose
-            Write-Verbose '------' -Verbose
-            Write-Verbose ($res | Out-String) -Verbose
-            return $deploymentName
+.PARAMETER managementGroupId
+Optional. Name of the management group to deploy into. Mandatory if deploying into a management group (management group level)
+
+.PARAMETER additionalTags
+Optional. Provde a Key Value Pair (Object) that will be appended to the Parameter file tags. Example: @{myKey = 'myValue',myKey2 = 'myValue2'}.
+
+.PARAMETER retryLimit
+Optional. Maximum retry limit if the deployment fails. Default is 3.
+
+.PARAMETER doNotThrow
+Optional. Do not throw an exception if it failed. Still returns the error message though
+
+.EXAMPLE
+New-ModuleDeployment -templateFilePath 'C:/KeyVault/deploy.json' -parameterFilePath 'C:/KeyVault/.parameters/parameters.json' -location 'WestEurope' -resourceGroupName 'aLegendaryRg'
+
+Deploy the deploy.json of the KeyVault module with the parameter file 'parameters.json' using the resource group 'aLegendaryRg' in location 'WestEurope'
+
+.EXAMPLE
+New-ModuleDeployment -templateFilePath 'C:/ResourceGroup/deploy.json' -parameterFilePath 'C:/ResourceGroup/.parameters/parameters.json' -location 'WestEurope'
+
+Deploy the deploy.json of the ResourceGroup module with the parameter file 'parameters.json' in location 'WestEurope'
+#>
+function New-ModuleDeployment {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [string] $templateFilePath,
+
+        [Parameter(Mandatory = $false)]
+        [string[]] $parameterFilePath,
+
+        [Parameter(Mandatory)]
+        [string] $location,
+
+        [Parameter(Mandatory = $false)]
+        [string] $resourceGroupName = '',
+
+        [Parameter(Mandatory = $false)]
+        [string] $subscriptionId,
+
+        [Parameter(Mandatory = $false)]
+        [string] $managementGroupId,
+
+        [Parameter(Mandatory = $false)]
+        [Hashtable]$additionalParameters,
+
+        [Parameter(Mandatory = $false)]
+        [PSCustomObject]$additionalTags,
+
+        [Parameter(Mandatory = $false)]
+        [switch] $doNotThrow,
+
+        [Parameter(Mandatory = $false)]
+        [int]$retryLimit = 3
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+    }
+
+    process {
+        ## Assess Provided Parameter Path
+        if ((-not [String]::IsNullOrEmpty($parameterFilePath)) -and (Test-Path -Path $parameterFilePath -PathType 'Container') -and $parameterFilePath.Length -eq 1) {
+            ## Transform Path to Files
+            $parameterFilePath = Get-ChildItem $parameterFilePath -Recurse -Filter *.json | Select-Object -ExpandProperty FullName
+            Write-Verbose "Detected Parameter File(s)/Directory - Count: `n $($parameterFilePath.Count)"
+        }
+
+        ## Iterate through each file
+        $deploymentInputObject = @{
+            templateFilePath     = $templateFilePath
+            additionalTags       = $additionalTags
+            additionalParameters = $additionalParameters
+            location             = $location
+            resourceGroupName    = $resourceGroupName
+            subscriptionId       = $subscriptionId
+            managementGroupId    = $managementGroupId
+            doNotThrow           = $doNotThrow
+            retryLimit           = $retryLimit
+        }
+        if ($parameterFilePath) {
+            if ($parameterFilePath -is [array]) {
+                $deploymentResult = [System.Collections.ArrayList]@()
+                foreach ($parameterFile in $parameterFilePath) {
+                    if ($PSCmdlet.ShouldProcess("Deployment for parameter file [$parameterFilePath]", 'Trigger')) {
+                        $deploymentResult += New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $parameterFile
+                    }
+                }
+                return $deploymentResult
+            } else {
+                if ($PSCmdlet.ShouldProcess("Deployment for single parameter file [$parameterFilePath]", 'Trigger')) {
+                    return New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $parameterFilePath
+                }
+            }
+        } else {
+            if ($PSCmdlet.ShouldProcess('Deployment without parameter file', 'Trigger')) {
+                return New-DeploymentWithParameterFile @deploymentInputObject
+            }
         }
     }
 

From 234b1315b55f60bc119b4788e303b7b5a5720c01 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:50:48 +0100
Subject: [PATCH 50/78] Update to latest

---
 utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 770c9b264b..bd312170d3 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -116,7 +116,7 @@ function New-DeploymentWithParameterFile {
             Write-Verbose "Deploying: $($fileProperties.Name)"
         }
 
-        ## Append Tags to Parameters if Resource supports them (all tags must be in one object)
+        # Append tags to parameters if resource supports them (all tags must be in one object)
         if ($additionalTags) {
 
             # Parameter tags

From e7e56614341d67bd8e1c7dd27ada90b8e8fab956 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:54:44 +0100
Subject: [PATCH 51/78] Update to latest

---
 .../New-ModuleDeployment.ps1                  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index bd312170d3..2b7c7b6a5a 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -28,6 +28,9 @@ Optional. Name of the management group to deploy into. Mandatory if deploying in
 .PARAMETER additionalTags
 Optional. Provde a Key Value Pair (Object) that will be appended to the Parameter file tags. Example: @{myKey = 'myValue',myKey2 = 'myValue2'}.
 
+.PARAMETER additionalParameters
+Optional. Additional parameters you can provide with the deployment. E.g. @{ resourceGroupName = 'myResourceGroup' }
+
 .PARAMETER retryLimit
 Optional. Maximum retry limit if the deployment fails. Default is 3.
 
@@ -67,10 +70,10 @@ function New-DeploymentWithParameterFile {
         [string] $managementGroupId,
 
         [Parameter(Mandatory = $false)]
-        [PSCustomObject]$additionalTags,
+        [PSCustomObject] $additionalTags,
 
         [Parameter(Mandatory = $false)]
-        [Hashtable]$additionalParameters,
+        [Hashtable] $additionalParameters,
 
         [Parameter(Mandatory = $false)]
         [switch] $doNotThrow,
@@ -89,9 +92,6 @@ function New-DeploymentWithParameterFile {
     process {
         $moduleName = Split-Path -Path (Split-Path $templateFilePath -Parent) -LeafBase
 
-        [bool]$Stoploop = $false
-        [int]$retryCount = 1
-
         # Generate a valid deployment name. Must match ^[-\w\._\(\)]+$
         do {
             $deploymentName = "$moduleName-$(-join (Get-Date -Format yyyyMMddTHHMMssffffZ)[0..63])"
@@ -138,6 +138,9 @@ function New-DeploymentWithParameterFile {
         #######################
         ## INVOKE DEPLOYMENT ##
         #######################
+        [bool]$Stoploop = $false
+        [int]$retryCount = 1
+
         do {
             try {
                 switch ($deploymentScope) {
@@ -253,6 +256,9 @@ Optional. Name of the management group to deploy into. Mandatory if deploying in
 .PARAMETER additionalTags
 Optional. Provde a Key Value Pair (Object) that will be appended to the Parameter file tags. Example: @{myKey = 'myValue',myKey2 = 'myValue2'}.
 
+.PARAMETER additionalParameters
+Optional. Additional parameters you can provide with the deployment. E.g. @{ resourceGroupName = 'myResourceGroup' }
+
 .PARAMETER retryLimit
 Optional. Maximum retry limit if the deployment fails. Default is 3.
 
@@ -292,10 +298,10 @@ function New-ModuleDeployment {
         [string] $managementGroupId,
 
         [Parameter(Mandatory = $false)]
-        [Hashtable]$additionalParameters,
+        [Hashtable] $additionalParameters,
 
         [Parameter(Mandatory = $false)]
-        [PSCustomObject]$additionalTags,
+        [PSCustomObject] $additionalTags,
 
         [Parameter(Mandatory = $false)]
         [switch] $doNotThrow,

From 4f4bcd525db641c592f24dc57d12af08d63e0a06 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:56:43 +0100
Subject: [PATCH 52/78] Update to latest

---
 utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 2b7c7b6a5a..7b9b48bc00 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -112,8 +112,6 @@ function New-DeploymentWithParameterFile {
 
         if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
             $DeploymentInputs['TemplateParameterFile'] = $parameterFile
-            $fileProperties = Get-Item -Path $parameterFile
-            Write-Verbose "Deploying: $($fileProperties.Name)"
         }
 
         # Append tags to parameters if resource supports them (all tags must be in one object)

From 62a290af1e340dc486d4e94593beb0c33248f39e Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 20:57:45 +0100
Subject: [PATCH 53/78] Update to latest

---
 .../resourceDeployment/New-ModuleDeployment.ps1    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index 7b9b48bc00..e1c745d312 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -106,14 +106,17 @@ function New-DeploymentWithParameterFile {
             ErrorAction    = 'Stop'
         }
 
-        if ($additionalParameters) {
-            $DeploymentInputs += $additionalParameters
-        }
-
+        # Parameter file provided yes/no
         if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
             $DeploymentInputs['TemplateParameterFile'] = $parameterFile
         }
 
+        # Additional parameter object provided yes/no
+        if ($additionalParameters) {
+            $DeploymentInputs += $additionalParameters
+        }
+
+        # Additional tags provides yes/no
         # Append tags to parameters if resource supports them (all tags must be in one object)
         if ($additionalTags) {
 
@@ -131,11 +134,10 @@ function New-DeploymentWithParameterFile {
             $DeploymentInputs += @{Tags = $parameterFileTags }
         }
 
-        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
-
         #######################
         ## INVOKE DEPLOYMENT ##
         #######################
+        $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $templateFilePath
         [bool]$Stoploop = $false
         [int]$retryCount = 1
 

From 9d1ee582f86b06775f720f3dbe36777c25e8078f Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 21:27:11 +0100
Subject: [PATCH 54/78] Update to latest

---
 .../actions/templates/validateModuleDeployment/action.yml  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index dd3a8844f3..d6402b4c1d 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -145,11 +145,11 @@ runs:
       shell: pwsh
       if: ${{ always() && steps.deploy_step.outputs.deploymentName != '' }}
       run: |
-        if('${{ inputs.removeDeployment }}' -eq 'true') {
+        if ('${{ inputs.removeDeployment }}' -eq 'true') {
           # Load used function
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceRemoval' 'Initialize-DeploymentRemoval.ps1')
 
-          if(-not [String]::IsNullOrEmpty('${{ steps.deploy_step.outputs.deploymentName }}')) {
+          if (-not [String]::IsNullOrEmpty('${{ steps.deploy_step.outputs.deploymentName }}')) {
             $functionInput = @{
               deploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
               templateFilePath  = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}'
@@ -160,5 +160,6 @@ runs:
             Write-Verbose 'Invoke task with' -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-          Initialize-DeploymentRemoval @functionInput
+            Initialize-DeploymentRemoval @functionInput
+          }
         }

From 6d4d7b0d1f67a039667bb299a8ace569a0657a61 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 22:37:01 +0100
Subject: [PATCH 55/78] Added cognitive services purge

---
 .github/workflows/ms.cognitiveservices.accounts.yml  |  2 +-
 .../helper/Invoke-ResourcePostRemoval.ps1            | 12 ++++++++++++
 .../sharedScripts/Set-EnvironmentOnAgent.ps1         |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index 8c2d54ab9f..af7c54fd41 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -7,7 +7,7 @@ on:
         type: boolean
         description: 'Remove deployed module'
         required: false
-        default: 'false' # Soft-delete prevents re-deployment
+        default: 'true'
       versioningOption:
         type: choice
         description: 'The mode to handle the version increments [major|minor|patch]'
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 6b2702fdb6..891a74fc3c 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -39,6 +39,18 @@ function Invoke-ResourcePostRemoval {
                 }
             }
         }
+        'Microsoft.CognitiveServices/accounts' {
+            $name = $resourceToRemove.resourceId.Split('/')[-1]
+            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
+
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name -and $resourceGroupName -eq $resourceGroupName }
+            if ($matchingAccount) {
+                Write-Verbose "Purging cognitive services account [$name]" -Verbose
+                if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
+                    $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location
+                }
+            }
+        }
         'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
             # Remove protected VM
             # Required if e.g. a VM was listed in an RSV and only that VM is removed
diff --git a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1 b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
index f2f09a9127..72149ff01a 100644
--- a/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
+++ b/utilities/pipelines/sharedScripts/Set-EnvironmentOnAgent.ps1
@@ -104,6 +104,7 @@ function Set-EnvironmentOnAgent {
             @{ Name = 'Az.KeyVault' },
             @{ Name = 'Az.RecoveryServices' },
             @{ Name = 'Az.Monitor' },
+            @{ Name = 'Az.CognitiveServices' },
             @{ Name = 'Pester'; Version = '5.3.0' }
         )
     )

From e826bb2772c1c1597999944714e093ec1e99df86 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 22:57:49 +0100
Subject: [PATCH 56/78] Update to latest

---
 .github/workflows/ms.apimanagement.service.yml        |  2 +-
 .../helper/Invoke-ResourcePostRemoval.ps1             | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index 85a77af98d..a6378fd71f 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -7,7 +7,7 @@ on:
         type: boolean
         description: 'Remove deployed module'
         required: false
-        default: 'false' # Soft-delete prevents re-deployment
+        default: 'true'
       versioningOption:
         type: choice
         description: 'The mode to handle the version increments [major|minor|patch]'
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 891a74fc3c..450d29ac77 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -51,6 +51,17 @@ function Invoke-ResourcePostRemoval {
                 }
             }
         }
+        'Microsoft.ApiManagement/service' {
+            $apiManagementService = Get-AzResource -ResourceId $resourceToRemove.resourceId
+            $requestInputObject = @{
+                Method  = 'DELETE'
+                Uri     = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $apiManagementService.SubscriptionId, $apiManagementService.Location, $apiManagementService.Name
+                Headers = @{
+                    Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
+                }
+            }
+            Invoke-RestMethod @requestInputObject
+        }
         'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
             # Remove protected VM
             # Required if e.g. a VM was listed in an RSV and only that VM is removed

From 055ed369eb9f667a1f8957d50e595bda26d9e3ae Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 23:12:53 +0100
Subject: [PATCH 57/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 450d29ac77..7d2c058d4b 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -47,7 +47,7 @@ function Invoke-ResourcePostRemoval {
             if ($matchingAccount) {
                 Write-Verbose "Purging cognitive services account [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
-                    $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location
+                    $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location
                 }
             }
         }

From 1d32148f8552b48ecea4f22d39507c8c4d87f910 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 23:17:47 +0100
Subject: [PATCH 58/78] Update to latest

---
 .../helper/Invoke-ResourcePostRemoval.ps1              | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 7d2c058d4b..8731c798ea 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -31,7 +31,7 @@ function Invoke-ResourcePostRemoval {
             $name = $resourceToRemove.resourceId.Split('/')[-1]
             $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $resourceGroupName -eq $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
                 Write-Verbose "Purging key vault [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
@@ -43,7 +43,7 @@ function Invoke-ResourcePostRemoval {
             $name = $resourceToRemove.resourceId.Split('/')[-1]
             $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
 
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name -and $resourceGroupName -eq $resourceGroupName }
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name -and $_.resourceGroupName -eq $resourceGroupName }
             if ($matchingAccount) {
                 Write-Verbose "Purging cognitive services account [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
@@ -52,10 +52,12 @@ function Invoke-ResourcePostRemoval {
             }
         }
         'Microsoft.ApiManagement/service' {
-            $apiManagementService = Get-AzResource -ResourceId $resourceToRemove.resourceId
+            $subscriptionId = $resourceToRemove.resourceId.Split('/')[2]
+            $name = $resourceToRemove.resourceId.Split('/')[-1]
+            $uri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $apiManagementService.Location, $name
             $requestInputObject = @{
                 Method  = 'DELETE'
-                Uri     = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $apiManagementService.SubscriptionId, $apiManagementService.Location, $apiManagementService.Name
+                Uri     = $uri
                 Headers = @{
                     Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
                 }

From abce8e34f88a0aa6398c0e0d7dcc6dcb1063b382 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 23:28:08 +0100
Subject: [PATCH 59/78] Enabled purge on api management

---
 .../helper/Invoke-ResourcePostRemoval.ps1     | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 8731c798ea..4fdaa08343 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -28,10 +28,9 @@ function Invoke-ResourcePostRemoval {
 
     switch ($resourceToRemove.type) {
         'Microsoft.KeyVault/vaults' {
-            $name = $resourceToRemove.resourceId.Split('/')[-1]
             $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $_.resourceGroupName -EQ $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceToRemove.name -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
                 Write-Verbose "Purging key vault [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
@@ -40,12 +39,10 @@ function Invoke-ResourcePostRemoval {
             }
         }
         'Microsoft.CognitiveServices/accounts' {
-            $name = $resourceToRemove.resourceId.Split('/')[-1]
             $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
 
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name -and $_.resourceGroupName -eq $resourceGroupName }
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $resourceToRemove.name -and $_.resourceGroupName -eq $resourceGroupName }
             if ($matchingAccount) {
-                Write-Verbose "Purging cognitive services account [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
                     $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location
                 }
@@ -53,16 +50,32 @@ function Invoke-ResourcePostRemoval {
         }
         'Microsoft.ApiManagement/service' {
             $subscriptionId = $resourceToRemove.resourceId.Split('/')[2]
-            $name = $resourceToRemove.resourceId.Split('/')[-1]
-            $uri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $apiManagementService.Location, $name
+
+            # Fetch service in soft-delete
+            $getUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01' -f $subscriptionId
             $requestInputObject = @{
-                Method  = 'DELETE'
-                Uri     = $uri
+                Method  = 'GET'
+                Uri     = $getUri
                 Headers = @{
                     Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
                 }
             }
-            Invoke-RestMethod @requestInputObject
+            $softDeletedService = (Invoke-RestMethod @requestInputObject).value | Where-Object { $_.properties.serviceId -eq $resourceToRemove.resourceId }
+
+            if ($softDeletedService) {
+                # Purge service
+                $purgeUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $resourceToRemove.name
+                $requestInputObject = @{
+                    Method  = 'DELETE'
+                    Uri     = $purgeUri
+                    Headers = @{
+                        Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
+                    }
+                }
+                if ($PSCmdlet.ShouldProcess(('API management service with ID [{0}]' -f $softDeletedService.properties.serviceId), 'Purge')) {
+                    Invoke-RestMethod @requestInputObject
+                }
+            }
         }
         'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
             # Remove protected VM

From 1e923264421c85ac26fdd7ff484360493c52d06d Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 23:28:31 +0100
Subject: [PATCH 60/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 4fdaa08343..57386bef0e 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -73,7 +73,7 @@ function Invoke-ResourcePostRemoval {
                     }
                 }
                 if ($PSCmdlet.ShouldProcess(('API management service with ID [{0}]' -f $softDeletedService.properties.serviceId), 'Purge')) {
-                    Invoke-RestMethod @requestInputObject
+                    $null = Invoke-RestMethod @requestInputObject
                 }
             }
         }

From 84448284173a10662184da46c43aabcacdb08f3c Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 11 Dec 2021 23:46:40 +0100
Subject: [PATCH 61/78] Fixed cognitive servies purge

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 57386bef0e..a4a61b75ce 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -40,11 +40,10 @@ function Invoke-ResourcePostRemoval {
         }
         'Microsoft.CognitiveServices/accounts' {
             $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
-
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $resourceToRemove.name -and $_.resourceGroupName -eq $resourceGroupName }
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $resourceToRemove.name }
             if ($matchingAccount) {
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
-                    $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location
+                    $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location -ResourceGroupName $resourceGroupName -Name $matchingAccount.AccountName
                 }
             }
         }

From e804c2ff5e0c8fab60eb8c807197a775b5fdd231 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 12 Dec 2021 10:51:00 +0100
Subject: [PATCH 62/78] Adjusted condition

---
 .../validateModuleDeployment/action.yml       | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index d6402b4c1d..60bfbf9f52 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -143,23 +143,21 @@ runs:
     # -----------------
     - name: 'Remove [${{ inputs.templateFilePath }}] from parameters [${{ inputs.parameterFilePath }}]'
       shell: pwsh
-      if: ${{ always() && steps.deploy_step.outputs.deploymentName != '' }}
+      if: ${{ always() && inputs.removeDeployment == 'true' && steps.deploy_step.outputs.deploymentName != '' }}
       run: |
-        if ('${{ inputs.removeDeployment }}' -eq 'true') {
-          # Load used function
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceRemoval' 'Initialize-DeploymentRemoval.ps1')
-
-          if (-not [String]::IsNullOrEmpty('${{ steps.deploy_step.outputs.deploymentName }}')) {
-            $functionInput = @{
-              deploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
-              templateFilePath  = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}'
-              resourceGroupName = '${{ inputs.resourceGroupName }}'
-              verbose           = $true
-            }
-
-            Write-Verbose 'Invoke task with' -Verbose
-            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
-
-            Initialize-DeploymentRemoval @functionInput
+        # Load used function
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceRemoval' 'Initialize-DeploymentRemoval.ps1')
+
+        if (-not [String]::IsNullOrEmpty('${{ steps.deploy_step.outputs.deploymentName }}')) {
+          $functionInput = @{
+            deploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
+            templateFilePath  = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}'
+            resourceGroupName = '${{ inputs.resourceGroupName }}'
+            verbose           = $true
           }
+
+          Write-Verbose 'Invoke task with' -Verbose
+          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+          Initialize-DeploymentRemoval @functionInput
         }

From 8f5449685c12de8bcee93f0c4e40e52bcd5e6b66 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 12 Dec 2021 11:27:25 +0100
Subject: [PATCH 63/78] Update to latest

---
 docs/wiki/PipelinesDesign.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 893d512a95..106a36cb12 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -262,13 +262,3 @@ Comparing multiple workflows you'll notice they are almost identically, yet diff
     modulePath: 'arm/Microsoft.Network/virtualWans'
     workflowPath: '.github/workflows/ms.network.virtualwans.yml'
   ```
-- (optionally) The relative path to a ***removal script***
-  As described [previously](#removal), some scripts may require custom logic to be removed. This logic should be stored in a script and be referenced by the corresponding module's workflow. To reference this script you can use the `relativePathOfRemovalScript` parameter of the `removeModule` composite action as shown below.
-  ```yaml
-  - name: 'Remove module'
-    uses: ./.github/actions/templates/removeModule
-    with:
-      moduleName: '${{ env.moduleName }}'
-      resourceGroupName: '${{ env.resourceGroupName }}'
-      relativePathOfRemovalScript: 'utilities/pipelines/resourceRemoval/Remove-vWan.ps1'
-  ```

From 5902c699a7aa4126282d9ea97385169c51f4126a Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 13 Dec 2021 18:00:13 +0100
Subject: [PATCH 64/78] Update to latest

---
 docs/wiki/PipelinesDesign.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 48d537e8e7..2d1af45627 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -393,4 +393,3 @@ While they look very similar they have specific areas in which they differ:
       - name: modulePath
         value: '/arm/Microsoft.AnalysisServices/servers'
   ```
->>>>>>> main

From 70c363921672c3f9d8469536ca7545be7e4f9adf Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 13 Dec 2021 18:07:38 +0100
Subject: [PATCH 65/78] Update ADO removal invocation

---
 .../pipelineTemplates/module.jobs.deploy.yml  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.deploy.yml b/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
index 275b2c7400..76cf45a495 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
@@ -278,7 +278,7 @@ jobs:
               pwsh: true
               inline: |
                 # Load used function
-                . (Join-Path '$(moduleRepoRoot)' '$(pipelineFunctionsPath)' 'resourceRemoval' 'Remove-DeployedModule.ps1')
+                . (Join-Path '$(moduleRepoRoot)' '$(pipelineFunctionsPath)' 'resourceRemoval' 'Initialize-DeploymentRemoval.ps1')
 
                 if(-not [String]::IsNullOrEmpty('${{ deploymentBlock.templateFilePath }}')) {
                   $templateFilePath = Join-Path '$(moduleRepoRoot)' '${{ deploymentBlock.templateFilePath }}'
@@ -289,14 +289,16 @@ jobs:
                     (Join-Path '$(ModuleRepoRoot)' '$(modulePath)' 'deploy.json')
                 }
 
-                $functionInput = @{
-                    deploymentName    = '$(deploymentName)'
-                    templateFilePath  = $templateFilePath
-                    resourceGroupName = '${{ parameters.resourceGroupName }}'
-                    verbose           = $true
-                }
+                if (-not [String]::IsNullOrEmpty('$(deploymentName)')) {
+                  $functionInput = @{
+                      deploymentName    = '$(deploymentName)'
+                      templateFilePath  = $templateFilePath
+                      resourceGroupName = '${{ parameters.resourceGroupName }}'
+                      verbose           = $true
+                  }
 
-                Write-Verbose 'Invoke task with' -Verbose
-                Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+                  Write-Verbose 'Invoke task with' -Verbose
+                  Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-                Remove-DeployedModule @functionInput
+                  Initialize-DeploymentRemoval @functionInput
+                }

From 5429aa600677fd060c6b72b219be180ee0e13e73 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Mon, 13 Dec 2021 19:07:14 +0100
Subject: [PATCH 66/78] Aligned casing

---
 .../pipelines/resourceDeployment/New-ModuleDeployment.ps1   | 4 ++--
 .../resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1  | 4 ++--
 .../pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index e1c745d312..e0f34b4706 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -144,7 +144,7 @@ function New-DeploymentWithParameterFile {
         do {
             try {
                 switch ($deploymentScope) {
-                    'resourceGroup' {
+                    'resourcegroup' {
                         if ($subscriptionId) {
                             $Context = Get-AzContext -ListAvailable | Where-Object Subscription -Match $subscriptionId
                             if ($Context) {
@@ -173,7 +173,7 @@ function New-DeploymentWithParameterFile {
                         }
                         break
                     }
-                    'managementGroup' {
+                    'managementgroup' {
                         if ($PSCmdlet.ShouldProcess('Management group level deployment', 'Create')) {
                             $res = New-AzManagementGroupDeployment @DeploymentInputs -Location $location -ManagementGroupId $managementGroupId
                         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
index dd4397ffe0..b996947423 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
@@ -48,7 +48,7 @@ function Get-ResourceIdsOfDeploymentInner {
 
     $resultSet = [System.Collections.ArrayList]@()
     switch ($Scope) {
-        'resourceGroup' {
+        'resourcegroup' {
             if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
                 [array]$deploymentTargets = (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
@@ -83,7 +83,7 @@ function Get-ResourceIdsOfDeploymentInner {
                 }
             }
         }
-        'managementGroup' {
+        'managementgroup' {
             [array]$deploymentTargets = (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
                 [array]$resultSet += $deployment
diff --git a/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1 b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
index 36b7fb9f3e..1c1f5cbec5 100644
--- a/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
@@ -32,7 +32,7 @@ function Get-ScopeOfTemplateFile {
         $bicepContent = Get-Content $templateFilePath
         $bicepScope = $bicepContent | Where-Object { $_ -like '*targetscope =*' }
         if (-not $bicepScope) {
-            $deploymentScope = 'resourceGroup'
+            $deploymentScope = 'resourcegroup'
         } else {
             $deploymentScope = $bicepScope.ToLower().Split('=')[-1].Replace("'", '').Trim()
         }
@@ -40,9 +40,9 @@ function Get-ScopeOfTemplateFile {
         # ARM
         $armSchema = (ConvertFrom-Json (Get-Content -Raw -Path $templateFilePath)).'$schema'
         switch -regex ($armSchema) {
-            '\/deploymentTemplate.json#$' { $deploymentScope = 'resourceGroup' }
+            '\/deploymentTemplate.json#$' { $deploymentScope = 'resourcegroup' }
             '\/subscriptionDeploymentTemplate.json#$' { $deploymentScope = 'subscription' }
-            '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementGroup' }
+            '\/managementGroupDeploymentTemplate.json#$' { $deploymentScope = 'managementgroup' }
             '\/tenantDeploymentTemplate.json#$' { $deploymentScope = 'tenant' }
             Default { throw "[$armSchema] is a non-supported ARM template schema" }
         }

From 0756a249271446dbe39120f6679d6177e9952843 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 14 Dec 2021 11:06:04 +0100
Subject: [PATCH 67/78] Updated removal task to use individual parameters
 instead of one hashtable object

---
 .../helper/Invoke-ResourcePostRemoval.ps1     | 49 +++++++++++--------
 .../helper/Invoke-ResourceRemoval.ps1         |  6 +--
 .../helper/Remove-ResourceList.ps1            |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index a4a61b75ce..c8e0e329ef 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -5,32 +5,39 @@ Remove any artifacts that remain of the given resource
 .DESCRIPTION
 Remove any artifacts that remain of the given resource. For example, some resources such as key vaults usually go into a soft-delete state from which we want to purge them from.
 
-.PARAMETER resourceToRemove
-Mandatory. The resource to remove. Should have format
-@{
-    name        = '...'
-    resourceID = '...'
-    type        = '...'
-}
+.PARAMETER resourceId
+Mandatory. The resourceID of the resource to remove
+
+.PARAMETER name
+Mandatory. The name of the resource to remove
+
+.PARAMETER type
+Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourcePostRemoval -resourceToRemove @{ name = 'myVault'; resourceId '(..)/Microsoft.KeyVault/vaults/myVault'; type = 'Microsoft.KeyVault/vaults'}
+Invoke-ResourcePostRemoval -name 'myVault' -type 'Microsoft.KeyVault/vaults' -resourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault'
 
-Purge resource 'myVault' of type 'Microsoft.KeyVault/vaults' if no purge protection is enabled
+Purge the resource 'myVault' of type 'Microsoft.KeyVault/vaults' with ID '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault' if no purge protection is enabled
 #>
 function Invoke-ResourcePostRemoval {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
-        [Parameter(Mandatory)]
-        [hashtable] $resourceToRemove
+        [Parameter(Mandatory = $true)]
+        [string] $resourceId,
+
+        [Parameter(Mandatory = $true)]
+        [string] $name,
+
+        [Parameter(Mandatory = $true)]
+        [string] $type
     )
 
-    switch ($resourceToRemove.type) {
+    switch ($type) {
         'Microsoft.KeyVault/vaults' {
-            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
+            $resourceGroupName = $resourceId.Split('/')[4]
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceToRemove.name -and $_.resourceGroupName -EQ $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
                 Write-Verbose "Purging key vault [$name]" -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
@@ -39,8 +46,8 @@ function Invoke-ResourcePostRemoval {
             }
         }
         'Microsoft.CognitiveServices/accounts' {
-            $resourceGroupName = $resourceToRemove.resourceId.Split('/')[4]
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $resourceToRemove.name }
+            $resourceGroupName = $resourceId.Split('/')[4]
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name }
             if ($matchingAccount) {
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
                     $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location -ResourceGroupName $resourceGroupName -Name $matchingAccount.AccountName
@@ -48,7 +55,7 @@ function Invoke-ResourcePostRemoval {
             }
         }
         'Microsoft.ApiManagement/service' {
-            $subscriptionId = $resourceToRemove.resourceId.Split('/')[2]
+            $subscriptionId = $resourceId.Split('/')[2]
 
             # Fetch service in soft-delete
             $getUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01' -f $subscriptionId
@@ -59,11 +66,11 @@ function Invoke-ResourcePostRemoval {
                     Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
                 }
             }
-            $softDeletedService = (Invoke-RestMethod @requestInputObject).value | Where-Object { $_.properties.serviceId -eq $resourceToRemove.resourceId }
+            $softDeletedService = (Invoke-RestMethod @requestInputObject).value | Where-Object { $_.properties.serviceId -eq $resourceId }
 
             if ($softDeletedService) {
                 # Purge service
-                $purgeUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $resourceToRemove.name
+                $purgeUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $name
                 $requestInputObject = @{
                     Method  = 'DELETE'
                     Uri     = $purgeUri
@@ -79,7 +86,7 @@ function Invoke-ResourcePostRemoval {
         'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems' {
             # Remove protected VM
             # Required if e.g. a VM was listed in an RSV and only that VM is removed
-            $vaultId = $resourceToRemove.resourceId.split('/backupFabrics/')[0]
+            $vaultId = $resourceId.split('/backupFabrics/')[0]
             $softDeleteStatus = (Get-AzRecoveryServicesVaultProperty -VaultId $vaultId).SoftDeleteFeatureState
             if ($softDeleteStatus -ne 'Disabled') {
                 if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $vaultId), 'Set')) {
@@ -91,7 +98,7 @@ function Invoke-ResourcePostRemoval {
                 BackupManagementType = 'AzureVM'
                 WorkloadType         = 'AzureVM'
                 VaultId              = $vaultId
-                Name                 = $resourceToRemove.name
+                Name                 = $name
             }
             if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject -ErrorAction 'SilentlyContinue') {
                 Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $vaultId) -Verbose
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index 3468d99e64..18951ac04b 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -23,13 +23,13 @@ function Invoke-ResourceRemoval {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [string] $resourceId,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [string] $name,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [string] $type
     )
 
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index e4fc995aaa..12aee3bab8 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -61,7 +61,7 @@ function Remove-ResourceListInner {
 
             # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
             if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                Invoke-ResourcePostRemoval -resourceToRemove $resource
+                Invoke-ResourcePostRemoval -name $resource.name -type $resource.type -resourceId $resource.resourceId
             }
         }
         Write-Verbose '----------------------------------' -Verbose

From adc8877424c1ed425708ad5e0a35d302b9a4fd00 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 14 Dec 2021 11:18:39 +0100
Subject: [PATCH 68/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourceRemoval.ps1         | 4 ++--
 .../pipelines/resourceRemoval/helper/Remove-Deployment.ps1    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index 18951ac04b..017ae3c26a 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -15,9 +15,9 @@ Mandatory. The name of the resource to remove
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourceRemoval -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
+Invoke-ResourceRemoval -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
 
-Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
+Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
 #>
 function Invoke-ResourceRemoval {
 
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index b19370aede..d1bd0aaae5 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -70,7 +70,7 @@ function Remove-Deployment {
         $deploymentScope = Get-ScopeOfTemplateFile -TemplateFilePath $TemplateFilePath
 
         # Fundamental checks
-        if ($deploymentScope -eq 'resourceGroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
+        if ($deploymentScope -eq 'resourcegroup' -and -not (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue')) {
             Write-Verbose "Resource group [$ResourceGroupName] does not exist (anymore). Skipping removal of its contained resources" -Verbose
             return
         }

From 4318ec4dc3c383455a71bd7d67ccaab572e8b481 Mon Sep 17 00:00:00 2001
From: Erika Gressi <56914614+eriqua@users.noreply.github.com>
Date: Tue, 14 Dec 2021 18:32:52 +0100
Subject: [PATCH 69/78] Update removal (#810)

* parameter case level 01

* parameter case level 02 1

* parameter case level 02 2

* parameter case level 02 3

* parameter case level 03 1

* purge api

* res removal object

* body param to lower

* typo

* nw comment

* remove diagnostic

* invoke removal docs

* cleanup

* invoke removal docs example

* cleanup

Co-authored-by: Erika Gressi <erikag.microsoft.com>
---
 .../pipelineTemplates/module.jobs.deploy.yml  |  8 ++--
 .../validateModuleDeployment/action.yml       |  8 ++--
 .../ms.insights.diagnosticsettings.yml        |  2 +-
 .../workflows/ms.network.networkwatchers.yml  |  2 +-
 .../Initialize-DeploymentRemoval.ps1          | 20 +++++-----
 .../helper/Get-DependencyResourceNameList.ps1 |  4 +-
 .../helper/Get-OrderedResourcesList.ps1       | 12 +++---
 .../Get-ResourceIdsAsFormattedObjectList.ps1  |  6 +--
 .../helper/Get-ResourceIdsOfDeployment.ps1    | 36 ++++++++++-------
 .../helper/Invoke-ResourcePostRemoval.ps1     | 40 ++++++++-----------
 .../helper/Invoke-ResourceRemoval.ps1         | 14 +++----
 .../helper/Remove-Deployment.ps1              | 15 ++++---
 .../helper/Remove-ResourceList.ps1            | 18 ++++-----
 .../sharedScripts/Get-ScopeOfTemplateFile.ps1 |  4 +-
 14 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.deploy.yml b/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
index 76cf45a495..df626e90fc 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.deploy.yml
@@ -291,10 +291,10 @@ jobs:
 
                 if (-not [String]::IsNullOrEmpty('$(deploymentName)')) {
                   $functionInput = @{
-                      deploymentName    = '$(deploymentName)'
-                      templateFilePath  = $templateFilePath
-                      resourceGroupName = '${{ parameters.resourceGroupName }}'
-                      verbose           = $true
+                      DeploymentName    = '$(deploymentName)'
+                      TemplateFilePath  = $templateFilePath
+                      ResourceGroupName = '${{ parameters.resourceGroupName }}'
+                      Verbose           = $true
                   }
 
                   Write-Verbose 'Invoke task with' -Verbose
diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml
index 60bfbf9f52..6711eb84c8 100644
--- a/.github/actions/templates/validateModuleDeployment/action.yml
+++ b/.github/actions/templates/validateModuleDeployment/action.yml
@@ -150,10 +150,10 @@ runs:
 
         if (-not [String]::IsNullOrEmpty('${{ steps.deploy_step.outputs.deploymentName }}')) {
           $functionInput = @{
-            deploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
-            templateFilePath  = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}'
-            resourceGroupName = '${{ inputs.resourceGroupName }}'
-            verbose           = $true
+            DeploymentName    = '${{ steps.deploy_step.outputs.deploymentName }}'
+            TemplateFilePath  = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}'
+            ResourceGroupName = '${{ inputs.resourceGroupName }}'
+            Verbose           = $true
           }
 
           Write-Verbose 'Invoke task with' -Verbose
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index 477321678a..f82cf56669 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -7,7 +7,7 @@ on:
         type: boolean
         description: 'Remove deployed module'
         required: false
-        default: 'false' # Needs custom removals script
+        default: 'true'
       versioningOption:
         type: choice
         description: 'The mode to handle the version increments [major|minor|patch]'
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 58513b4913..ff9b9a66ea 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -7,7 +7,7 @@ on:
         type: boolean
         description: 'Remove deployed module'
         required: false
-        default: 'false' # Required as a dependency + Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
+        default: 'false' # Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
       versioningOption:
         type: choice
         description: 'The mode to handle the version increments [major|minor|patch]'
diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index 731f866053..54f8ad6d05 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -5,17 +5,17 @@ Remove deployed resources based on their deploymentName(s)
 .DESCRIPTION
 Remove deployed resources based on their deploymentName(s)
 
-.PARAMETER deploymentName(s)
+.PARAMETER DeploymentName(s)
 Mandatory. The name(s) of the deployment(s)
 
-.PARAMETER templateFilePath
+.PARAMETER TemplateFilePath
 Mandatory. The path to the template used for the deployment. Used to determine the level/scope (e.g. subscription)
 
 .PARAMETER ResourceGroupName
 Optional. The name of the resource group the deployment was happening in. Relevant for resource-group level deployments.
 
 .EXAMPLE
-Initialize-DeploymentRemoval -deploymentName 'virtualWans-20211204T1812029146Z' -templateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
+Initialize-DeploymentRemoval -DeploymentName 'virtualWans-20211204T1812029146Z' -TemplateFilePath "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep" -resourceGroupName 'test-virtualWan-parameters.json-rg'
 
 Remove the deployment 'virtualWans-20211204T1812029146Z' from resource group 'test-virtualWan-parameters.json-rg' that was executed using template in path "$home/ResourceModules/arm/Microsoft.Network/virtualWans/deploy.bicep"
 #>
@@ -24,11 +24,11 @@ function Initialize-DeploymentRemoval {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $true)]
-        [Alias('deploymentName')]
-        [string[]] $deploymentNames,
+        [Alias('DeploymentName')]
+        [string[]] $DeploymentNames,
 
         [Parameter(Mandatory = $true)]
-        [string] $templateFilePath,
+        [string] $TemplateFilePath,
 
         [Parameter(Mandatory = $false)]
         [string] $ResourceGroupName = 'validation-rg'
@@ -74,10 +74,10 @@ function Initialize-DeploymentRemoval {
 
             # Invoke removal
             $inputObject = @{
-                deploymentName    = $deploymentName
-                ResourceGroupName = $ResourceGroupName
-                templateFilePath  = $templateFilePath
-                removalSequence   = $removalSequence
+                DeploymentName    = $deploymentName
+                ResourceGroupName = $resourceGroupName
+                TemplateFilePath  = $templateFilePath
+                RemovalSequence   = $removalSequence
             }
             Remove-Deployment @inputObject -Verbose
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
index 9cb9210564..c3748e2dad 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-DependencyResourceNameList.ps1
@@ -6,7 +6,7 @@ Get a list of all dependency resources specified in the dependencies parameter f
 Get a list of all dependency resources specified in the dependencies parameter files
 Note: It only considers resources that use the 'name' parameter
 
-.PARAMETER dependencyParameterPath
+.PARAMETER DependencyParameterPath
 Optional. The path the the dependency parameters parent folder. Defaults to 'utilities/pipelines/dependencies'
 
 .EXAMPLE
@@ -19,7 +19,7 @@ function Get-DependencyResourceNameList {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
-        [string] $dependencyParameterPath = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'dependencies')
+        [string] $DependencyParameterPath = (Join-Path (Split-Path (Split-Path $PSScriptRoot -Parent) -Parent) 'dependencies')
     )
 
     $parameterFolders = Get-ChildItem -Path $dependencyParameterPath -Recurse -Filter 'parameters' -Directory
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1
index 5eb47e4f55..0c94365267 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-OrderedResourcesList.ps1
@@ -6,7 +6,7 @@ Order the given resources as per the provided ordered resource type list
 Order the given resources as per the provided ordered resource type list.
 Any resources not in that list will be appended after.
 
-.PARAMETER resourcesToOrder
+.PARAMETER ResourcesToOrder
 Mandatory. The resources to order. Items are stacked as per their order in the list (i.e. the first items is put on top, then the next, etc.)
 Each item should be in format:
 @{
@@ -15,11 +15,11 @@ Each item should be in format:
     type        = '...'
 }
 
-.PARAMETER order
-Optional. The order of resource types to apply. If order is provided, the list is returned as is
+.PARAMETER Order
+Optional. The order of resource types to apply for deletion. If order is provided, the list is returned as is
 
 .EXAMPLE
-Get-OrderedResourcesList -resourcesToOrder @(@{ name = 'myAccount'; resourceId '(..)/Microsoft.Automation/automationAccounts/myAccount'; type = 'Microsoft.Automation/automationAccounts'}) -order @('Microsoft.Insights/diagnosticSettings','Microsoft.Automation/automationAccounts')
+Get-OrderedResourcesList -ResourcesToOrder @(@{ name = 'myAccount'; resourceId '(..)/Microsoft.Automation/automationAccounts/myAccount'; type = 'Microsoft.Automation/automationAccounts'}) -Order @('Microsoft.Insights/diagnosticSettings','Microsoft.Automation/automationAccounts')
 
 Order the given list of resources which would put the diagnostic settings to the front of the list, then the automation account, then the rest. As only one item exists, the list is returned as is.
 #>
@@ -28,10 +28,10 @@ function Get-OrderedResourcesList {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $true)]
-        [hashtable[]] $resourcesToOrder,
+        [hashtable[]] $ResourcesToOrder,
 
         [Parameter(Mandatory = $false)]
-        [string[]] $order = @()
+        [string[]] $Order = @()
     )
 
     # Going from back to front of the list to stack in the correct order
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
index 417914276d..7f971aad54 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
@@ -5,11 +5,11 @@ Format the provide resource IDs into objects of resourceID, name & type
 .DESCRIPTION
 Format the provide resource IDs into objects of resourceID, name & type
 
-.PARAMETER resourceIds
+.PARAMETER ResourceIds
 Optional. The resource IDs to process
 
 .EXAMPLE
-Get-ResourceIdsAsFormattedObjectList -resourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
+Get-ResourceIdsAsFormattedObjectList -ResourceIds @('/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01')
 
 Returns an object @{
     resourceId = '/subscriptions/<subscriptionID>/resourceGroups/test-analysisServices-parameters.json-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaaspar01'
@@ -22,7 +22,7 @@ function Get-ResourceIdsAsFormattedObjectList {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
-        [string[]] $resourceIds = @()
+        [string[]] $ResourceIds = @()
     )
 
     $formattedResources = [System.Collections.ArrayList]@()
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
index b996947423..076aa7ad06 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
@@ -10,15 +10,15 @@ Get all deployments that match a given deployment name in a given scope. Works r
 Mandatory. The deployment name to search for
 
 .PARAMETER ResourceGroupName
-Optional. The name of the resource group for scope 'resourceGroup'
+Optional. The name of the resource group for scope 'resourcegroup'
 
 .PARAMETER Scope
 Mandatory. The scope to search in
 
 .EXAMPLE
-Get-ResourceIdsOfDeploymentInner -Name 'keyvault-12356' -Scope 'resourceGroup'
+Get-ResourceIdsOfDeploymentInner -Name 'keyvault-12356' -Scope 'resourcegroup'
 
-Get all deployments that match name 'keyvault-12356' in scope 'resourceGroup'
+Get all deployments that match name 'keyvault-12356' in scope 'resourcegroup'
 
 .NOTES
 Works after the principal:
@@ -38,9 +38,9 @@ function Get-ResourceIdsOfDeploymentInner {
 
         [Parameter(Mandatory)]
         [ValidateSet(
-            'resourceGroup',
+            'resourcegroup',
             'subscription',
-            'managementGroup',
+            'managementgroup',
             'tenant'
         )]
         [string] $Scope
@@ -57,7 +57,7 @@ function Get-ResourceIdsOfDeploymentInner {
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourcegroup'
                 }
             } else {
                 # In case the resource group itself was already deleted, there is no need to try and fetch deployments from it
@@ -76,7 +76,7 @@ function Get-ResourceIdsOfDeploymentInner {
                     # Resource Group Level Child Deployments
                     $name = Split-Path $deployment -Leaf
                     $resourceGroupName = $deployment.split('/resourceGroups/')[1].Split('/')[0]
-                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourceGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name $name -ResourceGroupName $ResourceGroupName -Scope 'resourcegroup'
                 } else {
                     # Subscription Level Deployments
                     [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf) -Scope 'subscription'
@@ -95,7 +95,7 @@ function Get-ResourceIdsOfDeploymentInner {
                     [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name (Split-Path $deployment -Leaf) -Scope 'subscription'
                 } else {
                     # Management Group Level Deployments
-                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf) -scope 'managementgroup'
                 }
             }
         }
@@ -108,7 +108,7 @@ function Get-ResourceIdsOfDeploymentInner {
                 [array]$resultSet = $resultSet | Where-Object { $_ -ne $deployment }
                 if ($deployment -match '/tenant/') {
                     # Management Group Level Child Deployments
-                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name (Split-Path $deployment -Leaf) -scope 'managementGroup'
+                    [array]$resultSet += Get-ResourceIdsOfDeploymentInner -Name (Split-Path $deployment -Leaf) -scope 'managementgroup'
                 } else {
                     # Tenant Level Deployments
                     [array]$resultSet += Get-ResourceIdsOfDeploymentInner -name (Split-Path $deployment -Leaf)
@@ -133,7 +133,7 @@ Mandatory. The resource group of the resource to remove
 .PARAMETER Name
 Optional. The deployment name to use for the removal
 
-.PARAMETER scope
+.PARAMETER Scope
 Mandatory. The scope to search in
 
 .PARAMETER SearchRetryLimit
@@ -143,9 +143,9 @@ Optional. The maximum times to retry the search for resources via their removal
 Optional. The time to wait in between the search for resources via their remove tags
 
 .EXAMPLE
-Get-ResourceIdsOfDeployment -name 'KeyVault' -ResourceGroupName 'validation-rg' -scope 'resourceGroup'
+Get-ResourceIdsOfDeployment -name 'KeyVault' -ResourceGroupName 'validation-rg' -scope 'resourcegroup'
 
-Get all deployments that match name 'KeyVault' in scope 'resourceGroup' of resource group 'validation-rg'
+Get all deployments that match name 'KeyVault' in scope 'resourcegroup' of resource group 'validation-rg'
 #>
 function Get-ResourceIdsOfDeployment {
 
@@ -155,10 +155,16 @@ function Get-ResourceIdsOfDeployment {
         [string] $ResourceGroupName,
 
         [Parameter(Mandatory = $true)]
-        [string] $name,
+        [string] $Name,
 
         [Parameter(Mandatory = $true)]
-        [string] $scope,
+        [ValidateSet(
+            'resourcegroup',
+            'subscription',
+            'managementgroup',
+            'tenant'
+        )]
+        [string] $Scope,
 
         [Parameter(Mandatory = $false)]
         [int] $SearchRetryLimit = 40,
@@ -169,7 +175,7 @@ function Get-ResourceIdsOfDeployment {
 
     $searchRetryCount = 1
     do {
-        [array]$deployments = Get-ResourceIdsOfDeploymentInner -name $name -scope $scope -resourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
+        [array]$deployments = Get-ResourceIdsOfDeploymentInner -Name $name -Scope $scope -ResourceGroupName $resourceGroupName -ErrorAction 'SilentlyContinue'
         if ($deployments) {
             break
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index c8e0e329ef..6d93fefe36 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -5,17 +5,17 @@ Remove any artifacts that remain of the given resource
 .DESCRIPTION
 Remove any artifacts that remain of the given resource. For example, some resources such as key vaults usually go into a soft-delete state from which we want to purge them from.
 
-.PARAMETER resourceId
+.PARAMETER ResourceId
 Mandatory. The resourceID of the resource to remove
 
-.PARAMETER name
+.PARAMETER Name
 Mandatory. The name of the resource to remove
 
-.PARAMETER type
+.PARAMETER Type
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourcePostRemoval -name 'myVault' -type 'Microsoft.KeyVault/vaults' -resourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault'
+Invoke-ResourcePostRemoval -Name 'myVault' -Type 'Microsoft.KeyVault/vaults' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault'
 
 Purge the resource 'myVault' of type 'Microsoft.KeyVault/vaults' with ID '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault' if no purge protection is enabled
 #>
@@ -24,13 +24,13 @@ function Invoke-ResourcePostRemoval {
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory = $true)]
-        [string] $resourceId,
+        [string] $ResourceId,
 
         [Parameter(Mandatory = $true)]
-        [string] $name,
+        [string] $Name,
 
         [Parameter(Mandatory = $true)]
-        [string] $type
+        [string] $Type
     )
 
     switch ($type) {
@@ -58,28 +58,22 @@ function Invoke-ResourcePostRemoval {
             $subscriptionId = $resourceId.Split('/')[2]
 
             # Fetch service in soft-delete
-            $getUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01' -f $subscriptionId
-            $requestInputObject = @{
-                Method  = 'GET'
-                Uri     = $getUri
-                Headers = @{
-                    Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
-                }
+            $getPath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01' -f $subscriptionId
+            $getRequestInputObject = @{
+                Method = 'GET'
+                Path   = $getPath
             }
-            $softDeletedService = (Invoke-RestMethod @requestInputObject).value | Where-Object { $_.properties.serviceId -eq $resourceId }
+            $softDeletedService = ((Invoke-AzRestMethod @getRequestInputObject).Content | ConvertFrom-Json).value | Where-Object { $_.properties.serviceId -eq $resourceId }
 
             if ($softDeletedService) {
                 # Purge service
-                $purgeUri = 'https://management.azure.com/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $name
-                $requestInputObject = @{
-                    Method  = 'DELETE'
-                    Uri     = $purgeUri
-                    Headers = @{
-                        Authorization = 'Bearer {0}' -f (Get-AzAccessToken).Token
-                    }
+                $purgePath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $name
+                $purgeRequestInputObject = @{
+                    Method = 'DELETE'
+                    Path   = $purgePath
                 }
                 if ($PSCmdlet.ShouldProcess(('API management service with ID [{0}]' -f $softDeletedService.properties.serviceId), 'Purge')) {
-                    $null = Invoke-RestMethod @requestInputObject
+                    $null = Invoke-AzRestMethod @purgeRequestInputObject
                 }
             }
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index 017ae3c26a..350a52195e 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -5,17 +5,17 @@ Remove a specific resource
 .DESCRIPTION
 Remove a specific resource. Tries to handle different resource types accordingly
 
-.PARAMETER resourceId
+.PARAMETER ResourceId
 Mandatory. The resourceID of the resource to remove
 
-.PARAMETER name
+.PARAMETER Name
 Mandatory. The name of the resource to remove
 
-.PARAMETER type
+.PARAMETER Type
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourceRemoval -name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -type 'Microsoft.Insights/diagnosticSettings' -resourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
+Invoke-ResourceRemoval -Name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -Type 'Microsoft.Insights/diagnosticSettings' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
 
 Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
 #>
@@ -24,13 +24,13 @@ function Invoke-ResourceRemoval {
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory = $true)]
-        [string] $resourceId,
+        [string] $ResourceId,
 
         [Parameter(Mandatory = $true)]
-        [string] $name,
+        [string] $Name,
 
         [Parameter(Mandatory = $true)]
-        [string] $type
+        [string] $Type
     )
 
     switch ($type) {
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index d1bd0aaae5..a680938a6d 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -24,6 +24,9 @@ Optional. The deployment name to use for the removal
 .PARAMETER TemplateFilePath
 Optional. The path to the deployment file
 
+.PARAMETER RemovalSequence
+Optional. The order of resource types to apply for deletion
+
 .EXAMPLE
 Remove-Deployment -DeploymentName 'KeyVault' -ResourceGroupName 'validation-rg' -TemplateFilePath 'C:/deploy.json'
 
@@ -78,9 +81,9 @@ function Remove-Deployment {
         # Fetch deployments
         # =================
         $deploymentsInputObject = @{
-            name              = $deploymentName
-            scope             = $deploymentScope
-            resourceGroupName = $resourceGroupName
+            Name              = $deploymentName
+            Scope             = $deploymentScope
+            ResourceGroupName = $resourceGroupName
         }
         $deploymentResourceIds = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
 
@@ -90,7 +93,7 @@ function Remove-Deployment {
 
         # Format items
         # ============
-        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -resourceIds $rawResourceIdsToRemove
+        $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -ResourceIds $rawResourceIdsToRemove
 
         # Filter all dependency resources
         # ===============================
@@ -99,13 +102,13 @@ function Remove-Deployment {
 
         # Order resources
         # ===============
-        $resourcesToRemove = Get-OrderedResourcesList -resourcesToOrder $resourcesToRemove -order $RemovalSequence
+        $resourcesToRemove = Get-OrderedResourcesList -ResourcesToOrder $resourcesToRemove -Order $RemovalSequence
 
         # Remove resources
         # ================
         if ($resourcesToRemove.Count -gt 0) {
             if ($PSCmdlet.ShouldProcess(('[{0}] resources' -f (($resourcesToRemove -is [array]) ? $resourcesToRemove.Count : 1)), 'Remove')) {
-                Remove-ResourceList -resourcesToRemove $resourcesToRemove -Verbose
+                Remove-ResourceList -ResourcesToRemove $resourcesToRemove -Verbose
             }
         } else {
             Write-Verbose 'Found [0] resources to remove'
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index 12aee3bab8..fa02b523d4 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -6,18 +6,18 @@ Remove the given resource(s)
 .DESCRIPTION
 Remove the given resource(s). Resources that the script fails to removed are returned in an array.
 
-.PARAMETER resourcesToRemove
+.PARAMETER ResourcesToRemove
 Mandatory. The resource(s) to remove. Each resource must have a name (optional), type (optional) & resourceId property.
 
 .EXAMPLE
-Remove-ResourceListInner -resourcesToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceListInner -ResourcesToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 #>
 function Remove-ResourceListInner {
 
     [CmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Mandatory = $false)]
-        [Hashtable[]] $resourcesToRemove = @()
+        [Hashtable[]] $ResourcesToRemove = @()
     )
 
     begin {
@@ -47,7 +47,7 @@ function Remove-ResourceListInner {
                 Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
                 try {
                     if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                        Invoke-ResourceRemoval -ResourceId $resource.resourceId -name $resource.name -type $resource.type
+                        Invoke-ResourceRemoval -Name $resource.name -Type $resource.type -ResourceId $resource.resourceId
                     }
 
                     # If we removed a parent remove its children
@@ -59,9 +59,9 @@ function Remove-ResourceListInner {
                 }
             }
 
-            # We want to purge resources even if they were not explictely removed because they were 'alreadyProcessed'
+            # We want to purge resources even if they were not explicitly removed because they were 'alreadyProcessed'
             if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                Invoke-ResourcePostRemoval -name $resource.name -type $resource.type -resourceId $resource.resourceId
+                Invoke-ResourcePostRemoval -Name $resource.name -Type $resource.type -ResourceId $resource.resourceId
             }
         }
         Write-Verbose '----------------------------------' -Verbose
@@ -80,7 +80,7 @@ Remove all resources in the provided array from Azure
 .DESCRIPTION
 Remove all resources in the provided array from Azure. Resources are removed with a retry mechanism.
 
-.PARAMETER resourcesToRemove
+.PARAMETER ResourcesToRemove
 Optional. The array of resources to remove. Has to contain objects with at least a 'resourceId' property
 
 .EXAMPLE
@@ -107,9 +107,9 @@ function Remove-ResourceList {
 
     do {
         if ($PSCmdlet.ShouldProcess(("[{0}] Resource(s) with a maximum of [$removalRetryLimit] attempts." -f (($resourcesToRetry -is [array]) ? $resourcesToRetry.Count : 1)), 'Remove')) {
-            $resourcesToRetry = Remove-ResourceListInner -resourcesToRemove $resourcesToRetry -Verbose
+            $resourcesToRetry = Remove-ResourceListInner -ResourcesToRemove $resourcesToRetry -Verbose
         } else {
-            Remove-ResourceListInner -resourcesToRemove $resourcesToRemove -WhatIf
+            Remove-ResourceListInner -ResourcesToRemove $resourcesToRemove -WhatIf
         }
 
         if (-not $resourcesToRetry) {
diff --git a/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1 b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
index 1c1f5cbec5..d2b13414cb 100644
--- a/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
+++ b/utilities/pipelines/sharedScripts/Get-ScopeOfTemplateFile.ps1
@@ -5,9 +5,9 @@ Get the scope of the given template file
 .DESCRIPTION
 Get the scope of the given template file (supports ARM & Bicep)
 Will return either
-- resourceGroup
+- resourcegroup
 - subscription
-- managementGroup
+- managementgroup
 - tenant
 
 .PARAMETER TemplateFilePath

From f5db96ea472e0cf6926ff639a066ead06e5f6277 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 14 Dec 2021 18:45:24 +0100
Subject: [PATCH 70/78] Refactored removal object interfact

---
 .../Get-ResourceIdsAsFormattedObjectList.ps1   |  5 -----
 .../helper/Invoke-ResourcePostRemoval.ps1      | 18 ++++++------------
 .../helper/Invoke-ResourceRemoval.ps1          | 12 +++---------
 .../helper/Remove-ResourceList.ps1             | 18 +++++++++---------
 4 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
index 7f971aad54..2136afbe0a 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsAsFormattedObjectList.ps1
@@ -39,7 +39,6 @@ function Get-ResourceIdsAsFormattedObjectList {
                 # subscription level resource group
                 $formattedResources += @{
                     resourceId = $resourceId
-                    name       = $idElements[-1]
                     type       = 'Microsoft.Resources/resourceGroups'
                 }
                 break
@@ -48,7 +47,6 @@ function Get-ResourceIdsAsFormattedObjectList {
                 # subscription-level resource group
                 $formattedResources += @{
                     resourceId = $resourceId
-                    name       = $idElements[-1]
                     type       = $idElements[4, 5] -join '/'
                 }
                 break
@@ -58,7 +56,6 @@ function Get-ResourceIdsAsFormattedObjectList {
                     # subscription-level resource
                     $formattedResources += @{
                         resourceId = $resourceId
-                        name       = Split-Path $resourceId -Leaf
                         type       = $idElements[4, 5] -join '/'
                     }
                 } else {
@@ -71,7 +68,6 @@ function Get-ResourceIdsAsFormattedObjectList {
                     foreach ($resource in $expandedResources) {
                         $formattedResources += @{
                             resourceId = $resource.ResourceId
-                            name       = $resource.Name
                             type       = $resource.Type
                         }
                     }
@@ -94,7 +90,6 @@ function Get-ResourceIdsAsFormattedObjectList {
 
                 $formattedResources += @{
                     resourceId = $resourceId
-                    name       = $idElements[-1]
                     type       = $type
                 }
                 break
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 6d93fefe36..1f84ab6843 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -8,14 +8,11 @@ Remove any artifacts that remain of the given resource. For example, some resour
 .PARAMETER ResourceId
 Mandatory. The resourceID of the resource to remove
 
-.PARAMETER Name
-Mandatory. The name of the resource to remove
-
 .PARAMETER Type
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourcePostRemoval -Name 'myVault' -Type 'Microsoft.KeyVault/vaults' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault'
+Invoke-ResourcePostRemoval -Type 'Microsoft.KeyVault/vaults' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault'
 
 Purge the resource 'myVault' of type 'Microsoft.KeyVault/vaults' with ID '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/myVault' if no purge protection is enabled
 #>
@@ -26,9 +23,6 @@ function Invoke-ResourcePostRemoval {
         [Parameter(Mandatory = $true)]
         [string] $ResourceId,
 
-        [Parameter(Mandatory = $true)]
-        [string] $Name,
-
         [Parameter(Mandatory = $true)]
         [string] $Type
     )
@@ -37,9 +31,9 @@ function Invoke-ResourcePostRemoval {
         'Microsoft.KeyVault/vaults' {
             $resourceGroupName = $resourceId.Split('/')[4]
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $name -and $_.resourceGroupName -EQ $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq (Split-Path $ResourceId -Leaf) -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
-                Write-Verbose "Purging key vault [$name]" -Verbose
+                Write-Verbose ('Purging key vault [{0}]' -f (Split-Path $ResourceId -Leaf)) -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
                     $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location
                 }
@@ -47,7 +41,7 @@ function Invoke-ResourcePostRemoval {
         }
         'Microsoft.CognitiveServices/accounts' {
             $resourceGroupName = $resourceId.Split('/')[4]
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $name }
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq (Split-Path $ResourceId -Leaf) }
             if ($matchingAccount) {
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
                     $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location -ResourceGroupName $resourceGroupName -Name $matchingAccount.AccountName
@@ -67,7 +61,7 @@ function Invoke-ResourcePostRemoval {
 
             if ($softDeletedService) {
                 # Purge service
-                $purgePath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $name
+                $purgePath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, (Split-Path $ResourceId -Leaf)
                 $purgeRequestInputObject = @{
                     Method = 'DELETE'
                     Path   = $purgePath
@@ -92,7 +86,7 @@ function Invoke-ResourcePostRemoval {
                 BackupManagementType = 'AzureVM'
                 WorkloadType         = 'AzureVM'
                 VaultId              = $vaultId
-                Name                 = $name
+                Name                 = Split-Path $ResourceId -Leaf
             }
             if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject -ErrorAction 'SilentlyContinue') {
                 Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $vaultId) -Verbose
diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index 350a52195e..e0679280f5 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -8,14 +8,11 @@ Remove a specific resource. Tries to handle different resource types accordingly
 .PARAMETER ResourceId
 Mandatory. The resourceID of the resource to remove
 
-.PARAMETER Name
-Mandatory. The name of the resource to remove
-
 .PARAMETER Type
 Mandatory. The type of the resource to remove
 
 .EXAMPLE
-Invoke-ResourceRemoval -Name 'sxx-vm-linux-001-nic-01-diagnosticSettings' -Type 'Microsoft.Insights/diagnosticSettings' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
+Invoke-ResourceRemoval -Type 'Microsoft.Insights/diagnosticSettings' -ResourceId '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01/providers/Microsoft.Insights/diagnosticSettings/sxx-vm-linux-001-nic-01-diagnosticSettings'
 
 Remove the resource 'sxx-vm-linux-001-nic-01-diagnosticSettings' of type 'Microsoft.Insights/diagnosticSettings' from resource '/subscriptions/.../resourceGroups/validation-rg/providers/Microsoft.Network/networkInterfaces/sxx-vm-linux-001-nic-01'
 #>
@@ -26,9 +23,6 @@ function Invoke-ResourceRemoval {
         [Parameter(Mandatory = $true)]
         [string] $ResourceId,
 
-        [Parameter(Mandatory = $true)]
-        [string] $Name,
-
         [Parameter(Mandatory = $true)]
         [string] $Type
     )
@@ -36,8 +30,8 @@ function Invoke-ResourceRemoval {
     switch ($type) {
         'Microsoft.Insights/diagnosticSettings' {
             $parentResourceId = $resourceId.Split('/providers/{0}' -f $type)[0]
-            if ($PSCmdlet.ShouldProcess("Diagnostic setting [$name]", 'Remove')) {
-                $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name $name
+            if ($PSCmdlet.ShouldProcess(('Diagnostic setting [{0}]' -f (Split-Path $ResourceId -Leaf)), 'Remove')) {
+                $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name (Split-Path $ResourceId -Leaf)
             }
             break
         }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index fa02b523d4..fdfe6ffa21 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -7,10 +7,10 @@ Remove the given resource(s)
 Remove the given resource(s). Resources that the script fails to removed are returned in an array.
 
 .PARAMETER ResourcesToRemove
-Mandatory. The resource(s) to remove. Each resource must have a name (optional), type (optional) & resourceId property.
+Mandatory. The resource(s) to remove. Each resource must have a type & resourceId property.
 
 .EXAMPLE
-Remove-ResourceListInner -ResourcesToRemove @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceListInner -ResourcesToRemove @( @{ Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 #>
 function Remove-ResourceListInner {
 
@@ -40,14 +40,14 @@ function Remove-ResourceListInner {
 
             if ($alreadyProcessed) {
                 # Skipping
-                Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f $resource.name, $resource.type) -Verbose
+                Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f (Split-Path $resource.resourceId -Leaf), $resource.type) -Verbose
                 [array]$processedResources += $resource.resourceId
                 [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
             } else {
-                Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resource.name, $resource.type) -Verbose
+                Write-Verbose ('Removing resource [{0}] of type [{1}]' -f (Split-Path $resource.resourceId -Leaf), $resource.type) -Verbose
                 try {
                     if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
-                        Invoke-ResourceRemoval -Name $resource.name -Type $resource.type -ResourceId $resource.resourceId
+                        Invoke-ResourceRemoval -Type $resource.type -ResourceId $resource.resourceId
                     }
 
                     # If we removed a parent remove its children
@@ -61,7 +61,7 @@ function Remove-ResourceListInner {
 
             # We want to purge resources even if they were not explicitly removed because they were 'alreadyProcessed'
             if ($PSCmdlet.ShouldProcess(('Post-resource-removal for [{0}]' -f $resource.resourceId), 'Execute')) {
-                Invoke-ResourcePostRemoval -Name $resource.name -Type $resource.type -ResourceId $resource.resourceId
+                Invoke-ResourcePostRemoval -Type $resource.type -ResourceId $resource.resourceId
             }
         }
         Write-Verbose '----------------------------------' -Verbose
@@ -81,10 +81,10 @@ Remove all resources in the provided array from Azure
 Remove all resources in the provided array from Azure. Resources are removed with a retry mechanism.
 
 .PARAMETER ResourcesToRemove
-Optional. The array of resources to remove. Has to contain objects with at least a 'resourceId' property
+Optional. The array of resources to remove. Has to contain objects with at least a 'resourceId' & 'type' property
 
 .EXAMPLE
-Remove-ResourceList @( @{ 'Name' = 'resourceName'; Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
+Remove-ResourceList @( @{ Type = 'Microsoft.Storage/storageAccounts'; ResourceId = 'subscriptions/.../storageAccounts/resourceName' } )
 
 Remove resource with ID 'subscriptions/.../storageAccounts/resourceName'.
 #>
@@ -121,7 +121,7 @@ function Remove-ResourceList {
     } while ($removalRetryCount -le $removalRetryLimit)
 
     if ($resourcesToRetry.Count -gt 0) {
-        throw ('The removal failed for resources [{0}]' -f ($resourcesToRetry.Name -join ', '))
+        throw ('The removal failed for resources [{0}]' -f ((Split-Path $resourcesToRetry.resourceId -Leaf) -join ', '))
     } else {
         Write-Verbose 'The removal completed successfully'
     }

From e1b5b52207832d8013e4e5d7a818ecb7f0302352 Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Tue, 14 Dec 2021 19:37:37 +0100
Subject: [PATCH 71/78] Update
 utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 1f84ab6843..1f2247562e 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -30,8 +30,9 @@ function Invoke-ResourcePostRemoval {
     switch ($type) {
         'Microsoft.KeyVault/vaults' {
             $resourceGroupName = $resourceId.Split('/')[4]
+            $resourceName = Split-Path $ResourceId -Leaf
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq (Split-Path $ResourceId -Leaf) -and $_.resourceGroupName -EQ $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceName -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
                 Write-Verbose ('Purging key vault [{0}]' -f (Split-Path $ResourceId -Leaf)) -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {

From e8b6632b8d9c8868e1baba1eee48f18e00f5de2c Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 00:56:08 +0100
Subject: [PATCH 72/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 1f2247562e..228dc09312 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -34,7 +34,7 @@ function Invoke-ResourcePostRemoval {
 
             $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceName -and $_.resourceGroupName -EQ $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
-                Write-Verbose ('Purging key vault [{0}]' -f (Split-Path $ResourceId -Leaf)) -Verbose
+                Write-Verbose ("Purging key vault [$resourceName]") -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
                     $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location
                 }
@@ -42,7 +42,9 @@ function Invoke-ResourcePostRemoval {
         }
         'Microsoft.CognitiveServices/accounts' {
             $resourceGroupName = $resourceId.Split('/')[4]
-            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq (Split-Path $ResourceId -Leaf) }
+            $resourceName = Split-Path $ResourceId -Leaf
+
+            $matchingAccount = Get-AzCognitiveServicesAccount -InRemovedState | Where-Object { $_.AccountName -eq $resourceName }
             if ($matchingAccount) {
                 if ($PSCmdlet.ShouldProcess(('Cognitive services account with ID [{0}]' -f $matchingAccount.Id), 'Purge')) {
                     $null = Remove-AzCognitiveServicesAccount -InRemovedState -Force -Location $matchingAccount.Location -ResourceGroupName $resourceGroupName -Name $matchingAccount.AccountName

From 4dd8bffeab715837e22366d733b4b3547f4f67e2 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 00:57:46 +0100
Subject: [PATCH 73/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourceRemoval.ps1        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
index e0679280f5..14f9891773 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourceRemoval.ps1
@@ -30,8 +30,9 @@ function Invoke-ResourceRemoval {
     switch ($type) {
         'Microsoft.Insights/diagnosticSettings' {
             $parentResourceId = $resourceId.Split('/providers/{0}' -f $type)[0]
-            if ($PSCmdlet.ShouldProcess(('Diagnostic setting [{0}]' -f (Split-Path $ResourceId -Leaf)), 'Remove')) {
-                $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name (Split-Path $ResourceId -Leaf)
+            $resourceName = Split-Path $ResourceId -Leaf
+            if ($PSCmdlet.ShouldProcess("Diagnostic setting [$resourceName]", 'Remove')) {
+                $null = Remove-AzDiagnosticSetting -ResourceId $parentResourceId -Name $resourceName
             }
             break
         }

From 2a74cb450acb3d49302437c2266e3465581b2bac Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 00:58:54 +0100
Subject: [PATCH 74/78] Update to latest

---
 .../resourceRemoval/helper/Remove-ResourceList.ps1          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
index fdfe6ffa21..ff7dce093c 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-ResourceList.ps1
@@ -35,16 +35,16 @@ function Remove-ResourceListInner {
         Write-Verbose '----------------------------------' -Verbose
 
         foreach ($resource in $resourcesToRemove) {
-
+            $resourceName = Split-Path $resource.resourceId -Leaf
             $alreadyProcessed = $processedResources.count -gt 0 ? (($processedResources | Where-Object { $resource.resourceId -like ('{0}*' -f $_) }).Count -gt 0) : $false
 
             if ($alreadyProcessed) {
                 # Skipping
-                Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f (Split-Path $resource.resourceId -Leaf), $resource.type) -Verbose
+                Write-Verbose ('Skipping resource [{0}] of type [{1}] as a parent resource was already processed' -f $resourceName, $resource.type) -Verbose
                 [array]$processedResources += $resource.resourceId
                 [array]$resourcesToRetry = $resourcesToRetry | Where-Object { $_.resourceId -notmatch $resource.resourceId }
             } else {
-                Write-Verbose ('Removing resource [{0}] of type [{1}]' -f (Split-Path $resource.resourceId -Leaf), $resource.type) -Verbose
+                Write-Verbose ('Removing resource [{0}] of type [{1}]' -f $resourceName, $resource.type) -Verbose
                 try {
                     if ($PSCmdlet.ShouldProcess(('Resource [{0}]' -f $resource.resourceId), 'Remove')) {
                         Invoke-ResourceRemoval -Type $resource.type -ResourceId $resource.resourceId

From 2fc6e7da4a670e619f51d9b37a72b8918420d2fa Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 01:04:03 +0100
Subject: [PATCH 75/78] Fix for deployment

---
 .../pipelines/resourceDeployment/New-ModuleDeployment.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1 b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
index e0f34b4706..0085b7ba1b 100644
--- a/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
+++ b/utilities/pipelines/resourceDeployment/New-ModuleDeployment.ps1
@@ -108,7 +108,7 @@ function New-DeploymentWithParameterFile {
 
         # Parameter file provided yes/no
         if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
-            $DeploymentInputs['TemplateParameterFile'] = $parameterFile
+            $DeploymentInputs['TemplateParameterFile'] = $parameterFilePath
         }
 
         # Additional parameter object provided yes/no
@@ -122,7 +122,7 @@ function New-DeploymentWithParameterFile {
 
             # Parameter tags
             if (-not [String]::IsNullOrEmpty($parameterFilePath)) {
-                $parameterFileTags = (ConvertFrom-Json (Get-Content -Raw -Path $parameterFile) -AsHashtable).parameters.tags.value
+                $parameterFileTags = (ConvertFrom-Json (Get-Content -Raw -Path $parameterFilePath) -AsHashtable).parameters.tags.value
             }
             if (-not $parameterFileTags) { $parameterFileTags = @{} }
 
@@ -337,9 +337,9 @@ function New-ModuleDeployment {
         if ($parameterFilePath) {
             if ($parameterFilePath -is [array]) {
                 $deploymentResult = [System.Collections.ArrayList]@()
-                foreach ($parameterFile in $parameterFilePath) {
+                foreach ($path in $parameterFilePath) {
                     if ($PSCmdlet.ShouldProcess("Deployment for parameter file [$parameterFilePath]", 'Trigger')) {
-                        $deploymentResult += New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $parameterFile
+                        $deploymentResult += New-DeploymentWithParameterFile @deploymentInputObject -parameterFilePath $path
                     }
                 }
                 return $deploymentResult

From 21030d19cc6d98075ee3ea9c0b8417eed9aa3eb4 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 01:06:38 +0100
Subject: [PATCH 76/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 228dc09312..9c6c87c3f3 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -32,7 +32,7 @@ function Invoke-ResourcePostRemoval {
             $resourceGroupName = $resourceId.Split('/')[4]
             $resourceName = Split-Path $ResourceId -Leaf
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceName -and $_.resourceGroupName -EQ $resourceGroupName }
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceName -and $_.resourceGroupName -eq $resourceGroupName }
             if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
                 Write-Verbose ("Purging key vault [$resourceName]") -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {

From 08730300c21c7709786701f377a9920ca2f48156 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 09:15:18 +0100
Subject: [PATCH 77/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index 9c6c87c3f3..a6da9d3026 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -53,6 +53,7 @@ function Invoke-ResourcePostRemoval {
         }
         'Microsoft.ApiManagement/service' {
             $subscriptionId = $resourceId.Split('/')[2]
+            $resourceName = Split-Path $ResourceId -Leaf
 
             # Fetch service in soft-delete
             $getPath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01' -f $subscriptionId
@@ -64,7 +65,7 @@ function Invoke-ResourcePostRemoval {
 
             if ($softDeletedService) {
                 # Purge service
-                $purgePath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, (Split-Path $ResourceId -Leaf)
+                $purgePath = '/subscriptions/{0}/providers/Microsoft.ApiManagement/locations/{1}/deletedservices/{2}?api-version=2020-06-01-preview' -f $subscriptionId, $softDeletedService.location, $resourceName
                 $purgeRequestInputObject = @{
                     Method = 'DELETE'
                     Path   = $purgePath
@@ -78,6 +79,7 @@ function Invoke-ResourcePostRemoval {
             # Remove protected VM
             # Required if e.g. a VM was listed in an RSV and only that VM is removed
             $vaultId = $resourceId.split('/backupFabrics/')[0]
+            $resourceName = Split-Path $ResourceId -Leaf
             $softDeleteStatus = (Get-AzRecoveryServicesVaultProperty -VaultId $vaultId).SoftDeleteFeatureState
             if ($softDeleteStatus -ne 'Disabled') {
                 if ($PSCmdlet.ShouldProcess(('Soft-delete on RSV [{0}]' -f $vaultId), 'Set')) {
@@ -89,7 +91,7 @@ function Invoke-ResourcePostRemoval {
                 BackupManagementType = 'AzureVM'
                 WorkloadType         = 'AzureVM'
                 VaultId              = $vaultId
-                Name                 = Split-Path $ResourceId -Leaf
+                Name                 = $resourceName
             }
             if ($backupItem = Get-AzRecoveryServicesBackupItem @backupItemInputObject -ErrorAction 'SilentlyContinue') {
                 Write-Verbose ('Removing Backup item [{0}] from RSV [{1}]' -f $backupItem.Name, $vaultId) -Verbose

From 1ab290f248e73877666a2d345b9ad30f7153e9e2 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 15 Dec 2021 09:31:53 +0100
Subject: [PATCH 78/78] Update to latest

---
 .../resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1 b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
index a6da9d3026..a1757e152d 100644
--- a/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Invoke-ResourcePostRemoval.ps1
@@ -29,11 +29,10 @@ function Invoke-ResourcePostRemoval {
 
     switch ($type) {
         'Microsoft.KeyVault/vaults' {
-            $resourceGroupName = $resourceId.Split('/')[4]
             $resourceName = Split-Path $ResourceId -Leaf
 
-            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.VaultName -eq $resourceName -and $_.resourceGroupName -eq $resourceGroupName }
-            if ($matchingKeyVault -and -not $resource.EnablePurgeProtection) {
+            $matchingKeyVault = Get-AzKeyVault -InRemovedState | Where-Object { $_.resourceId -eq $ResourceId }
+            if ($matchingKeyVault -and -not $matchingKeyVault.EnablePurgeProtection) {
                 Write-Verbose ("Purging key vault [$resourceName]") -Verbose
                 if ($PSCmdlet.ShouldProcess(('Key Vault with ID [{0}]' -f $matchingKeyVault.Id), 'Purge')) {
                     $null = Remove-AzKeyVault -ResourceId $matchingKeyVault.Id -InRemovedState -Force -Location $matchingKeyVault.Location