From d6ce4dd12e06fadd85d2a9af76d5c00e93e5fd84 Mon Sep 17 00:00:00 2001
From: unknown <ssmith@mediquant.com>
Date: Tue, 26 May 2026 16:05:25 -0400
Subject: [PATCH] Handle classicAdministrators InvalidResourceType without
 stopping run

---
 pwsh/AzGovVizParallel.ps1                     | 21 ++++++++++++++-----
 .../dataCollectionFunctions.ps1               | 21 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/pwsh/AzGovVizParallel.ps1 b/pwsh/AzGovVizParallel.ps1
index a06b881..8a27186 100644
--- a/pwsh/AzGovVizParallel.ps1
+++ b/pwsh/AzGovVizParallel.ps1
@@ -35801,11 +35801,21 @@ function dataCollectionClassicAdministratorsSub {
         method                 = 'GET'
         currentTask            = "classicAdministrators '$($scopeDisplayName)' ('$scopeId') [quotaId:'$subscriptionQuotaId']"
         AzAPICallConfiguration = $azAPICallConf
+        skipOnErrorCode        = 404
+        unhandledErrorAction   = 'Continue'
     }
 
     $AzApiCallResult = AzAPICall @azAPICallPayload
-    if ($AzApiCallResult -ne 'ClassicAdministratorListFailed') {
-        $arrayClassicAdministrators = [System.Collections.ArrayList]@()
+    $arrayClassicAdministrators = [System.Collections.ArrayList]@()
+
+    if (
+        $AzApiCallResult -eq 'InvalidResourceType' -or
+        $AzApiCallResult -eq 'someError' -or
+        $AzApiCallResult -eq 'ClassicAdministratorListFailed'
+    ) {
+        Write-Host "[dataCollectionClassicAdministratorsSub] classicAdministrators endpoint not supported or unavailable for subscription '$scopeDisplayName' ('$scopeId'); continuing with empty result"
+    }
+    else {
         foreach ($roleAll in $AzApiCallResult) {
             $splitPropertiesRole = $roleAll.properties.role.Split(';')
             foreach ($role in $splitPropertiesRole) {
@@ -35819,9 +35829,10 @@ function dataCollectionClassicAdministratorsSub {
                     })
             }
         }
-        $script:htClassicAdministrators.($scopeId) = @{
-            ClassicAdministrators = $arrayClassicAdministrators
-        }
+    }
+
+    $script:htClassicAdministrators.($scopeId) = @{
+        ClassicAdministrators = $arrayClassicAdministrators
     }
 }
 $funcDataCollectionClassicAdministratorsSub = $function:dataCollectionClassicAdministratorsSub.ToString()
diff --git a/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1 b/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
index b070447..b9fbc79 100644
--- a/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
+++ b/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
@@ -4204,11 +4204,21 @@ function dataCollectionClassicAdministratorsSub {
         method                 = 'GET'
         currentTask            = "classicAdministrators '$($scopeDisplayName)' ('$scopeId') [quotaId:'$subscriptionQuotaId']"
         AzAPICallConfiguration = $azAPICallConf
+        skipOnErrorCode        = 404
+        unhandledErrorAction   = 'Continue'
     }
 
     $AzApiCallResult = AzAPICall @azAPICallPayload
-    if ($AzApiCallResult -ne 'ClassicAdministratorListFailed') {
-        $arrayClassicAdministrators = [System.Collections.ArrayList]@()
+    $arrayClassicAdministrators = [System.Collections.ArrayList]@()
+
+    if (
+        $AzApiCallResult -eq 'InvalidResourceType' -or
+        $AzApiCallResult -eq 'someError' -or
+        $AzApiCallResult -eq 'ClassicAdministratorListFailed'
+    ) {
+        Write-Host "[dataCollectionClassicAdministratorsSub] classicAdministrators endpoint not supported or unavailable for subscription '$scopeDisplayName' ('$scopeId'); continuing with empty result"
+    }
+    else {
         foreach ($roleAll in $AzApiCallResult) {
             $splitPropertiesRole = $roleAll.properties.role.Split(';')
             foreach ($role in $splitPropertiesRole) {
@@ -4222,9 +4232,10 @@ function dataCollectionClassicAdministratorsSub {
                     })
             }
         }
-        $script:htClassicAdministrators.($scopeId) = @{
-            ClassicAdministrators = $arrayClassicAdministrators
-        }
+    }
+
+    $script:htClassicAdministrators.($scopeId) = @{
+        ClassicAdministrators = $arrayClassicAdministrators
     }
 }
 $funcDataCollectionClassicAdministratorsSub = $function:dataCollectionClassicAdministratorsSub.ToString()