chore: refactor cache cleanups

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Tenant/Invoke-ListTenants.ps1

@@ -23,8 +23,8 @@ Function Invoke-ListTenants {
     }
 
     # Clear Cache
-    if ($Request.Query.ClearCache -eq $true) {
-        Remove-CIPPCache -tenantsOnly $Request.Query.TenantsOnly
+    if ($Request.Body.ClearCache -eq $true) {
+        $Results = Remove-CIPPCache -tenantsOnly $Request.Body.TenantsOnly
 
         $InputObject = [PSCustomObject]@{
             Batch            = @(
@@ -40,7 +40,12 @@ Function Invoke-ListTenants {
         $GraphRequest = [pscustomobject]@{'Results' = 'Cache has been cleared and a tenant refresh is queued.' }
         Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
                 StatusCode = [HttpStatusCode]::OK
-                Body       = $GraphRequest
+                Body       = @{
+                    Results = @($GraphRequest)
+                    Metadata = @{
+                        Details = $Results
+                    }
+                }
             })
         #Get-Tenants -IncludeAll -TriggerRefresh
         return

Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-TableCleanup.ps1

@@ -48,7 +48,27 @@ function Start-TableCleanup {
         }
     )
 
+    $DeleteTables = @(
+        'knownlocationdb'
+    )
+
     if ($PSCmdlet.ShouldProcess('Start-TableCleanup', 'Starting Table Cleanup')) {
+        foreach ($Table in $DeleteTables) {
+            try {
+                $Table = Get-CIPPTable -tablename $Table
+                if ($Table) {
+                    Write-Information "Deleting table $($Table.Context.TableName)"
+                    try {
+                        Remove-AzDataTable -Context $Table.Context -Force
+                    } catch {
+                        Write-LogMessage -API 'TableCleanup' -message "Failed to delete table $($Table.Context.TableName)" -sev Error -LogData (Get-CippException -Exception $_)
+                    }
+                }
+            } catch {
+                Write-Information "Table $Table not found"
+            }
+        }
+
         Write-Information 'Starting table cleanup'
         foreach ($Rule in $CleanupRules) {
             if ($Rule.Where) {

Modules/CIPPCore/Public/GraphHelper/Remove-CIPPCache.ps1

@@ -13,28 +13,36 @@ function Remove-CIPPCache {
     if ($ClearIncludedTenants) {
         Remove-AzDataTableEntity -Force @TenantsTable -Entity $ClearIncludedTenants
     }
+    "Removed $($ClearIncludedTenants.Count) tenants"
 
-    if ($TenantsOnly -eq 'false') {
-        Write-Host 'Clearing all'
+    if ($TenantsOnly -eq $false) {
+        'Clearing all cached table data'
+        $Context = New-AzDataTableContext -ConnectionString $env:AzureWebJobsStorage
+        $Tables = Get-AzDataTable -Context $Context
+        foreach ($Table in $Tables) {
+            if ($Table -match '^cache') {
+                "Removing cache table $Table"
+                $TableContext = Get-CIPPTable -TableName $Table
+                Remove-AzDataTable @TableContext
+            }
+        }
+
+        'Clearing domain analyser results'
         # Remove Domain Analyser cached results
         $DomainsTable = Get-CippTable -tablename 'Domains'
         $Filter = "PartitionKey eq 'TenantDomains'"
         $ClearDomainAnalyserRows = Get-CIPPAzDataTableEntity @DomainsTable -Filter $Filter | ForEach-Object {
-            $_.DomainAnalyser = ''
+            $_ | Add-Member -MemberType NoteProperty -Name DomainAnalyser -Value '' -Force
             $_
         }
         if ($ClearDomainAnalyserRows) {
             Update-AzDataTableEntity -Force @DomainsTable -Entity $ClearDomainAnalyserRows
         }
-        #Clear BPA
-        $BPATable = Get-CippTable -tablename 'cachebpav2'
-        $ClearBPARows = Get-CIPPAzDataTableEntity @BPATable
-        if ($ClearBPARows) {
-            Remove-AzDataTableEntity -Force @BPATable -Entity $ClearBPARows
-        }
+
         $ENV:SetFromProfile = $null
         $Script:SkipListCache = $Null
         $Script:SkipListCacheEmpty = $Null
         $Script:IncludedTenantsCache = $Null
     }
+    'Cache cleanup complete'
 }