Skip to content

Handle classicAdministrators InvalidResourceType as non-fatal #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mq-ssmith wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle classicAdministrators InvalidResourceType as non-fatal #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions pwsh/AzGovVizParallel.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -35819,9 +35829,10 @@ function dataCollectionClassicAdministratorsSub {
})
}
}
$script:htClassicAdministrators.($scopeId) = @{
ClassicAdministrators = $arrayClassicAdministrators
}
}

$script:htClassicAdministrators.($scopeId) = @{
ClassicAdministrators = $arrayClassicAdministrators
}
}
$funcDataCollectionClassicAdministratorsSub = $function:dataCollectionClassicAdministratorsSub.ToString()
Expand Down
21 changes: 16 additions & 5 deletions pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -4222,9 +4232,10 @@ function dataCollectionClassicAdministratorsSub {
})
}
}
$script:htClassicAdministrators.($scopeId) = @{
ClassicAdministrators = $arrayClassicAdministrators
}
}

$script:htClassicAdministrators.($scopeId) = @{
ClassicAdministrators = $arrayClassicAdministrators
}
}
$funcDataCollectionClassicAdministratorsSub = $function:dataCollectionClassicAdministratorsSub.ToString()
Expand Down