(MODULES-10389) - Safeguard powershell provider loading

Author: David Swan

lib/puppet/provider/exec/powershell.rb

@@ -1,14 +1,18 @@
 require 'puppet/provider/exec'
-begin
-  require 'ruby-pwsh'
-rescue LoadError
-  raise 'Could not load the "ruby-pwsh" library; is the dependency module puppetlabs-pwshlib installed in this environment?'
-end
 
 Puppet::Type.type(:exec).provide :powershell, :parent => Puppet::Provider::Exec do
   confine :operatingsystem => :windows
-
-  commands :powershell => Pwsh::Manager.powershell_path
+  confine :feature => :pwshlib
+
+  def self.powershell_path
+    begin
+      require 'ruby-pwsh'
+      Pwsh::Manager.powershell_path
+    rescue
+      nil
+    end
+  end
+  commands :powershell => self.powershell_path
 
   desc <<-EOT
     Executes Powershell commands. One of the `onlyif`, `unless`, or `creates`

lib/puppet/provider/exec/pwsh.rb

@@ -1,11 +1,8 @@
 require 'puppet/provider/exec'
-begin
-  require 'ruby-pwsh'
-rescue LoadError
-  raise 'Could not load the "ruby-pwsh" library; is the dependency module puppetlabs-pwshlib installed in this environment?'
-end
 
 Puppet::Type.type(:exec).provide :pwsh, :parent => Puppet::Provider::Exec do
+  confine :feature => :pwshlib
+  
   desc <<-EOT
     Executes PowerShell Core commands. One of the `onlyif`, `unless`, or `creates`
     parameters should be specified to ensure the command is idempotent.