v6_major_20221202_5

JulianHayward · Dec 2, 2022 · d9cc426 · d9cc426
1 parent 92cb043
commit d9cc426
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 21 deletions.
diff --git a/.azuredevops/pipelines/AzGovViz.variables.yml b/.azuredevops/pipelines/AzGovViz.variables.yml
@@ -1,4 +1,4 @@
-# AzGovViz v6_major_20221023_1
+# AzGovViz v6_major_20221202_4
 # First things first:
 # 1. Replace <YourServiceConnection> with the name of your service connection
 # 2. Replace <YourManagementGroupId> with the your ManagementGroupId
@@ -257,7 +257,7 @@ variables:
 
   # Define the number of script blocks running in parallel. Leveraging PowerShell Core´s parallel capability you can define the ThrottleLimit (default=5)
   - name: ThrottleLimit
-    # Integer | Default = 5 | example: value: 10
+    # Integer | Default = 10 | example: value: 11
     value:
 
   # Will show memory usage

diff --git a/pwsh/AzGovVizParallel.ps1 b/pwsh/AzGovVizParallel.ps1
@@ -359,10 +359,10 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $AzAPICallVersion = '1.1.55',
+    $AzAPICallVersion = '1.1.57',
 
     [string]
-    $ProductVersion = 'v6_major_20221202_3',
+    $ProductVersion = 'v6_major_20221202_5',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',
@@ -659,6 +659,7 @@ function addHtParameters {
         NoStorageAccountAccessAnalysis               = [bool]$NoStorageAccountAccessAnalysis
         GitHubActionsOIDC                            = [bool]$GitHubActionsOIDC
         NoNetwork                                    = [bool]$NoNetwork
+        ThrottleLimit                                = $ThrottleLimit
     }
     Write-Host 'htParameters:'
     $azAPICallConf['htParameters'] | Format-Table -AutoSize | Out-String
@@ -3267,8 +3268,11 @@ function getOrphanedResources {
             $subscriptions = '"{0}"' -f ($batch.Group.subscriptionId -join '","')
             $body = @"
 {
-"query": "$($queryDetail.query)",
-"subscriptions": [$($subscriptions)]
+    "query": "$($queryDetail.query)",
+    "subscriptions": [$($subscriptions)],
+    "options": {
+        "`$top": 100
+    }
 }
 "@
 
@@ -14361,7 +14365,7 @@ extensions: [{ name: 'sort' }]
 
             $htmlSUMMARYALZPolicyVersionChecker = $null
             $exemptionData4CSVExport = [System.Collections.ArrayList]@()
-            $alzPoliciesInTenantSorted = $alzPoliciesInTenant | Sort-Object -Property PolicyName, PolicyId, ALZPolicyName
+            $alzPoliciesInTenantSorted = $alzPoliciesInTenant | Sort-Object -Property PolicyName, PolicyId, ALZPolicyName, Type
             $htmlSUMMARYALZPolicyVersionChecker = foreach ($entry in $alzPoliciesInTenantSorted) {
                 if ([string]::IsNullOrWhiteSpace($entry.AzAdvertizerUrl)) {
                     $link = ''
@@ -28281,19 +28285,21 @@ function dataCollectionResources {
 
                 if ($htResourceProvidersRef.($resource.type)) {
                     $apiVersionToUse = $htResourceProvidersRef.($resource.type).APIFirst
-                    $currentTask = "Getting Resource for PSRule API-version: '{0}'; ResourceId: '{1}'" -f $apiVersionToUse, $resourceId
+                    $currentTask = "Getting Resource for PSRule API-version: '$apiVersionToUse'; ResourceType: '$($resource.type)'; ResourceId: '$resourceId'"
                     $uri = "$($azAPICallConf['azAPIEndpointUrls'].ARM)$($resourceId)?api-version=$apiVersionToUse"
                     $method = 'GET'
-                    $resource = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -listenOn Content -unhandledErrorAction Continue
-                    $null = $script:arrayResourcesWithProperties.Add($resource)
+                    $resourceResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -listenOn Content -unhandledErrorAction Continue
+                    if ($resourceResult -ne 'ResourceOrResourcegroupNotFound') {
+                        $null = $script:arrayResourcesWithProperties.Add($resourceResult)
+                    }
                 }
                 else {
                     Write-Host 'Please report at AzGovViz Repo ... No API-version matches!'
                     Write-Host 'ResourceType:' $resource.type
                     Write-Host 'ResourceId:' $resourceId
                 }
 
-            } -ThrottleLimit 20
+            } -ThrottleLimit $azAPICallConf['htParameters'].ThrottleLimit
             #Write-Host 'arm resGet count:' $arrayResourcesWithProperties.Count
 
             #             $currentTask = "Getting Resources (ARG) for Subscription: '$($scopeDisplayName)' ('$scopeId') [quotaId:'$subscriptionQuotaId']"

diff --git a/pwsh/dev/devAzGovVizParallel.ps1 b/pwsh/dev/devAzGovVizParallel.ps1
@@ -359,10 +359,10 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $AzAPICallVersion = '1.1.55',
+    $AzAPICallVersion = '1.1.57',
 
     [string]
-    $ProductVersion = 'v6_major_20221202_3',
+    $ProductVersion = 'v6_major_20221202_5',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',

diff --git a/pwsh/dev/functions/addHtParameters.ps1 b/pwsh/dev/functions/addHtParameters.ps1
@@ -38,6 +38,7 @@ function addHtParameters {
         NoStorageAccountAccessAnalysis               = [bool]$NoStorageAccountAccessAnalysis
         GitHubActionsOIDC                            = [bool]$GitHubActionsOIDC
         NoNetwork                                    = [bool]$NoNetwork
+        ThrottleLimit                                = $ThrottleLimit
     }
     Write-Host 'htParameters:'
     $azAPICallConf['htParameters'] | Format-Table -AutoSize | Out-String

diff --git a/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1 b/pwsh/dev/functions/dataCollection/dataCollectionFunctions.ps1
@@ -457,19 +457,21 @@ function dataCollectionResources {
 
                 if ($htResourceProvidersRef.($resource.type)) {
                     $apiVersionToUse = $htResourceProvidersRef.($resource.type).APIFirst
-                    $currentTask = "Getting Resource for PSRule API-version: '{0}'; ResourceId: '{1}'" -f $apiVersionToUse, $resourceId
+                    $currentTask = "Getting Resource for PSRule API-version: '$apiVersionToUse'; ResourceType: '$($resource.type)'; ResourceId: '$resourceId'"
                     $uri = "$($azAPICallConf['azAPIEndpointUrls'].ARM)$($resourceId)?api-version=$apiVersionToUse"
                     $method = 'GET'
-                    $resource = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -listenOn Content -unhandledErrorAction Continue
-                    $null = $script:arrayResourcesWithProperties.Add($resource)
+                    $resourceResult = AzAPICall -AzAPICallConfiguration $azAPICallConf -uri $uri -method $method -currentTask $currentTask -caller 'CustomDataCollection' -listenOn Content -unhandledErrorAction Continue
+                    if ($resourceResult -ne 'ResourceOrResourcegroupNotFound') {
+                        $null = $script:arrayResourcesWithProperties.Add($resourceResult)
+                    }
                 }
                 else {
                     Write-Host 'Please report at AzGovViz Repo ... No API-version matches!'
                     Write-Host 'ResourceType:' $resource.type
                     Write-Host 'ResourceId:' $resourceId
                 }
 
-            } -ThrottleLimit 20
+            } -ThrottleLimit $azAPICallConf['htParameters'].ThrottleLimit
             #Write-Host 'arm resGet count:' $arrayResourcesWithProperties.Count
 
             #             $currentTask = "Getting Resources (ARG) for Subscription: '$($scopeDisplayName)' ('$scopeId') [quotaId:'$subscriptionQuotaId']"

diff --git a/pwsh/dev/functions/getOrphanedResources.ps1 b/pwsh/dev/functions/getOrphanedResources.ps1
@@ -84,8 +84,11 @@ function getOrphanedResources {
             $subscriptions = '"{0}"' -f ($batch.Group.subscriptionId -join '","')
             $body = @"
 {
-"query": "$($queryDetail.query)",
-"subscriptions": [$($subscriptions)]
+    "query": "$($queryDetail.query)",
+    "subscriptions": [$($subscriptions)],
+    "options": {
+        "`$top": 100
+    }
 }
 "@
 

diff --git a/pwsh/dev/functions/processTenantSummary.ps1 b/pwsh/dev/functions/processTenantSummary.ps1
@@ -2496,7 +2496,7 @@ extensions: [{ name: 'sort' }]
 
             $htmlSUMMARYALZPolicyVersionChecker = $null
             $exemptionData4CSVExport = [System.Collections.ArrayList]@()
-            $alzPoliciesInTenantSorted = $alzPoliciesInTenant | Sort-Object -Property PolicyName, PolicyId, ALZPolicyName
+            $alzPoliciesInTenantSorted = $alzPoliciesInTenant | Sort-Object -Property PolicyName, PolicyId, ALZPolicyName, Type
             $htmlSUMMARYALZPolicyVersionChecker = foreach ($entry in $alzPoliciesInTenantSorted) {
                 if ([string]::IsNullOrWhiteSpace($entry.AzAdvertizerUrl)) {
                     $link = ''

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v6_major_20221202_3
+v6_major_20221202_5