Skip to content

Commit

Permalink
6.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JulianHayward committed Aug 15, 2024
1 parent ae4970a commit a5342a6
Showing 9 changed files with 14 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/devskim.yml
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ name: DevSkim

on:
push:
branches: [ "developmentJH" ]
branches: [ "master" ]
pull_request:
branches: [ "developmentJH" ]
branches: [ "master" ]
# schedule:
# - cron: '28 13 * * 2'

4 changes: 2 additions & 2 deletions .github/workflows/psScriptAnalyzer.yml
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ name: PSScriptAnalyzer

on:
push:
branches: [ "developmentJH" ]
branches: [ "master" ]
pull_request:
branches: [ "developmentJH" ]
branches: [ "master" ]
# schedule:
# - cron: '25 6 * * 1'

2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ on:
# schedule:
# - cron: '21 0 * * 1'
push:
branches: [ "developmentJH" ]
branches: [ "master" ]

# Declare default permissions as read only.
permissions: read-all
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ The [Azure Governance Visualizer accelerator](https://github.com/Azure/Azure-Gov

## Release history

**Changes** (2024-July-15 / 6.4.12 Minor)
**Changes** (2024-August-15 / 6.5.0 Minor/Patch)

- 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
@@ -91,7 +91,7 @@ The [Azure Governance Visualizer accelerator](https://github.com/Azure/Azure-Gov
- 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 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`
- update getConsumption (getConsumptionv2): 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.
- 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`)
4 changes: 2 additions & 2 deletions history.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

### Azure Governance Visualizer version 6

**Changes** (2024-July-15 / 6.4.12 Minor)
**Changes** (2024-August-15 / 6.5.0 Minor/Patch)

- 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
@@ -13,7 +13,7 @@
- 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 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`
- update getConsumption (getConsumptionv2): 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.
- 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`)
7 changes: 2 additions & 5 deletions pwsh/AzGovVizParallel.ps1
Original file line number Diff line number Diff line change
@@ -365,7 +365,7 @@ Param
$Product = 'AzGovViz',

[string]
$ProductVersion = '6.4.12',
$ProductVersion = '6.5.0',

[string]
$GithubRepository = 'aka.ms/AzGovViz',
@@ -3339,9 +3339,6 @@ function getConsumption {
Write-Host "Getting Consumption data duration: $((New-TimeSpan -Start $startConsumptionData -End $endConsumptionData).TotalSeconds) seconds"
}
function getConsumptionv2 {
#todo: remove
Write-Host '#########-----------------#########' -ForegroundColor DarkMagenta
Write-Host 'Executing getConsumptionv2' -ForegroundColor DarkMagenta

$costManagementQueryAPIVersion = $azAPICallConf['htParameters'].APIMappingCloudEnvironment.costManagementQuery.($azAPICallConf['htParameters'].azureCloudEnvironment)

@@ -35421,7 +35418,7 @@ if (-not $HierarchyMapOnly) {
}

if ($azAPICallConf['htParameters'].DoAzureConsumption -eq $true) {
getConsumption
getConsumptionv2
}

getOrphanedResources
4 changes: 2 additions & 2 deletions pwsh/dev/devAzGovVizParallel.ps1
Original file line number Diff line number Diff line change
@@ -365,7 +365,7 @@ Param
$Product = 'AzGovViz',

[string]
$ProductVersion = '6.4.12',
$ProductVersion = '6.5.0',

[string]
$GithubRepository = 'aka.ms/AzGovViz',
@@ -1123,7 +1123,7 @@ if (-not $HierarchyMapOnly) {
}

if ($azAPICallConf['htParameters'].DoAzureConsumption -eq $true) {
getConsumption
getConsumptionv2
}

getOrphanedResources
3 changes: 0 additions & 3 deletions pwsh/dev/functions/getConsumptionv2.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
function getConsumptionv2 {
#todo: remove
Write-Host '#########-----------------#########' -ForegroundColor DarkMagenta
Write-Host 'Executing getConsumptionv2' -ForegroundColor DarkMagenta

$costManagementQueryAPIVersion = $azAPICallConf['htParameters'].APIMappingCloudEnvironment.costManagementQuery.($azAPICallConf['htParameters'].azureCloudEnvironment)

2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ProductVersion": "6.4.12"
"ProductVersion": "6.5.0"
}

0 comments on commit a5342a6

Please sign in to comment.