Merge pull request #660 from KelvinTegelaar/dev

pull[bot] · web-flow · commit c0e31e77329f · 2026-01-03T06:41:34.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Invoke-CIPPTestsRun.ps1
@@ -73,6 +73,6 @@ function Invoke-CIPPTestsRun {
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
         Write-LogMessage -API 'Tests' -message "Failed to start tests orchestration: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
-        throw
+        throw $ErrorMessage
     }
 }
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Tests/Push-CIPPTestsRun.ps1
@@ -0,0 +1,36 @@
+function Push-CIPPTestsRun {
+    <#
+    .SYNOPSIS
+        PostExecution function to run tests after data collection completes
+    .FUNCTIONALITY
+        Entrypoint
+    #>
+    param($Item)
+
+    try {
+        $TenantFilter = $Item.Parameters.TenantFilter
+        Write-Information "PostExecution: Starting tests for tenant: $TenantFilter after data collection completed"
+        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
+
+        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)"
+
+        return @{
+            Success    = $true
+            InstanceId = $Result.InstanceId
+            Message    = $Result.Message
+        }
+    } catch {
+        $ErrorMessage = Get-CippException -Exception $_
+        Write-LogMessage -API 'Tests' -tenant $TenantFilter -message "Failed to start test run: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
+        Write-Warning "PostExecution: Error starting tests - $($ErrorMessage.NormalizedError)"
+
+        return @{
+            Success = $false
+            Error   = $ErrorMessage.NormalizedError
+        }
+    }
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExchangeRoleRepair.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExchangeRoleRepair.ps1
@@ -89,7 +89,7 @@ function Invoke-ExecExchangeRoleRepair {
         }
     }
 
-    Push-OutputBinding -Name 'Response' -Value ([HttpResponseContext]@{
+    returns ([HttpResponseContext]@{
             StatusCode = [System.Net.HttpStatusCode]::OK
             Body       = $Results
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ExecDevicePasscodeAction.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ExecDevicePasscodeAction.ps1
@@ -46,7 +46,7 @@ function Invoke-ExecDevicePasscodeAction {
         $Results = $Result
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @{Results = $Results }
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-AddTestReport.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-AddTestReport.ps1
@@ -53,7 +53,7 @@ function Invoke-AddTestReport {
         $StatusCode = [HttpStatusCode]::BadRequest
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = ConvertTo-Json -InputObject $Body -Depth 10
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-DeleteTestReport.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-DeleteTestReport.ps1
@@ -30,7 +30,7 @@ function Invoke-DeleteTestReport {
         $StatusCode = [HttpStatusCode]::BadRequest
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = ConvertTo-Json -InputObject $Body -Depth 10
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ExecTestRun.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ExecTestRun.ps1
@@ -0,0 +1,57 @@
+function Invoke-ExecTestRun {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        Tenant.Tests.ReadWrite
+    #>
+    param($Request, $TriggerMetadata)
+
+    $APIName = $TriggerMetadata.FunctionName
+    Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+
+    try {
+        $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
+        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Starting data collection and test run for tenant: $TenantFilter" -sev Info
+        $Batch = @(
+            @{
+                FunctionName = 'CIPPDBCacheData'
+                TenantFilter = $TenantFilter
+                QueueId      = $Queue.RowKey
+                QueueName    = "Cache - $TenantFilter"
+            }
+        )
+        $InputObject = [PSCustomObject]@{
+            OrchestratorName = 'TestDataCollectionAndRun'
+            Batch            = $Batch
+            PostExecution    = @{
+                FunctionName = 'CIPPTestsRun'
+                Parameters   = @{
+                    TenantFilter = $TenantFilter
+                }
+            }
+            SkipLog          = $false
+        }
+
+        $InstanceId = Start-NewOrchestration -FunctionName 'CIPPOrchestrator' -InputObject ($InputObject | ConvertTo-Json -Depth 5 -Compress)
+
+        $StatusCode = [HttpStatusCode]::OK
+        $Body = [PSCustomObject]@{
+            Results    = "Successfully started data collection and test run for $TenantFilter"
+            InstanceId = $InstanceId
+        }
+
+        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Data collection and test run orchestration started. Instance ID: $InstanceId" -sev Info
+
+    } catch {
+        $ErrorMessage = Get-CippException -Exception $_
+        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Failed to start data collection/test run: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage
+        $StatusCode = [HttpStatusCode]::BadRequest
+        $Body = @{ Message = "Failed to start data collection/test run for $TenantFilter" }
+    }
+
+    return ([HttpResponseContext]@{
+            StatusCode = $StatusCode
+            Body       = $Body
+        })
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListAvailableTests.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListAvailableTests.ps1
@@ -79,7 +79,7 @@ function Invoke-ListAvailableTests {
         $StatusCode = [HttpStatusCode]::BadRequest
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = ConvertTo-Json -InputObject $Body -Depth 10
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTestReports.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTestReports.ps1
@@ -62,7 +62,7 @@ function Invoke-ListTestReports {
         $Body = @{ Error = $ErrorMessage.NormalizedError }
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = ConvertTo-Json -InputObject $Body -Depth 10 -Compress
         })
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTests.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTests.ps1
@@ -156,7 +156,7 @@ function Invoke-ListTests {
         $Body = @{ Error = $ErrorMessage.NormalizedError }
     }
 
-    Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+    return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = $Body
         })

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,6 @@ function Invoke-CIPPTestsRun {`
`73`	`73`	`} catch {`
`74`	`74`	`$ErrorMessage = Get-CippException -Exception $_`
`75`	`75`	`Write-LogMessage -API 'Tests' -message "Failed to start tests orchestration: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage`
`76`		`- throw`
	`76`	`+ throw $ErrorMessage`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ function Invoke-ExecExchangeRoleRepair {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`- Push-OutputBinding -Name 'Response' -Value ([HttpResponseContext]@{`
	`92`	`+ returns ([HttpResponseContext]@{`
`93`	`93`	`StatusCode = [System.Net.HttpStatusCode]::OK`
`94`	`94`	`Body = $Results`
`95`	`95`	`})`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ function Invoke-ExecDevicePasscodeAction {`
`46`	`46`	`$Results = $Result`
`47`	`47`	`}`
`48`	`48`
`49`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`49`	`+ return ([HttpResponseContext]@{`
`50`	`50`	`StatusCode = $StatusCode`
`51`	`51`	`Body = @{Results = $Results }`
`52`	`52`	`})`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ function Invoke-AddTestReport {`
`53`	`53`	`$StatusCode = [HttpStatusCode]::BadRequest`
`54`	`54`	`}`
`55`	`55`
`56`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`56`	`+ return ([HttpResponseContext]@{`
`57`	`57`	`StatusCode = $StatusCode`
`58`	`58`	`Body = ConvertTo-Json -InputObject $Body -Depth 10`
`59`	`59`	`})`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function Invoke-DeleteTestReport {`
`30`	`30`	`$StatusCode = [HttpStatusCode]::BadRequest`
`31`	`31`	`}`
`32`	`32`
`33`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`33`	`+ return ([HttpResponseContext]@{`
`34`	`34`	`StatusCode = $StatusCode`
`35`	`35`	`Body = ConvertTo-Json -InputObject $Body -Depth 10`
`36`	`36`	`})`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function Invoke-ListAvailableTests {`
`79`	`79`	`$StatusCode = [HttpStatusCode]::BadRequest`
`80`	`80`	`}`
`81`	`81`
`82`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`82`	`+ return ([HttpResponseContext]@{`
`83`	`83`	`StatusCode = $StatusCode`
`84`	`84`	`Body = ConvertTo-Json -InputObject $Body -Depth 10`
`85`	`85`	`})`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function Invoke-ListTestReports {`
`62`	`62`	`$Body = @{ Error = $ErrorMessage.NormalizedError }`
`63`	`63`	`}`
`64`	`64`
`65`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`65`	`+ return([HttpResponseContext]@{`
`66`	`66`	`StatusCode = $StatusCode`
`67`	`67`	`Body = ConvertTo-Json -InputObject $Body -Depth 10 -Compress`
`68`	`68`	`})`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ function Invoke-ListTests {`
`156`	`156`	`$Body = @{ Error = $ErrorMessage.NormalizedError }`
`157`	`157`	`}`
`158`	`158`
`159`		`- Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
	`159`	`+ return ([HttpResponseContext]@{`
`160`	`160`	`StatusCode = $StatusCode`
`161`	`161`	`Body = $Body`
`162`	`162`	`})`