Merge pull request #584 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -7,7 +7,11 @@ function Push-ExecScheduledCommand {
     $item = $Item | ConvertTo-Json -Depth 100 | ConvertFrom-Json
     Write-Information "We are going to be running a scheduled task: $($Item.TaskInfo | ConvertTo-Json -Depth 10)"
 
-    $script:ScheduledTaskId = $Item.TaskInfo.RowKey
+    # Initialize AsyncLocal storage for thread-safe per-invocation context
+    if (-not $script:CippScheduledTaskIdStorage) {
+        $script:CippScheduledTaskIdStorage = [System.Threading.AsyncLocal[string]]::new()
+    }
+    $script:CippScheduledTaskIdStorage.Value = $Item.TaskInfo.RowKey
 
     $Table = Get-CippTable -tablename 'ScheduledTasks'
     $task = $Item.TaskInfo

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1

@@ -38,7 +38,11 @@ function Push-CIPPStandard {
         $StandardInfo.ConditionalAccessTemplateId = $Item.Settings.TemplateList.value
     }
 
-    $Script:StandardInfo = $StandardInfo
+    # Initialize AsyncLocal storage for thread-safe per-invocation context
+    if (-not $script:CippStandardInfoStorage) {
+        $script:CippStandardInfoStorage = [System.Threading.AsyncLocal[object]]::new()
+    }
+    $script:CippStandardInfoStorage.Value = $StandardInfo
 
     try {
         # Convert settings to JSON, replace %variables%, then convert back to object
@@ -51,11 +55,11 @@ function Push-CIPPStandard {
 
         # Prepare telemetry metadata for standard execution
         $metadata = @{
-            Standard       = $Standard
-            Tenant         = $Tenant
-            TemplateId     = $Item.templateId
-            FunctionName   = $FunctionName
-            TriggerType    = 'Standard'
+            Standard     = $Standard
+            Tenant       = $Tenant
+            TemplateId   = $Item.templateId
+            FunctionName = $FunctionName
+            TriggerType  = 'Standard'
         }
 
         # Add template-specific metadata
@@ -78,6 +82,8 @@ function Push-CIPPStandard {
         Write-Information $_.InvocationInfo.PositionMessage
         throw $_.Exception.Message
     } finally {
-        Remove-Variable -Name StandardInfo -Scope Script -ErrorAction SilentlyContinue
+        if ($script:CippStandardInfoStorage) {
+            $script:CippStandardInfoStorage.Value = $null
+        }
     }
 }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListApiTest.ps1

@@ -10,6 +10,7 @@ function Invoke-ListApiTest {
 
     $Response = @{}
     $Response.Request = $Request
+    $Response.TriggerMetadata = $TriggerMetadata
     if ($env:DEBUG_ENV_VARS -eq 'true') {
         $BlockedKeys = @('ApplicationSecret', 'RefreshToken', 'AzureWebJobsStorage', 'DEPLOYMENT_STORAGE_CONNECTION_STRING')
         $EnvironmentVariables = [PSCustomObject]@{}
@@ -18,8 +19,8 @@ function Invoke-ListApiTest {
         }
         $Response.EnvironmentVariables = $EnvironmentVariables
     }
-    $Response.AllowedTenants = $script:AllowedTenants
-    $Response.AllowedGroups = $script:AllowedGroups
+    $Response.AllowedTenants = $script:CippAllowedTenantsStorage.Value
+    $Response.AllowedGroups = $script:CippAllowedGroupsStorage.Value
 
     return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1

@@ -12,6 +12,22 @@ function New-CippCoreRequest {
     [CmdletBinding(SupportsShouldProcess = $true)]
     param($Request, $TriggerMetadata)
 
+    # Initialize AsyncLocal storage for thread-safe per-invocation context
+    if (-not $script:CippInvocationIdStorage) {
+        $script:CippInvocationIdStorage = [System.Threading.AsyncLocal[string]]::new()
+    }
+    if (-not $script:CippAllowedTenantsStorage) {
+        $script:CippAllowedTenantsStorage = [System.Threading.AsyncLocal[object]]::new()
+    }
+    if (-not $script:CippAllowedGroupsStorage) {
+        $script:CippAllowedGroupsStorage = [System.Threading.AsyncLocal[object]]::new()
+    }
+
+    # Set InvocationId in AsyncLocal storage for console logging correlation
+    if ($global:TelemetryClient -and $TriggerMetadata.InvocationId) {
+        $script:CippInvocationIdStorage.Value = $TriggerMetadata.InvocationId
+    }
+
     $FunctionName = 'Invoke-{0}' -f $Request.Params.CIPPEndpoint
     Write-Information "API Endpoint: $($Request.Params.CIPPEndpoint) | Frontend Version: $($Request.Headers.'X-CIPP-Version' ?? 'Not specified')"
 
@@ -58,11 +74,11 @@ function New-CippCoreRequest {
 
             if ($AllowedTenants -notcontains 'AllTenants') {
                 Write-Warning 'Limiting tenant access'
-                $script:AllowedTenants = $AllowedTenants
+                $script:CippAllowedTenantsStorage.Value = $AllowedTenants
             }
             if ($AllowedGroups -notcontains 'AllGroups') {
                 Write-Warning 'Limiting group access'
-                $script:AllowedGroups = $AllowedGroups
+                $script:CippAllowedGroupsStorage.Value = $AllowedGroups
             }
 
             try {

Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1

@@ -24,12 +24,10 @@ function Get-CIPPTenantAlignment {
         [Parameter(Mandatory = $false)]
         [string]$TemplateId
     )
-
+    $TemplateTable = Get-CippTable -tablename 'templates'
+    $TemplateFilter = "PartitionKey eq 'StandardsTemplateV2'"
     try {
         # Get all standard templates
-        $TemplateTable = Get-CippTable -tablename 'templates'
-        $TemplateFilter = "PartitionKey eq 'StandardsTemplateV2'"
-
         $Templates = (Get-CIPPAzDataTableEntity @TemplateTable -Filter $TemplateFilter) | ForEach-Object {
             $JSON = $_.JSON -replace '"Action":', '"action":'
             try {
@@ -51,19 +49,30 @@ function Get-CIPPTenantAlignment {
         }
 
         # Get standards comparison data
-        $StandardsTable = Get-CIPPTable -TableName 'CippStandardsReports'
-        $AllStandards = Get-CIPPAzDataTableEntity @StandardsTable -Filter "PartitionKey ne 'StandardReport' and PartitionKey ne ''"
+        $AllStandards = Measure-CippTask -TaskName 'LoadStandardsData' -EventName 'CIPP.AlignmentStatus' -Metadata @{
+            Tenant  = $TenantFilter
+            Section = 'LoadStandardsData'
+        } -Script {
+            $StandardsTable = Get-CippTable -TableName 'CippStandardsReports'
+            #this if statement is to bring down performance when running scheduled checks, we have to revisit this to a better query due to the extreme size this can get.
+            if ($TenantFilter) {
+                $filter = "PartitionKey eq '$TenantFilter'"
+            } else {
+                $filter = "PartitionKey ne 'StandardReport' and PartitionKey ne ''"
+            }
+            Get-CIPPAzDataTableEntity @StandardsTable -Filter $filter
+        }
 
         # Filter by tenant if specified
         $Standards = if ($TenantFilter) {
-            $AllStandards | Where-Object { $_.PartitionKey -eq $TenantFilter }
+            $AllStandards
         } else {
             $Tenants = Get-Tenants -IncludeErrors
             $AllStandards | Where-Object { $_.PartitionKey -in $Tenants.defaultDomainName }
         }
 
         # Build tenant standards data structure
-        $TenantStandards = @{}
+        $tenantData = @{}
         foreach ($Standard in $Standards) {
             $FieldName = $Standard.RowKey
             $FieldValue = $Standard.Value
@@ -86,14 +95,15 @@ function Get-CIPPTenantAlignment {
                 $FieldValue = [string]$FieldValue
             }
 
-            if (-not $TenantStandards.ContainsKey($Tenant)) {
-                $TenantStandards[$Tenant] = @{}
+            if (-not $tenantData.ContainsKey($Tenant)) {
+                $tenantData[$Tenant] = @{}
             }
-            $TenantStandards[$Tenant][$FieldName] = @{
+            $tenantData[$Tenant][$FieldName] = @{
                 Value       = $FieldValue
                 LastRefresh = $Standard.TimeStamp.ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ')
             }
         }
+        $TenantStandards = $tenantData
 
         $Results = [System.Collections.Generic.List[object]]::new()