diff --git a/.azuredevops/templates/template-stage-policy-doc-generate-wiki.yml b/.azuredevops/templates/template-stage-policy-doc-generate-wiki.yml index 24366f1..3c8d407 100644 --- a/.azuredevops/templates/template-stage-policy-doc-generate-wiki.yml +++ b/.azuredevops/templates/template-stage-policy-doc-generate-wiki.yml @@ -128,7 +128,7 @@ stages: targetType: "inline" pwsh: true script: | - Install-Module -Name AzPolicyTest -RequiredVersion 3.1.1 -Force -Scope CurrentUser + Install-Module -Name AzPolicyTest -RequiredVersion 3.2.0 -Force -Scope CurrentUser - task: PowerShell@2 displayName: "Generate Wiki" env: diff --git a/.github/actions/templates/policyDocGenerateWiki/action.yml b/.github/actions/templates/policyDocGenerateWiki/action.yml index bde01f7..6f7577a 100644 --- a/.github/actions/templates/policyDocGenerateWiki/action.yml +++ b/.github/actions/templates/policyDocGenerateWiki/action.yml @@ -29,7 +29,8 @@ inputs: subscriptionIds: required: true default: '' - description: 'Comma separated list of subscription IDs to include in the wiki + description: + 'Comma separated list of subscription IDs to include in the wiki generation. Leave empty to include all subscriptions in the environment.' childManagementGroupId: required: true @@ -72,7 +73,7 @@ runs: } if (-not (Get-Module -ListAvailable -Name AzPolicyTest)) { Write-Output "Installing AzPolicyTest module..." - Install-Module -Name AzPolicyTest -RequiredVersion 3.1.1 -Force -Scope CurrentUser + Install-Module -Name AzPolicyTest -RequiredVersion 3.2.0 -Force -Scope CurrentUser } - name: Import Variables shell: pwsh # PowerShell Core diff --git a/docs/how-to/ado-wiki-setup.md b/docs/how-to/ado-wiki-setup.md index 3050f08..9548b4b 100644 --- a/docs/how-to/ado-wiki-setup.md +++ b/docs/how-to/ado-wiki-setup.md @@ -53,7 +53,7 @@ If you are using Microsoft hosted agents, there is no additional software requir - PowerShell 7.2 or above - Azure CLI or Az PowerShell Module (for generating Azure oAuth token during the wiki generation process) - Git (for pushing the generated wiki content to the Azure DevOps Wiki repository) -- AzPolicyTest PowerShell Module version 3.1.1 or later (for syntax validation of policy definitions and initiatives during the wiki generation process) +- AzPolicyTest PowerShell Module version 3.2.0 or later (for syntax validation of policy definitions and initiatives during the wiki generation process) For self-hosted agents, the agents must be able to access the Azure Resource Manager API endpoints (https://management.azure.com/). diff --git a/docs/how-to/github-wiki-setup.md b/docs/how-to/github-wiki-setup.md index a3d9eec..d1bb5c2 100644 --- a/docs/how-to/github-wiki-setup.md +++ b/docs/how-to/github-wiki-setup.md @@ -80,7 +80,7 @@ If you are using GitHub hosted runners, there is no additional software requirem - PowerShell 7.2 or above - Azure CLI or Az PowerShell Module (for generating Azure oAuth token during the wiki generation process) - Git (for pushing the generated wiki content to the Azure DevOps Wiki repository) -- AzPolicyTest PowerShell Module version 3.1.1 or later (for syntax validation of policy definitions and initiatives during the wiki generation process) +- AzPolicyTest PowerShell Module version 3.2.0 or later (for syntax validation of policy definitions and initiatives during the wiki generation process) For self-hosted runners, the runners must be able to access the Azure Resource Manager API endpoints (https://management.azure.com/). diff --git a/docs/how-to/manually-generate-policy-wiki.md b/docs/how-to/manually-generate-policy-wiki.md index f08e036..1ee7ce9 100644 --- a/docs/how-to/manually-generate-policy-wiki.md +++ b/docs/how-to/manually-generate-policy-wiki.md @@ -10,7 +10,7 @@ You will need to generate the Azure oAuth token for the wiki generation process. ### AzPolicyTest PowerShell Module -The AzPolicyTest PowerShell module is required for the wiki generation process. Please ensure you have version 3.1.1 or later installed. You can install it using the following command: +The AzPolicyTest PowerShell module is required for the wiki generation process. Please ensure you have version 3.2.0 or later installed. You can install it using the following command: ```powershell Install-Module -Name AzPolicyTest -RequiredVersion 3.1.1 -Force -Scope CurrentUser diff --git a/ps_modules/AzPolicyLens.Discovery/AzPolicyLens.Discovery.psd1 b/ps_modules/AzPolicyLens.Discovery/AzPolicyLens.Discovery.psd1 index d667597..5059aec 100644 --- a/ps_modules/AzPolicyLens.Discovery/AzPolicyLens.Discovery.psd1 +++ b/ps_modules/AzPolicyLens.Discovery/AzPolicyLens.Discovery.psd1 @@ -22,7 +22,7 @@ Copyright = '(c) Tao Yang. All rights reserved.' # Description of the functionality provided by this module - Description = 'Generate Azure Policy documentation in Markdown format. This module is offers the discovery component for the AzPolicyLens module.' + Description = 'Generate Azure Policy documentation in Markdown format. This module offers the discovery component for the AzPolicyLens module.' # Minimum version of the PowerShell engine required by this module PowerShellVersion = '7.0.0' diff --git a/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Markdown.Helper.psm1 b/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Markdown.Helper.psm1 index 68b5a84..8fbd1a9 100644 --- a/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Markdown.Helper.psm1 +++ b/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Markdown.Helper.psm1 @@ -3146,7 +3146,7 @@ function buildPolicyExemptionDetailedPageContent { Description = $($exemption.description ? $($exemption.description) : $null) SubscriptionId = $($exemption.subscriptionId ? "[$($exemption.subscriptionId)]($subscriptionLink)" : $null) ResourceGroup = $($exemption.resourceGroup ? $($exemption.resourceGroup) : $null) - PolicyDefinitionReferenceIds = $exemption.PolicyDefinitionReferenceIds + PolicyDefinitionReferenceIds = $($exemption.PolicyDefinitionReferenceIds -join ', ') ExemptionCategory = $exemption.exemptionCategory ExpiresOn = $exemptionExpiresOn } diff --git a/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1 b/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1 index 11d0792..c862a83 100644 --- a/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1 +++ b/ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1 @@ -4,7 +4,7 @@ RootModule = 'AzPolicyLens.Wiki.psm1' # Version number of this module. - ModuleVersion = '2.1.2' + ModuleVersion = '2.2.0' # Supported PSEditions # CompatiblePSEditions = @() @@ -44,7 +44,7 @@ # Modules that must be imported into the global environment prior to importing this module RequiredModules = @( - @{ ModuleName = 'AzPolicyTest'; ModuleVersion = '3.1.1'; GUID = '600b36cd-1af5-4add-bd9d-010112095911' } + @{ ModuleName = 'AzPolicyTest'; ModuleVersion = '3.2.0'; GUID = '600b36cd-1af5-4add-bd9d-010112095911' } ) # Assemblies that must be loaded prior to importing this module