Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/templates/policyDocGenerateWiki/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to/ado-wiki-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
2 changes: 1 addition & 1 deletion docs/how-to/github-wiki-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
2 changes: 1 addition & 1 deletion docs/how-to/manually-generate-policy-wiki.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
RootModule = 'AzPolicyLens.Wiki.psm1'

# Version number of this module.
ModuleVersion = '2.1.2'
ModuleVersion = '2.2.0'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -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
Expand Down