Merge pull request #219 from puppetlabs/bug-fix_timeout_matcher

(Bug) - Fix timeout matcher

Author: danadoherty639

lib/puppet/provider/base_dsc_lite/powershell.rb

@@ -60,13 +60,6 @@ def set_timeout
     resource[:dsc_timeout] ? resource[:dsc_timeout] * 1000 : 1_200_000
   end
 
-  def compile_timeout_msg(timeout)
-    "The DSC Resource did not respond within the timeout limit of #{timeout} milliseconds. \
-    This can occur if the DSC Resource is stuck in an infinite loop, or if the DSC Resource is waiting for user input. \
-    Please check the DSC Resource for any prompts that may require user input, and ensure that the DSC Resource does not contain any infinite loops. \
-    If the DSC Resource is functioning correctly, you may need to increase the timeout limit using the 'dsc_timeout' parameter"
-  end
-
   def ps_manager
     debug_output = Puppet::Util::Log.level == :debug
     Pwsh::Manager.instance(command(:powershell), Pwsh::Manager.powershell_args, debug: debug_output)
@@ -81,14 +74,15 @@ def exists?
     Puppet.debug "\n" + self.class.redact_content(script_content)
 
     if Pwsh::Manager.windows_powershell_supported?
-      output = ps_manager.execute(script_content, timeout)[:stdout]
+      output = ps_manager.execute(script_content, timeout)
+      raise Puppet::Error, output[:errormessage] if output[:errormessage]&.match?(%r{PowerShell module timeout \(\d+ ms\) exceeded while executing})
+
+      output = output[:stdout]
     else
       self.class.upgrade_message
       output = powershell(Pwsh::Manager.powershell_args, script_content)
     end
 
-    raise Puppet::Error, compile_timeout_msg(timeout) if output.nil?
-
     Puppet.debug "Dsc Resource returned: #{output}"
     data = JSON.parse(output)
     raise(data['errormessage']) unless data['errormessage'].empty?
@@ -107,14 +101,15 @@ def create
     Puppet.debug "\n" + self.class.redact_content(script_content)
 
     if Pwsh::Manager.windows_powershell_supported?
-      output = ps_manager.execute(script_content, timeout)[:stdout]
+      output = ps_manager.execute(script_content, timeout)
+      raise Puppet::Error, output[:errormessage] if output[:errormessage]&.match?(%r{PowerShell module timeout \(\d+ ms\) exceeded while executing})
+
+      output = output[:stdout]
     else
       self.class.upgrade_message
       output = powershell(Pwsh::Manager.powershell_args, script_content)
     end
 
-    raise Puppet::Error, compile_timeout_msg(timeout) if output.nil?
-
     Puppet.debug "Create Dsc Resource returned: #{output}"
     data = JSON.parse(output)
 

spec/acceptance/dsc_type/psdesiredstateconfiguration_spec.rb

@@ -64,7 +64,7 @@ module        => 'PSDesiredStateConfiguration',
   context 'times out when execution time is greater than dsc_timeout' do
     it 'applies manifest' do
       apply_manifest(dsc_timeout_manifest, expect_failures: true) do |result|
-        expect(result.stderr).to match(%r{The DSC Resource did not respond within the timeout limit of 1000 milliseconds})
+        expect(result.stderr).to match(%r{Catastrophic failure: PowerShell module timeout \(1000 ms\) exceeded while executing})
       end
     end
   end