Merge pull request KelvinTegelaar#1786 from KelvinTegelaar/dev

Dev to hf

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPDBCacheData.ps1

@@ -183,7 +183,7 @@ function Push-CIPPDBCacheData {
 
         if ($Item.TestRun -eq $true) {
             $InputObject | Add-Member -NotePropertyName PostExecution -NotePropertyValue @{
-                FunctionName = 'CIPPTestsRun'
+                FunctionName = 'CIPPDBTestsRun'
                 Parameters   = @{
                     TenantFilter = $TenantFilter
                 }

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1

@@ -1,4 +1,4 @@
-function Invoke-CIPPTestsRun {
+function Invoke-CIPPDBTestsRun {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -13,6 +13,17 @@ function Invoke-CIPPTestsRun {
 
     Write-Information "Starting tests run for tenant: $TenantFilter"
 
+    Write-Host 'Checking rerun protection'
+    $RerunParams = @{
+        TenantFilter = $TenantFilter
+        Type         = 'CippTests'
+        API          = 'CippTests'
+    }
+    $Rerun = Test-CIPPRerun @RerunParams
+    if ($Rerun -eq $true) {
+        Write-Host "rerun is true for $($TenantFilter)"
+        return $true
+    }
     try {
         $AllTests = Get-Command -Name 'Invoke-CippTest*' -Module CIPPCore | Select-Object -ExpandProperty Name | ForEach-Object {
             $_ -replace '^Invoke-CippTest', ''

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTest.ps1

@@ -22,6 +22,8 @@ function Push-CIPPTest {
 
         Write-Information "Executing $FunctionName for $TenantFilter"
         & $FunctionName -Tenant $TenantFilter
+        Write-Host "Returning true, test has run for $tenantFilter"
+        return @{ testRun = $true }
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1

@@ -1,4 +1,4 @@
-function Push-CIPPTestsRun {
+function Push-CIPPDBTestsRun {
     <#
     .SYNOPSIS
         PostExecution function to run tests after data collection completes
@@ -13,7 +13,7 @@ function Push-CIPPTestsRun {
         Write-LogMessage -API 'Tests' -tenant $TenantFilter -message 'Starting test run after data collection' -sev Info
 
         # Call the test run function
-        $Result = Invoke-CIPPTestsRun -TenantFilter $TenantFilter
+        $Result = Invoke-CIPPDBTestsRun -TenantFilter $TenantFilter
 
         Write-LogMessage -API 'Tests' -tenant $TenantFilter -message "Test run started. Instance ID: $($Result.InstanceId)" -sev Info
         Write-Information "PostExecution: Tests started with Instance ID: $($Result.InstanceId)"

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-TestsOrchestrator.ps1

@@ -11,6 +11,6 @@ function Start-TestsOrchestrator {
 
     if ($PSCmdlet.ShouldProcess('Start-TestsOrchestrator', 'Starting Tests Orchestrator')) {
         Write-LogMessage -API 'Tests' -message 'Starting Tests Schedule' -sev Info
-        Invoke-CIPPTestsRun -TenantFilter 'allTenants'
+        Invoke-CIPPDBTestsRun -TenantFilter 'allTenants'
     }
 }

Modules/CIPPCore/Public/Set-CIPPDBCacheManagedDevices.ps1

@@ -15,6 +15,7 @@ function Set-CIPPDBCacheManagedDevices {
     try {
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching managed devices' -sev Debug
         $ManagedDevices = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/managedDevices?$top=999&$select=id,deviceName,operatingSystem,osVersion,complianceState,managedDeviceOwnerType,enrolledDateTime,lastSyncDateTime' -tenantid $TenantFilter
+        if (!$ManagedDevices) { $ManagedDevices = @() }
         Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'ManagedDevices' -Data $ManagedDevices
         Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'ManagedDevices' -Data $ManagedDevices -Count
         $ManagedDevices = $null

Modules/CIPPCore/Public/Test-CIPPRerun.ps1

@@ -20,6 +20,7 @@ function Test-CIPPRerun {
         $EstimatedDifference = switch ($Type) {
             'Standard' { 9800 } # 2 hours 45 minutes ish.
             'BPA' { 85000 } # 24 hours ish.
+            'CippTests' { 85000 } # 24 hours ish.
             default { throw "Unknown type: $Type" }
         }
     }

host.json

@@ -16,7 +16,7 @@
         "distributedTracingEnabled": false,
         "version": "None"
       },
-      "defaultVersion": "10.0.4",
+      "defaultVersion": "10.0.5",
       "versionMatchStrategy": "Strict",
       "versionFailureStrategy": "Fail"
     }

version_latest.txt

@@ -1 +1 @@
-10.0.4
+10.0.5