cem_acpt 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6d280d4ac5c56cd722e9a2a906647996cc18a5db7babc1f950b74a44306fc3
-  data.tar.gz: f62af838277ee9e25b2af58093d1183460bc9022a175399c5830d38e49d01620
+  metadata.gz: dc299de4494abd1da48700f76b43223cb05aae1cb8c26235757e31e909bd6c2f
+  data.tar.gz: 32948e52808bd436695d69cf0c0bf2c5ccd31ada90ed401341c9c73e00653c6b
 SHA512:
-  metadata.gz: 0d573fb143effd9425d6b38f6e764c8bafb44acb583bf95b9f2a600ca787e975875e2004edcaedc78876c303342663376334fde8fff37c5fef1bed3b131c9442
-  data.tar.gz: a4e164fd64921e3bdde69e664f846ebe3fc307e1d919fff61df40634ac34794124d5e15539c3c657f874c6e9403228e3dca2593c4fe54358b0c588ba92e5e698
+  metadata.gz: 2a916fec7be6263243deeb60eac717ac097e0c477359b8abe71c374ef68880ab1608ff48859339074d97e8ae4592b9da491b5ff76b61f842a60712a9efcd1f75
+  data.tar.gz: e4e3b465b224f8f1431867ae19b6bee5161a91248168fd8e0c8c221c6ffa2c6caf3e2bf45a2a54e139e02069e45bc1dc7beacbddbe7fa11c15bf269811c98c54

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.10.4)
+    cem_acpt (0.10.5)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)

data/lib/cem_acpt/bolt/cmd/output.rb

@@ -127,6 +127,7 @@ module CemAcpt
           end
         ensure
           @items = (@cmd_output['items'] || []).map { |item| OutputItem.new(item) }
+          @error_obj ||= @items.find(&:error?)&.error
           if @items.empty? && @error_obj.nil? && @strict
             err = RuntimeError.new("Cannot set results, no error or items found for cmd_output:\n#{cmd_output}")
             @error_obj = err

data/lib/cem_acpt/bolt/tests.rb

@@ -158,11 +158,11 @@ module CemAcpt
         end
 
         def error?
-          @command_result.is_a?(CemAcpt::Bolt::BoltActionError)
+          @command_result.error?
         end
 
         def error
-          @command_result if error?
+          @command_result.error if error?
         end
 
         def to_h
@@ -378,7 +378,7 @@ module CemAcpt
         def load_test_data(run_data)
           run_data[:test_data].each_with_object({}) do |tdata, h|
             test_name = tdata[:test_name]
-            next if h.key?(test_name) || tdata[:bolt_test].nil?
+            next if h.key?(test_name)
 
             logger.debug('CemAcpt::Bolt::Tests') { "Loading test data for test #{test_name}" }
             begin

data/lib/cem_acpt/bolt/yaml_file.rb

@@ -53,6 +53,8 @@ module CemAcpt
         return false unless File.exist?(path)
 
         disk_contents = CemAcpt::Utils::Files.read(path, log_prefix: self.class.to_s)
+        return false unless disk_contents.is_a?(Hash)
+
         @hash.sort.to_h == disk_contents.sort.to_h
       end
 
@@ -60,6 +62,8 @@ module CemAcpt
         return false unless File.exist?(path)
 
         disk_contents = CemAcpt::Utils::Files.read(path, log_prefix: self.class.to_s)
+        return false unless disk_contents.is_a?(Hash)
+
         @hash.sort.to_h >= disk_contents.sort.to_h
       end
 
@@ -67,6 +71,8 @@ module CemAcpt
         return false unless File.exist?(path)
 
         disk_contents = CemAcpt::Utils::Files.read(path, log_prefix: self.class.to_s)
+        return false unless disk_contents.is_a?(Hash)
+
         @hash.sort.to_h <= disk_contents.sort.to_h
       end
     end

data/lib/cem_acpt/test_runner/log_formatter/bolt_summary_results_formatter.rb

@@ -26,25 +26,7 @@ module CemAcpt
           super(response)
           log_subject.each_with_object([]) do |res, ary|
             res.results.each do |r|
-              header = [
-                "#{success_str(r.success?).capitalize}: #{r.name}",
-                "action: #{r.action}",
-                "target: #{name_from_ip(r.target)}",
-                "object: #{r.object}",
-                "status: #{r.status}",
-              ]
-              parts = [
-                header.join(', '),
-                "validation results:\n#{JSON.pretty_generate(r.failed_validation_results)}",
-              ]
-              if CemAcpt::Logging.verbose?
-                parts << "command result:\n#{JSON.pretty_generate(r.command_result.to_h)}"
-              end
-              parts << r.error if r.error?
-              if r.respond_to?(:details) && !r.details&.empty?
-                parts << "details:\n#{JSON.pretty_generate(r.details)}\n"
-              end
-              ary << parts.join("\n")
+              ary << (r.error? ? format_error_result(r) : format_result(r))
             end
           end
         end
@@ -58,6 +40,41 @@ module CemAcpt
           super(response)
           'Bolt tests'
         end
+
+        private
+
+        def result_header(r)
+          [
+            "#{success_str(r.success?).capitalize}: #{r.name}",
+            "action: #{r.action}",
+            "target: #{name_from_ip(r.target)}",
+            "object: #{r.object}",
+            "status: #{r.status}",
+          ].join(', ')
+        end
+
+        def format_result(r)
+          parts = [
+            result_header(r),
+            "validation results:\n#{JSON.pretty_generate(r.failed_validation_results)}",
+          ]
+          if CemAcpt::Logging.verbose?
+            parts << "command result:\n#{JSON.pretty_generate(r.command_result.to_h)}"
+          end
+          if r.respond_to?(:details) && !r.details&.empty?
+            parts << "details:\n#{JSON.pretty_generate(r.details)}\n"
+          end
+          parts.join("\n")
+        end
+
+        def format_error_result(r)
+          [
+            result_header(r),
+            "error: #{r.error.kind}",
+            "issue code: #{r.error.issue_code}",
+            r.error.msg,
+          ].join("\n")
+        end
       end
     end
   end

data/lib/cem_acpt/test_runner.rb

@@ -186,7 +186,7 @@ module CemAcpt
         @run_data[:nodes] = new_node_data
         logger.verbose('CemAcpt::TestRunner') { "Initial run data:\n#{@run_data}" }
         logger.info('CemAcpt::TestRunner') { 'Created initial run data...' }
-        setup_bolt if CemAcpt::Actions.config.action_names.include?('bolt')
+        setup_bolt if CemAcpt::Actions.config.action_names.include?(:bolt)
       end
 
       def setup_bolt
@@ -197,12 +197,12 @@ module CemAcpt
         rescue CemAcpt::ShellCommandNotFoundError => e
           logger.warning('CemAcpt::TestRunner') { e.message }
           logger.warning('CemAcpt::TestRunner') { 'Adding Bolt action to ignore list...' }
-          CemAcpt::Actions.config.ignore << 'bolt'
+          CemAcpt::Actions.config.ignore << :bolt
           return
         end
         return unless @bolt_test_runner.tests.to_a.empty?
 
-        if !CemAcpt::Actions.config.only.empty? && CemAcpt::Actions.config.only.include?('bolt')
+        if !CemAcpt::Actions.config.only.empty? && CemAcpt::Actions.config.only.include?(:bolt)
           raise 'No Bolt tests to run and only bolt action was specified'
         end
 
@@ -348,6 +348,8 @@ module CemAcpt
             logger.info { r }
           else
             logger.error { r }
+            next unless result.respond_to?(:metadata) && result.metadata.key?(:run_logs)
+
             logs = if config.debug? && !config.get('puppet.no_debug')
                      result.metadata[:run_logs]&.dup
                    else

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http