Improve error reporting

opus-codium · Jul 5, 2022 · b3a9d1d · b3a9d1d
1 parent 6d74ddf
commit b3a9d1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/tasks/set_puppet_config.rb b/tasks/set_puppet_config.rb
@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'open3'
-
 require_relative '../../ruby_task_helper/files/task_helper'
 
 class SetPuppetConfig < TaskHelper
@@ -14,7 +12,7 @@ def task(settings:, **_kwargs)
     end
 
     settings.each do |setting_name, setting_value|
-      Open3.capture3('puppet', 'config', 'set', setting_name.to_s, setting_value.to_s)
+      system('puppet', 'config', 'set', setting_name.to_s, setting_value.to_s) || raise(TaskHelper::Error.new('Failed to set setting', 'set_puppet_config', 'puppet exited with a non-null error code'))
     end
 
     nil

diff --git a/tasks/sign_certificate_requests.rb b/tasks/sign_certificate_requests.rb
@@ -13,7 +13,7 @@ def task(certificate_requests:, **_kwargs)
 
     certificate_requests.each do |node, details|
       if pending_requests[node] == details
-        system('puppetserver', 'ca', 'sign', node)
+        system('puppetserver', 'ca', 'sign', node) || raise(TaskHelper::Error.new('Failed to sign certificate requests', 'sign_certificate_requests', 'puppetserver exited with a non-null error code'))
       else
         raise TaskHelper::Error.new('Certificate Request not fournd',
                                     'sign_agent_certificate/certificate_request_not_found',