simplify cleanup

Author: JohnDuprey

Modules/CIPPCore/Public/Clear-CippDurables.ps1

@@ -1,13 +1,20 @@
 function Clear-CippDurables {
     [CmdletBinding(SupportsShouldProcess = $true)]
-    Param()
+    param()
     # Collect info
     $StorageContext = New-AzStorageContext -ConnectionString $env:AzureWebJobsStorage
     $FunctionName = $env:WEBSITE_SITE_NAME -replace '-', ''
 
     # Get orchestrators
     $InstancesTable = Get-CippTable -TableName ('{0}Instances' -f $FunctionName)
     $HistoryTable = Get-CippTable -TableName ('{0}History' -f $FunctionName)
+    $QueueTable = Get-CippTable -TableName 'CippQueue'
+    $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
+
+    Remove-AzDataTable @InstancesTable
+    Remove-AzDataTable @HistoryTable
+    Remove-AzDataTable @QueueTable
+    Remove-AzDataTable @CippQueueTasks
 
     $Queues = Get-AzStorageQueue -Context $StorageContext -Name ('{0}*' -f $FunctionName) | Select-Object -Property Name, ApproximateMessageCount, QueueClient
 
@@ -19,8 +26,6 @@ function Clear-CippDurables {
         }
     }
 
-    Remove-AzDataTable @InstancesTable
-    Remove-AzDataTable @HistoryTable
     $BlobContainer = '{0}-largemessages' -f $FunctionName
     if (Get-AzStorageContainer -Name $BlobContainer -Context $StorageContext -ErrorAction SilentlyContinue) {
         Write-Information "- Removing blob container: $BlobContainer"
@@ -29,32 +34,6 @@ function Clear-CippDurables {
         }
     }
 
-    $QueueTable = Get-CippTable -TableName 'CippQueue'
-    $CippQueue = Invoke-ListCippQueue
-    $QueueEntities = foreach ($Queue in $CippQueue) {
-        if ($Queue.Status -eq 'Running') {
-            $Queue.TotalTasks = $Queue.CompletedTasks
-            $Queue | Select-Object -Property PartitionKey, RowKey, TotalTasks
-        }
-    }
-    if (($QueueEntities | Measure-Object).Count -gt 0) {
-        if ($PSCmdlet.ShouldProcess('Queues', 'Mark Failed')) {
-            Update-AzDataTableEntity -Force @QueueTable -Entity $QueueEntities
-        }
-    }
-
-    $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
-    $RunningTasks = Get-CIPPAzDataTableEntity @CippQueueTasks -Filter "PartitionKey eq 'Task' and Status eq 'Running'" -Property RowKey, PartitionKey, Status
-    if (($RunningTasks | Measure-Object).Count -gt 0) {
-        if ($PSCmdlet.ShouldProcess('Tasks', 'Mark Failed')) {
-            $UpdatedTasks = foreach ($Task in $RunningTasks) {
-                $Task.Status = 'Failed'
-                $Task
-            }
-            Update-AzDataTableEntity -Force @CippQueueTasks -Entity $UpdatedTasks
-        }
-    }
-
     $null = Get-CippTable -TableName ('{0}History' -f $FunctionName)
     Write-Information 'Durable Orchestrators and Queues have been cleared'
     return $true