Skip to content

Commit 4cb1cdd

Browse files
committed
Update AzPolicyTest module version to 3.1.0 across multiple scripts and templates
1 parent 30ccaf6 commit 4cb1cdd

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

.azuredevops/templates/template-stage-policy-doc-generate-wiki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ stages:
128128
targetType: "inline"
129129
pwsh: true
130130
script: |
131-
Install-Module -Name AzPolicyTest -RequiredVersion 3.0.0 -Force -Scope CurrentUser
131+
Install-Module -Name AzPolicyTest -RequiredVersion 3.1.0 -Force -Scope CurrentUser
132132
- task: PowerShell@2
133133
displayName: "Generate Wiki"
134134
env:

.github/actions/templates/policyDocGenerateWiki/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ runs:
7272
}
7373
if (-not (Get-Module -ListAvailable -Name AzPolicyTest)) {
7474
Write-Output "Installing AzPolicyTest module..."
75-
Install-Module -Name AzPolicyTest -RequiredVersion 3.0.0 -Force -Scope CurrentUser
75+
Install-Module -Name AzPolicyTest -RequiredVersion 3.1.0 -Force -Scope CurrentUser
7676
}
7777
- name: Import Variables
7878
shell: pwsh # PowerShell Core

ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Markdown.Helper.psm1

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2612,7 +2612,7 @@ function buildPolicyDefinitionDetailedPageContent {
26122612

26132613
if ($PageStyle -ieq 'detailed') {
26142614
#Use AzPolicyTest to test definition syntax when the page style is detailed.
2615-
$syntaxTestResult = Test-AzPolicyDefinition -content $definitionJson
2615+
$syntaxTestResult = Test-AzPolicyDefinition -content $definitionJson -PesterVerbosity 'None'
26162616
$coloredSyntaxTestResult = FormatTestResult -result $syntaxTestResult.Result -WikiStyle $WikiStyle
26172617
$definitionOverviewTableData.Add('TestResult', $coloredSyntaxTestResult)
26182618
}
@@ -2759,7 +2759,11 @@ function buildPolicyInitiativeDetailedPageContent {
27592759

27602760
[parameter(Mandatory = $true, HelpMessage = 'The page style (detailed for engineers or basic for customers).')]
27612761
[ValidateSet('detailed', 'basic')]
2762-
[string]$PageStyle
2762+
[string]$PageStyle,
2763+
2764+
[parameter(Mandatory = $true, HelpMessage = 'The wiki style. Supported values are "ado" and "github".')]
2765+
[ValidateSet('ado', 'github')]
2766+
[string]$WikiStyle
27632767
)
27642768
$markdownCodeBlock = '```'
27652769
#build initiative definition json
@@ -2802,7 +2806,7 @@ function buildPolicyInitiativeDetailedPageContent {
28022806
}
28032807
if ($PageStyle -ieq 'detailed') {
28042808
#Use AzPolicyTest to test definition syntax when the page style is detailed.
2805-
$syntaxTestResult = Test-AzPolicySetDefinition -content $definitionJson
2809+
$syntaxTestResult = Test-AzPolicySetDefinition -content $definitionJson -PesterVerbosity 'None'
28062810
$coloredSyntaxTestResult = FormatTestResult -result $syntaxTestResult.Result -WikiStyle $WikiStyle
28072811
$definitionOverviewTableData.Add('TestResult', $coloredSyntaxTestResult)
28082812
}

ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.Pages.Helper.psm1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,6 +1705,7 @@ function newPolicyInitiativePage {
17051705
definitions = $allDefinitions
17061706
assignments = $EnvironmentDiscoveryData.assignments
17071707
PageStyle = $PageStyle
1708+
WikiStyle = $WikiStyle
17081709
}
17091710
if ($PSBoundParameters.ContainsKey('CustomSecurityControlFileConfig')) {
17101711
$buildInitiativePageParams.add('CustomSecurityControlFileConfig', $CustomSecurityControlFileConfig)

ps_modules/AzPolicyLens.Wiki/AzPolicyLens.Wiki.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
# Modules that must be imported into the global environment prior to importing this module
4646
RequiredModules = @(
47-
@{ ModuleName = 'AzPolicyTest'; ModuleVersion = '3.0.0'; GUID = '600b36cd-1af5-4add-bd9d-010112095911' }
47+
@{ ModuleName = 'AzPolicyTest'; ModuleVersion = '3.1.0'; GUID = '600b36cd-1af5-4add-bd9d-010112095911' }
4848
)
4949

5050
# Assemblies that must be loaded prior to importing this module

scripts/github-set-variables.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Import-Module powershell-yaml
2424
# Import AzPolicyTest module for YAML parsing
2525
if (-not (Get-Module -ListAvailable -Name AzPolicyTest)) {
2626
Write-Verbose "Installing AzPolicyTest module..."
27-
Install-Module -Name AzPolicyTest -RequiredVersion 3.0.0 -Force -Scope CurrentUser
27+
Install-Module -Name AzPolicyTest -RequiredVersion 3.1.0 -Force -Scope CurrentUser
2828
}
2929
Import-Module AzPolicyTest
3030

0 commit comments

Comments
 (0)