6.4.12; azAPICall 1.2.3

JulianHayward · Jul 15, 2024 · f56ab31 · f56ab31
1 parent 97c78b6
commit f56ab31
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ The [Azure Governance Visualizer accelerator](https://github.com/Azure/Azure-Gov
 
 ## Release history
 
-**Changes** (2024-July-15 / 6.4.11 Minor)
+**Changes** (2024-July-15 / 6.4.12 Minor)
 
 - ALZ policy refresh H2 FY24 (initiatives.json)
 - [DevSkim](https://github.com/microsoft/DevSkim-Action), [PSScriptAnalyzer](https://github.com/microsoft/psscriptanalyzer-action) and [OpenSSF Scorecard](https://github.com/ossf/scorecard?tab=readme-ov-file#scorecard-github-action) integration
@@ -94,6 +94,7 @@ The [Azure Governance Visualizer accelerator](https://github.com/Azure/Azure-Gov
 - update getConsumption (experimental for now): instead of full Management Group scope costmanagement data retrieval, batch by Subscription quotaId in batches of 100. Failing batches and batches of Subscriptions of quotaId `CSP_2015-05-01` (see param block variable `SubscriptionQuotaIdsThatDoNotSupportCostManagementManagementGroupScopeQuery`) will fallback to get costmanagement data per Subscription. In order to use this you must update the AzGovVizParallel.ps1 file to use the function `getConsumptionv2` instead of `getConsumption`
 - html; update jquery; source tablefilter js
 - update `.devcontainer/devcontainer.json`
+- use [AzAPICall](https://aka.ms/AzAPICall) PowerShell module version 1.2.3 (Handle costManagement error `SubscriptionCostDisabled`)
 
 [Full release history](history.md)
 

diff --git a/history.md b/history.md
@@ -4,7 +4,7 @@
 
 ### Azure Governance Visualizer version 6
 
-**Changes** (2024-July-15 / 6.4.11 Minor)
+**Changes** (2024-July-15 / 6.4.12 Minor)
 
 - ALZ policy refresh H2 FY24 (initiatives.json)
 - [DevSkim](https://github.com/microsoft/DevSkim-Action), [PSScriptAnalyzer](https://github.com/microsoft/psscriptanalyzer-action) and [OpenSSF Scorecard](https://github.com/ossf/scorecard?tab=readme-ov-file#scorecard-github-action) integration
@@ -16,6 +16,7 @@
 - update getConsumption (experimental for now): instead of full Management Group scope costmanagement data retrieval, batch by Subscription quotaId in batches of 100. Failing batches and batches of Subscriptions of quotaId `CSP_2015-05-01` (see param block variable `SubscriptionQuotaIdsThatDoNotSupportCostManagementManagementGroupScopeQuery`) will fallback to get costmanagement data per Subscription. In order to use this you must update the AzGovVizParallel.ps1 file to use the function `getConsumptionv2` instead of `getConsumption`
 - html; update jquery; source tablefilter js
 - update `.devcontainer/devcontainer.json`
+- use [AzAPICall](https://aka.ms/AzAPICall) PowerShell module version 1.2.3 (Handle costManagement error `SubscriptionCostDisabled`)
 
 **Changes** (2024-May-05 / 6.4.5 Minor)
 

diff --git a/pwsh/AzGovVizParallel.ps1 b/pwsh/AzGovVizParallel.ps1
@@ -365,14 +365,14 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $ProductVersion = '6.4.11',
+    $ProductVersion = '6.4.12',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',
 
     # <--- AzAPICall related parameters #consult the AzAPICall GitHub repository for details aka.ms/AzAPICall
     [string]
-    $AzAPICallVersion = '1.2.1',
+    $AzAPICallVersion = '1.2.3',
 
     [switch]
     $DebugAzAPICall,
@@ -3566,7 +3566,17 @@ function getConsumptionv2 {
                         }
                         $subConsumptionData = AzAPICall @subConsumptionDataParametersSplat
 
-                        if ($subConsumptionData -eq 'Unauthorized' -or $subConsumptionData -eq 'OfferNotSupported' -or $subConsumptionData -eq 'InvalidQueryDefinition' -or $subConsumptionData -eq 'NonValidWebDirectAIRSOfferType' -or $subConsumptionData -eq 'NotFoundNotSupported' -or $subConsumptionData -eq 'IndirectCostDisabled') {
+                        $subscriptionScopeKnownErrors = @(
+                            'Unauthorized',
+                            'OfferNotSupported',
+                            'InvalidQueryDefinition',
+                            'NonValidWebDirectAIRSOfferType',
+                            'NotFoundNotSupported',
+                            'IndirectCostDisabled',
+                            'SubscriptionCostDisabled'
+                        )
+
+                        if ($subConsumptionData -in $subscriptionScopeKnownErrors) {
                             Write-Host "   Failed ($subConsumptionData) - Getting Consumption data scope Sub (Subscription: $($subNameToProcess) '$($subIdToProcess)' QuotaId '$($subQuotaId)')"
                             $hlper = $htAllSubscriptionsFromAPI.($subIdToProcess).subDetails
                             $hlper2 = $htSubscriptionsMgPath.($subIdToProcess)
@@ -3583,15 +3593,15 @@ function getConsumptionv2 {
                         }
                         else {
                             Write-Host "   $($subConsumptionData.properties.rows.Count) Consumption data entries (scope Sub $($subNameToProcess) '$($subIdToProcess)')"
-                            if ($subConsumptionData.Count -gt 0) {
+                            if ($subConsumptionData.properties.rows.Count -gt 0) {
                                 addToAllConsumptionData -consumptiondataFromAPI $subConsumptionData -subscriptionQuotaId $subQuotaId
                             }
                         }
                     } -ThrottleLimit $ThrottleLimit
                 }
                 else {
                     Write-Host "  #batch$($batchCnt)/$(($subscriptionsBatch | Measure-Object).Count) for $($batch.Group.Count) Subscriptions of QuotaId '$($quotaIdGroup.Name)' returned $($mgConsumptionData.properties.rows.Count) Consumption data entries"
-                    if ($mgConsumptionData.Count -gt 0) {
+                    if ($mgConsumptionData.properties.rows.Count -gt 0) {
                         addToAllConsumptionData -consumptiondataFromAPI $mgConsumptionData -subscriptionQuotaId $quotaIdGroup.Name
                     }
                 }

diff --git a/pwsh/dev/devAzGovVizParallel.ps1 b/pwsh/dev/devAzGovVizParallel.ps1
@@ -365,14 +365,14 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $ProductVersion = '6.4.11',
+    $ProductVersion = '6.4.12',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',
 
     # <--- AzAPICall related parameters #consult the AzAPICall GitHub repository for details aka.ms/AzAPICall
     [string]
-    $AzAPICallVersion = '1.2.1',
+    $AzAPICallVersion = '1.2.3',
 
     [switch]
     $DebugAzAPICall,

diff --git a/pwsh/dev/functions/getConsumptionv2.ps1 b/pwsh/dev/functions/getConsumptionv2.ps1
@@ -226,7 +226,17 @@
                         }
                         $subConsumptionData = AzAPICall @subConsumptionDataParametersSplat
 
-                        if ($subConsumptionData -eq 'Unauthorized' -or $subConsumptionData -eq 'OfferNotSupported' -or $subConsumptionData -eq 'InvalidQueryDefinition' -or $subConsumptionData -eq 'NonValidWebDirectAIRSOfferType' -or $subConsumptionData -eq 'NotFoundNotSupported' -or $subConsumptionData -eq 'IndirectCostDisabled') {
+                        $subscriptionScopeKnownErrors = @(
+                            'Unauthorized',
+                            'OfferNotSupported',
+                            'InvalidQueryDefinition',
+                            'NonValidWebDirectAIRSOfferType',
+                            'NotFoundNotSupported',
+                            'IndirectCostDisabled',
+                            'SubscriptionCostDisabled'
+                        )
+
+                        if ($subConsumptionData -in $subscriptionScopeKnownErrors) {
                             Write-Host "   Failed ($subConsumptionData) - Getting Consumption data scope Sub (Subscription: $($subNameToProcess) '$($subIdToProcess)' QuotaId '$($subQuotaId)')"
                             $hlper = $htAllSubscriptionsFromAPI.($subIdToProcess).subDetails
                             $hlper2 = $htSubscriptionsMgPath.($subIdToProcess)
@@ -243,15 +253,15 @@
                         }
                         else {
                             Write-Host "   $($subConsumptionData.properties.rows.Count) Consumption data entries (scope Sub $($subNameToProcess) '$($subIdToProcess)')"
-                            if ($subConsumptionData.Count -gt 0) {
+                            if ($subConsumptionData.properties.rows.Count -gt 0) {
                                 addToAllConsumptionData -consumptiondataFromAPI $subConsumptionData -subscriptionQuotaId $subQuotaId
                             }
                         }
                     } -ThrottleLimit $ThrottleLimit
                 }
                 else {
                     Write-Host "  #batch$($batchCnt)/$(($subscriptionsBatch | Measure-Object).Count) for $($batch.Group.Count) Subscriptions of QuotaId '$($quotaIdGroup.Name)' returned $($mgConsumptionData.properties.rows.Count) Consumption data entries"
-                    if ($mgConsumptionData.Count -gt 0) {
+                    if ($mgConsumptionData.properties.rows.Count -gt 0) {
                         addToAllConsumptionData -consumptiondataFromAPI $mgConsumptionData -subscriptionQuotaId $quotaIdGroup.Name
                     }
                 }

diff --git a/version.json b/version.json
@@ -1,3 +1,3 @@
 {
-  "ProductVersion": "6.4.11"
+  "ProductVersion": "6.4.12"
 }