Enhance standard info logging and rerun detection

Push-CIPPStandard.ps1 now builds a more detailed API key for rerun detection and sets a script-level StandardInfo object with template IDs for Intune and Conditional Access standards. Write-LogMessage.ps1 is updated to include these new StandardInfo fields in log entries, improving traceability and debugging.

Author: JohnDuprey

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

@@ -12,13 +12,32 @@ function Push-CIPPStandard {
     $Standard = $Item.Standard
     $FunctionName = 'Invoke-CIPPStandard{0}' -f $Standard
     Write-Information "We'll be running $FunctionName"
-    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API "$($Standard)_$($Item.templateId)"
+
+    if ($Standard -in @('IntuneTemplate', 'ConditionalAccessTemplate')) {
+        $API = "$Standard_$($Item.templateId)_$($Item.Settings.TemplateList.value)"
+    } else {
+        $API = "$Standard_$($Item.templateId)"
+    }
+
+    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API
     if ($Rerun) {
         Write-Information 'Detected rerun. Exiting cleanly'
         exit 0
     } else {
         Write-Information "Rerun is set to false. We'll be running $FunctionName"
     }
+
+    $script:StandardInfo = @{
+        Standard           = $Standard
+        StandardTemplateId = $Item.templateId
+    }
+    if ($Standard -eq 'IntuneTemplate') {
+        $script:StandardInfo.IntuneTemplateId = $Item.Settings.TemplateList.value
+    }
+    if ($Standard -eq 'ConditionalAccessTemplate') {
+        $script:StandardInfo.ConditionalAccessTemplateId = $Item.Settings.TemplateList.value
+    }
+
     try {
         # Convert settings to JSON, replace %variables%, then convert back to object
         $SettingsJSON = $Item.Settings | ConvertTo-Json -Depth 10 -Compress

Modules/CIPPCore/Public/GraphHelper/Write-LogMessage.ps1

@@ -66,6 +66,16 @@ function Write-LogMessage {
     if ($tenantId) {
         $TableRow.Add('TenantID', [string]$tenantId)
     }
+    if ($script:StandardInfo) {
+        $TableRow.Standard = [string]$script:StandardInfo.Standard
+        $TableRow.StandardTemplateId = [string]$script:StandardInfo.StandardTemplateId
+        if ($script:StandardInfo.IntuneTemplate) {
+            $TableRow.IntuneTemplateId = [string]$script:StandardInfo.IntuneTemplateId
+        }
+        if ($script:StandardInfo.ConditionalAccessTemplate) {
+            $TableRow.ConditionalAccessTemplateId = [string]$script:StandardInfo.ConditionalAccessTemplateId
+        }
+    }
 
     $Table.Entity = $TableRow
     Add-CIPPAzDataTableEntity @Table | Out-Null