Merge pull request #195 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

.github/workflows/dev_cipp27qz5.yml

@@ -44,7 +44,7 @@ function Clear-CippDurables {
     }
 
     $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
-    $RunningTasks = Get-CIPPAzDataTableEntity @CippQueueTasks -Filter "Status eq 'Running'" -Property RowKey, PartitionKey, Status
+    $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) {

.github/workflows/dev_cipppwrro.yml

@@ -116,7 +116,7 @@ function Invoke-ExecDurableFunctions {
                 }
 
                 $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
-                $RunningTasks = Get-CIPPAzDataTableEntity @CippQueueTasks -Filter "Status eq 'Running'" -Property RowKey, PartitionKey, Status
+                $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) {

.github/workflows/dev_cippyumsh-proc.yml

@@ -0,0 +1,56 @@
+function Invoke-PublicPing {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Public
+    #>
+    [CmdletBinding()]
+    Param(
+        $Request,
+        $TriggerMetadata
+    )
+
+    $KeepaliveTable = Get-CippTable -tablename 'CippKeepAlive'
+    $LastKeepalive = Get-CippAzDataTableEntity @KeepaliveTable -Filter "PartitionKey eq 'Ping' and RowKey eq 'Ping'"
+
+    if ($LastKeepalive.Timestamp) {
+        $LastKeepalive = $LastKeepalive.Timestamp.DateTime.ToUniversalTime()
+    } else {
+        $LastKeepalive = (Get-Date).AddSeconds(-600).ToUniversalTime()
+    }
+    $KeepaliveInterval = -300
+    $NextKeepAlive = (Get-Date).AddSeconds($KeepaliveInterval).ToUniversalTime()
+
+    $IsColdStart = $Request.Headers.'x-ms-coldstart' -eq 1
+
+    if ($LastKeepalive -le $NextKeepAlive -or $IsColdStart) {
+        $Keepalive = @{
+            PartitionKey = 'Ping'
+            RowKey       = 'Ping'
+        }
+        Add-AzDataTableEntity @KeepaliveTable -Entity $Keepalive -Force
+
+        if ($IsColdStart) {
+            $Milliseconds = 500
+        } else {
+            $Milliseconds = 150
+        }
+
+        Start-Sleep -Milliseconds $Milliseconds
+    }
+
+    $Body = @{
+        Results = @{
+            Message   = 'Pong'
+            ColdStart = $IsColdStart
+            Timestamp = (Get-Date).ToUniversalTime()
+            RequestId = $TriggerMetadata.InvocationId
+        }
+    }
+
+    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = ($Body | ConvertTo-Json -Depth 5)
+        })
+}

.github/workflows/dev_cippyumsh.yml

@@ -17,31 +17,31 @@ function Start-TableCleanup {
         @{
             DataTableProps = @{
                 Context  = (Get-CIPPTable -tablename 'AuditLogSearches').Context
-                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-1).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                Filter   = "PartitionKey eq 'Search' and Timestamp lt datetime'$((Get-Date).AddDays(-1).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
                 First    = 10000
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }
         }
         @{
             DataTableProps = @{
                 Context  = (Get-CIPPTable -tablename 'CippFunctionStats').Context
-                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                Filter   = "PartitionKey eq 'Durable' and Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
                 First    = 10000
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }
         }
         @{
             DataTableProps = @{
                 Context  = (Get-CIPPTable -tablename 'CippQueue').Context
-                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                Filter   = "PartitionKey eq 'CippQueue' and Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
                 First    = 10000
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }
         }
         @{
             DataTableProps = @{
                 Context  = (Get-CIPPTable -tablename 'CippQueueTasks').Context
-                Filter   = "Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
+                Filter   = "PartitionKey eq 'Task' and Timestamp lt datetime'$((Get-Date).AddDays(-7).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ'))'"
                 First    = 10000
                 Property = @('PartitionKey', 'RowKey', 'ETag')
             }
@@ -61,7 +61,7 @@ function Start-TableCleanup {
                     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 $_)
+                        #Write-LogMessage -API 'TableCleanup' -message "Failed to delete table $($Table.Context.TableName)" -sev Error -LogData (Get-CippException -Exception $_)
                     }
                 }
             } catch {