Skip to content

Commit 312b254

Browse files
guarding for errors on compare
1 parent 9f60774 commit 312b254

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ function Invoke-CIPPStandardConditionalAccessTemplate {
121121
} else {
122122
$templateResult = New-CIPPCATemplate -TenantFilter $tenant -JSON $CheckExististing -preloadedLocations $preloadedLocations
123123
$CompareObj = ConvertFrom-Json -ErrorAction SilentlyContinue -InputObject $templateResult
124+
if ($null -eq $Policy -or $null -eq $CompareObj) {
125+
$nullSide = if ($null -eq $Policy) { 'template policy' } else { 'tenant policy conversion' }
126+
Write-LogMessage -API 'Standards' -tenant $Tenant -message "Cannot compare CA policy: $nullSide returned null for $($Settings.TemplateList.label)" -sev Error
127+
Set-CIPPStandardsCompareField -FieldName "standards.ConditionalAccessTemplate.$($Settings.TemplateList.value)" -FieldValue "Error comparing policy: $nullSide returned null" -Tenant $Tenant
128+
return
129+
}
124130
try {
125131
$Compare = Compare-CIPPIntuneObject -ReferenceObject $Policy -DifferenceObject $CompareObj -CompareType 'ca'
126132
} catch {

0 commit comments

Comments
 (0)