Merge pull request #321 from michaeltlombardi/modules-10722/main/reuse-timeout-for-pipe

(MODULES-10722) Inherit pipe_timeout from timeout

Author: sanfrancrisko

lib/puppet/provider/exec/powershell.rb

@@ -45,9 +45,9 @@ def self.upgrade_message
     @upgrade_warning_issued = true
   end
 
-  def ps_manager
+  def ps_manager(pipe_timeout)
     debug_output = Puppet::Util::Log.level == :debug
-    Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args, debug: debug_output)
+    Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args, debug: debug_output, pipe_timeout: pipe_timeout)
   end
 
   def run(command, check = false)
@@ -77,7 +77,7 @@ def execute_resource(powershell_code, resource)
     timeout_ms = resource[:timeout].nil? ? nil : resource[:timeout] * 1000
     environment_variables = resource[:environment].nil? ? [] : resource[:environment]
 
-    result = ps_manager.execute(powershell_code, timeout_ms, working_dir, environment_variables)
+    result = ps_manager(resource[:timeout]).execute(powershell_code, timeout_ms, working_dir, environment_variables)
     stdout     = result[:stdout]
     native_out = result[:native_stdout]
     stderr     = result[:stderr]

lib/puppet/provider/exec/pwsh.rb

@@ -68,9 +68,9 @@ def pwsh_args
   #
   # @api private
   # @return [Pwsh::Manager] The PowerShell manager for this resource
-  def ps_manager
+  def ps_manager(pipe_timeout)
     debug_output = Puppet::Util::Log.level == :debug
-    Pwsh::Manager.instance(@pwsh, pwsh_args, debug: debug_output)
+    Pwsh::Manager.instance(@pwsh, pwsh_args, debug: debug_output, pipe_timeout: pipe_timeout)
   end
 
   def execute_resource(powershell_code, resource)
@@ -81,7 +81,7 @@ def execute_resource(powershell_code, resource)
     timeout_ms = resource[:timeout].nil? ? nil : resource[:timeout] * 1000
     environment_variables = resource[:environment].nil? ? [] : resource[:environment]
 
-    result = ps_manager.execute(powershell_code, timeout_ms, working_dir, environment_variables)
+    result = ps_manager(resource[:timeout]).execute(powershell_code, timeout_ms, working_dir, environment_variables)
     stdout     = result[:stdout]
     native_out = result[:native_stdout]
     stderr     = result[:stderr]