(bug) - Fix dsc timeout matcher

puppetlabs · Aug 15, 2024 · f98dfc7 · f98dfc7
1 parent 9f73fc5
commit f98dfc7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb b/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb
@@ -257,17 +257,17 @@ def invoke_dsc_resource(context, name_hash, props, method)
     script_content = ps_script_content(resource)
     context.debug("Invoke-DSC Timeout: #{@timeout} milliseconds") if @timeout
     context.debug("Script:\n #{redact_secrets(script_content)}")
-    output = ps_manager.execute(remove_secret_identifiers(script_content), @timeout)[:stdout]
+    output = ps_manager.execute(remove_secret_identifiers(script_content), @timeout)
 
-    if output.nil?
+    if output[:stdout].nil?
       message = 'Nothing returned.'
-      message += " There is a timeout of #{@timeout} milliseconds set, ensure the DSC resource has enough time to apply." unless @timeout.nil?
+      message += " #{output[:errormessage]}" if output[:errormessage]&.match?(/PowerShell module timeout \(\d+ ms\) exceeded while executing/)
       context.err(message)
       return nil
     end
 
     begin
-      data = JSON.parse(output)
+      data = JSON.parse(output[:stdout])
     rescue StandardError => e
       context.err(e)
       return nil