win_psmodule - Missing SkipPublisherCheck in Prerq installations (ans…

…ible#58090) * win_psmodule - Missing SkipPublisherCheck in Prerq installations * Handle different minors of PS5 * community revisions * Update win_psmodule.ps1
pva · Jul 4, 2019 · 6e319ff · 6e319ff
1 parent db5656c
commit 6e319ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/changelogs/fragments/win_psmodule-PreReq-SkipPublisher-missing.yml b/changelogs/fragments/win_psmodule-PreReq-SkipPublisher-missing.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "win_psmodule - Missing SkipPublisherCheck in Prerq installations"
diff --git a/lib/ansible/modules/windows/win_psmodule.ps1 b/lib/ansible/modules/windows/win_psmodule.ps1
@@ -69,7 +69,17 @@ Function Install-PrereqModule {
             }
             else {
                 try {
-                    Install-Module -Name $Name -MinimumVersion $PrereqModules[$Name] -Force -WhatIf:$CheckMode | Out-Null
+                    $install_params = @{
+                        Name = $Name
+                        MinimumVersion = $PrereqModules[$Name]
+                        Force = $true
+                        WhatIf = $CheckMode
+                    }
+                    if ((Get-Command -Name Install-Module).Parameters.ContainsKey('SkipPublisherCheck')) {
+                        $install_params.SkipPublisherCheck = $true
+                    }
+
+                    Install-Module @install_params > $null
 
                     if ( $Name -eq 'PowerShellGet' ) {
                         # An order has to be reverted due to dependency
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- "win_psmodule - Missing SkipPublisherCheck in Prerq installations"