Skip to content

Handle VNet JSON case-collision failures with Resource Graph fallback #71

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 VNet JSON case-collision failures with Resource Graph fallback #71

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
37 changes: 35 additions & 2 deletions pwsh/AzGovVizParallel.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31829,9 +31829,42 @@ function dataCollectionVNets {
$currentTask = "Getting Virtual Networks for Subscription: '$($scopeDisplayName)' ('$scopeId') [quotaId:'$SubscriptionQuotaId']"
$uri = "$($azAPICallConf['azAPIEndpointUrls'].ARM)/subscriptions/$($scopeId)/providers/Microsoft.Network/virtualNetworks?api-version=2022-05-01"
$method = 'GET'
$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection'

if ($networkResult -eq 'someError') {
try {
$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -unhandledErrorAction Continue
}
catch {
Write-Host "[dataCollectionVNets] Primary VNet collection failed for subscription '$scopeDisplayName' ('$scopeId'): $($_.Exception.Message)"
Write-Host "[dataCollectionVNets] Trying Resource Graph fallback for subscription '$scopeDisplayName' ('$scopeId')"

try {
$uriResourceGraph = "$($azAPICallConf['azAPIEndpointUrls'].ARM)/providers/Microsoft.ResourceGraph/resources?api-version=2022-10-01"
$resourceGraphQuery = @"
resources
| where type =~ 'microsoft.network/virtualnetworks'
| where subscriptionId =~ '$scopeId'
| project id, name, location, properties
"@
$body = @"
{
"query": "$resourceGraphQuery",
"subscriptions": ["$scopeId"],
"options": {
"`$top": 1000
}
}
"@

$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uriResourceGraph -method 'POST' -body $body -listenOn 'Content' -currentTask "$currentTask (ResourceGraph fallback)" -caller 'CustomDataCollection' -unhandledErrorAction Continue
Write-Host "[dataCollectionVNets] Resource Graph fallback succeeded for subscription '$scopeDisplayName' ('$scopeId') and returned $($networkResult.Count) Virtual Networks"
}
catch {
Write-Host "[dataCollectionVNets] Skipping VNet collection for subscription '$scopeDisplayName' ('$scopeId') due to fallback error: $($_.Exception.Message)"
$networkResult = 'convertfromJSONError'
}
}

if ($networkResult -eq 'someError' -or $networkResult -eq 'convertfromJSONError') {
}
else {
if ($networkResult.Count -gt 0) {
Expand Down
37 changes: 35 additions & 2 deletions pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,42 @@ function dataCollectionVNets {
$currentTask = "Getting Virtual Networks for Subscription: '$($scopeDisplayName)' ('$scopeId') [quotaId:'$SubscriptionQuotaId']"
$uri = "$($azAPICallConf['azAPIEndpointUrls'].ARM)/subscriptions/$($scopeId)/providers/Microsoft.Network/virtualNetworks?api-version=2022-05-01"
$method = 'GET'
$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection'

if ($networkResult -eq 'someError') {
try {
$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -unhandledErrorAction Continue
}
catch {
Write-Host "[dataCollectionVNets] Primary VNet collection failed for subscription '$scopeDisplayName' ('$scopeId'): $($_.Exception.Message)"
Write-Host "[dataCollectionVNets] Trying Resource Graph fallback for subscription '$scopeDisplayName' ('$scopeId')"

try {
$uriResourceGraph = "$($azAPICallConf['azAPIEndpointUrls'].ARM)/providers/Microsoft.ResourceGraph/resources?api-version=2022-10-01"
$resourceGraphQuery = @"
resources
| where type =~ 'microsoft.network/virtualnetworks'
| where subscriptionId =~ '$scopeId'
| project id, name, location, properties
"@
$body = @"
{
"query": "$resourceGraphQuery",
"subscriptions": ["$scopeId"],
"options": {
"`$top": 1000
}
}
"@

$networkResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uriResourceGraph -method 'POST' -body $body -listenOn 'Content' -currentTask "$currentTask (ResourceGraph fallback)" -caller 'CustomDataCollection' -unhandledErrorAction Continue
Write-Host "[dataCollectionVNets] Resource Graph fallback succeeded for subscription '$scopeDisplayName' ('$scopeId') and returned $($networkResult.Count) Virtual Networks"
}
catch {
Write-Host "[dataCollectionVNets] Skipping VNet collection for subscription '$scopeDisplayName' ('$scopeId') due to fallback error: $($_.Exception.Message)"
$networkResult = 'convertfromJSONError'
}
}

if ($networkResult -eq 'someError' -or $networkResult -eq 'convertfromJSONError') {
}
else {
if ($networkResult.Count -gt 0) {
Expand Down