From b3a9d1d9ee83b0dd4172c156082b4f26da784fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Tue, 5 Jul 2022 09:54:27 -1000 Subject: [PATCH] Improve error reporting --- tasks/set_puppet_config.rb | 4 +--- tasks/sign_certificate_requests.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tasks/set_puppet_config.rb b/tasks/set_puppet_config.rb index 6d65d15..3d8e63b 100755 --- 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 index efd91b8..001d44f 100755 --- 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',