Merge pull request #96 from techthoughts2/Enhancements

Enhancements
techthoughts2 · Sep 8, 2024 · e3a8bee · e3a8bee
2 parents ae330c9 + 972bc33
commit e3a8bee
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 12 deletions.
diff --git a/actions_bootstrap.ps1 b/actions_bootstrap.ps1
@@ -46,7 +46,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction     = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.22.0]
+
+- Catesta template module changes
+    - Improved Windows detection checks for Pester module installation
+- Catesta primary module changes
+    - Improved Windows detection checks for Pester module installation
+    - Fixed `FileChecks.Tests.ps1` where certain tests were not being run.
+
 ## [2.21.0]
 
 - Catesta template module changes

diff --git a/docs/Catesta.md b/docs/Catesta.md
@@ -2,7 +2,7 @@
 Module Name: Catesta
 Module Guid: 6796b193-9013-468a-b022-837749af2d06
 Download Help Link: NA
-Help Version: 2.21.0
+Help Version: 2.22.0
 Locale: en-US
 ---
 

diff --git a/src/Catesta/Catesta.psd1 b/src/Catesta/Catesta.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'Catesta.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '2.21.0'
+    ModuleVersion     = '2.22.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/src/Catesta/Resources/AWS/install_modules.ps1 b/src/Catesta/Resources/AWS/install_modules.ps1
@@ -204,7 +204,7 @@ else {
             ErrorAction        = 'Stop'
         }
         try {
-            if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+            if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
                 # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
                 # this only affects windows builds
                 Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/Azure/actions_bootstrap.ps1 b/src/Catesta/Resources/Azure/actions_bootstrap.ps1
@@ -67,7 +67,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction        = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/Bitbucket/actions_bootstrap.ps1 b/src/Catesta/Resources/Bitbucket/actions_bootstrap.ps1
@@ -67,7 +67,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction        = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/GitHubActions/actions_bootstrap.ps1 b/src/Catesta/Resources/GitHubActions/actions_bootstrap.ps1
@@ -67,7 +67,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction        = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/GitHubActionsCodeBuild/actions_bootstrap.ps1 b/src/Catesta/Resources/GitHubActionsCodeBuild/actions_bootstrap.ps1
@@ -67,7 +67,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction        = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/GitLab/actions_bootstrap.ps1 b/src/Catesta/Resources/GitLab/actions_bootstrap.ps1
@@ -67,7 +67,7 @@ foreach ($module in $modulesToInstall) {
         ErrorAction        = 'Stop'
     }
     try {
-        if ($module.ModuleName -eq 'Pester' -and $IsWindows) {
+        if ($module.ModuleName -eq 'Pester' -and ($IsWindows -or $PSVersionTable.PSVersion -le [version]'5.1')) {
             # special case for Pester certificate mismatch with older Pester versions - https://github.com/pester/Pester/issues/2389
             # this only affects windows builds
             Install-Module @installSplat -SkipPublisherCheck

diff --git a/src/Catesta/Resources/Module/plasterManifest.xml b/src/Catesta/Resources/Module/plasterManifest.xml
@@ -19,7 +19,7 @@
     <metadata>
         <name>Catesta</name>
         <id>258a61ba-566b-4c3a-8230-c2b6861a1a8d</id>
-        <version>2.20.0</version>
+        <version>2.22.0</version>
         <title>Catesta</title>
         <description>Scaffolds a new PowerShell module project</description>
         <author>Jake Morrison</author>

diff --git a/src/Catesta/Resources/Vault/plasterManifest.xml b/src/Catesta/Resources/Vault/plasterManifest.xml
@@ -6,7 +6,7 @@
     <metadata>
         <name>Catesta</name>
         <id>d531e058-52b8-4dd2-8162-01c95d1eb8f7</id>
-        <version>2.20.0</version>
+        <version>2.22.0</version>
         <title>Catesta</title>
         <description>Scaffolds a new PowerShell SecretManagement extension vault module project</description>
         <author>Jake Morrison</author>

diff --git a/src/Tests/Integration/FileChecks.Tests.ps1 b/src/Tests/Integration/FileChecks.Tests.ps1
@@ -1,4 +1,4 @@
-BeforeAll {
+BeforeDiscovery {
     Set-Location -Path $PSScriptRoot
     $ModuleName = 'Catesta'
     $resourcePath1 = [System.IO.Path]::Combine( '..', '..', 'Artifacts', 'Resources')