6.4.9

JulianHayward · Jun 18, 2024 · ce9c47b · ce9c47b
1 parent 19e96c8
commit ce9c47b
Show file tree

Hide file tree

Showing 9 changed files with 859 additions and 8 deletions.
diff --git a/.github/workflows/AzGovViz.yml b/.github/workflows/AzGovViz.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Connect Azure
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: ${{secrets.CREDS}}
           enable-AzPSSession: true

diff --git a/.github/workflows/AzGovViz_OIDC.yml b/.github/workflows/AzGovViz_OIDC.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Connect Azure OIDC
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{secrets.CLIENT_ID}} #create this secret
           tenant-id: ${{secrets.TENANT_ID}} #create this secret
@@ -91,7 +91,7 @@ jobs:
       #log again to avoid timeout before web publishing
       - name: Connect Azure OIDC
         if: env.WebAppPublish == 'true'
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{secrets.CLIENT_ID}} #create this secret (GitHub/Setting/Secrets)
           tenant-id: ${{secrets.TENANT_ID}} #create this secret

diff --git a/README.md b/README.md
@@ -82,12 +82,16 @@ As an alternative, you can use the [Azure Governance Visualizer accelerator](htt
 
 ## Release history
 
-**Changes** (2024-June-03 / 6.4.8 Minor)
+**Changes** (2024-June-18 / 6.4.9 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
 - fixes and optimization based on DevSkim, PSScriptAnalyzer and OpenSSF Scorecard findings
 - api version mapping in param block for cloud environment api version availability drift
+- update GitHub workflows to use azure/login@v2 (previous: azure/login@v1):
+  - [AzGovViz_OIDC.yml](/.github/workflows/AzGovViz_OIDC.yml)
+  - [AzGovViz.yml](/.github/workflows/AzGovViz.yml)
+- update getConsumption (experimental for now): instead of full Management Group scope costmanagement data retrieval, batch by Subscription quotaId in batches of 100. Failing batches 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`
 
 [Full release history](history.md)
 

diff --git a/history.md b/history.md
@@ -4,12 +4,16 @@
 
 ### Azure Governance Visualizer version 6
 
-**Changes** (2024-June-03 / 6.4.8 Minor)
+**Changes** (2024-June-18 / 6.4.9 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
 - fixes and optimization based on DevSkim, PSScriptAnalyzer and OpenSSF Scorecard findings
 - api version mapping in param block for cloud environment api version availability drift
+- update GitHub workflows to use azure/login@v2 (previous: azure/login@v1):
+  - [AzGovViz_OIDC.yml](/.github/workflows/AzGovViz_OIDC.yml)
+  - [AzGovViz.yml](/.github/workflows/AzGovViz.yml)
+- update getConsumption (experimental for now): instead of full Management Group scope costmanagement data retrieval, batch by Subscription quotaId in batches of 100. Failing batches 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`
 
 **Changes** (2024-May-05 / 6.4.5 Minor)
 

diff --git a/pwsh/AzGovVizParallel.ps1 b/pwsh/AzGovVizParallel.ps1
diff --git a/pwsh/dev/devAzGovVizParallel.ps1 b/pwsh/dev/devAzGovVizParallel.ps1
@@ -365,7 +365,7 @@ Param
     $Product = 'AzGovViz',
 
     [string]
-    $ProductVersion = '6.4.8',
+    $ProductVersion = '6.4.9',
 
     [string]
     $GithubRepository = 'aka.ms/AzGovViz',
@@ -702,6 +702,7 @@ if ($ManagementGroupId -match ' ') {
 . ".\$($ScriptPath)\functions\getOrphanedResources.ps1"
 . ".\$($ScriptPath)\functions\getMDfCSecureScoreMG.ps1"
 . ".\$($ScriptPath)\functions\getConsumption.ps1"
+. ".\$($ScriptPath)\functions\getConsumptionv2.ps1"
 . ".\$($ScriptPath)\functions\cacheBuiltIn.ps1"
 . ".\$($ScriptPath)\functions\prepareData.ps1"
 . ".\$($ScriptPath)\functions\getGroupmembers.ps1"

diff --git a/pwsh/dev/functions/getConsumptionv2.ps1 b/pwsh/dev/functions/getConsumptionv2.ps1
diff --git a/pwsh/dev/functions/processALZPolicyVersionChecker.ps1 b/pwsh/dev/functions/processALZPolicyVersionChecker.ps1
@@ -263,6 +263,7 @@
                     $hashPolicyDefinitions = [System.Security.Cryptography.HashAlgorithm]::Create('sha256').ComputeHash([System.Text.Encoding]::UTF8.GetBytes($policyJsonPolicyDefinitions))
                     $stringHashPolicyDefinitions = [System.BitConverter]::ToString($hashPolicyDefinitions)
                     $stringHash = "$($stringHashParameters)_$($stringHashPolicyDefinitions)"
+                    #($policyJsonRebuild.properties | ConvertTo-Json -Depth 99) > "c:\temp\alz3\$($policyJsonRebuild.name)_$($policyJsonRebuild.properties.metadata.version).json"
 
                     if (-not $allESLZPolicySets.($policyJsonRebuild.name)) {
                         $allESLZPolicySets.($policyJsonRebuild.name) = @{}
@@ -410,6 +411,7 @@
                         $hashPolicyDefinitions = [System.Security.Cryptography.HashAlgorithm]::Create('sha256').ComputeHash([System.Text.Encoding]::UTF8.GetBytes($policyJsonPolicyDefinitions))
                         $stringHashPolicyDefinitions = [System.BitConverter]::ToString($hashPolicyDefinitions)
                         $stringHash = "$($stringHashParameters)_$($stringHashPolicyDefinitions)"
+                        #($policyJsonRebuild.properties | ConvertTo-Json -Depth 99) > "c:\temp\alz3\$($policyJsonRebuild.name)_$($policyJsonRebuild.properties.metadata.version).json"
 
                         if (-not $allESLZPolicySets.($policyJsonRebuild.name)) {
                             $allESLZPolicySets.($policyJsonRebuild.name) = @{}
@@ -524,6 +526,7 @@
                 $hashPolicyDefinitions = [System.Security.Cryptography.HashAlgorithm]::Create('sha256').ComputeHash([System.Text.Encoding]::UTF8.GetBytes($policyJsonPolicyDefinitions))
                 $stringHashPolicyDefinitions = [System.BitConverter]::ToString($hashPolicyDefinitions)
                 $stringHash = "$($stringHashParameters)_$($stringHashPolicyDefinitions)"
+                #($policyJsonRebuild.properties | ConvertTo-Json -Depth 99) > "c:\temp\alz3\$($policyJsonRebuild.name)_$($policyJsonRebuild.properties.metadata.version).json"
 
                 if (-not $allESLZPolicySets.($policyJsonRebuild.name)) {
                     $allESLZPolicySets.($policyJsonRebuild.name) = @{}

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