cem_acpt 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95508415e2d43c47c4bbd08963e688133e693c395ed646c8d9d6e62f3cab04af
-  data.tar.gz: 9b4618f3f1a544e35f00b88ff28efd755637db91d7e042c1e526e5720e6ecec2
+  metadata.gz: 510e2adff3171d80515a714a2576ed434f860f52e94c367c050cb07f355294aa
+  data.tar.gz: b4d17cce2b4e7862e8f00558e3bebfd292c2eb3bab9f3df497d98cd881d4e9e8
 SHA512:
-  metadata.gz: 9ea28e2bb50d55cc24b96235360498cd0b76104bf48586bb9432e2d3b4e614b5d5e7a516b5587a77ff514629db897cc988e4cf4a084eb56d314b54a24d954661
-  data.tar.gz: e95003005da232f68c058ca492e30bf4eb5f4539772494e6e733da2ecad26e740b1d560bc46ef3dc3916ffbd9449a2b0e02636d5d9554613ee7cee6c317820e7
+  metadata.gz: 421f5d6f9f2bd087629be54b05bd56ddb67424adf5ababbe3aa0cf042f5bb4e44c10c7ece789ae6659472b1041069e5ec7c8b355fcb2a2606da03d6397d2941c
+  data.tar.gz: 26de5c483c949caa0f203cf65977bdad0bd42083324589d09d6a9ad1630686e0ec410986b81ca4f4a290be55073e4ab7f61f8103e615d6fe1fc7550f1df25daa

data/Gemfile.lock

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

data/lib/cem_acpt/actions.rb

@@ -142,9 +142,28 @@ module CemAcpt
 
           context[:group] = group.name
           context[:actions] = actions.map(&:name)
-          actions.each do |action|
-            action_opts = opts[action.name.to_sym] || {}
-            results << action.call(context.merge(action_opts))
+          if group.async
+            Async do
+              barrier = Async::Barrier.new
+              context[:internet] = Async::HTTP::Internet.new
+              actions.each do |action|
+                context[:action] = action.name
+                barrier.async do
+                  action_opts = opts[action.name.to_sym] || {}
+                  action.call(context.merge(action_opts))
+                end
+              end
+              barrier.wait
+            ensure
+              context[:internet]&.close
+            end
+            results << context[:results]
+          else
+            actions.each do |action|
+              context[:action] = action.name
+              action_opts = opts[action.name.to_sym] || {}
+              results << action.call(context.merge(action_opts))
+            end
           end
         end
       end

data/lib/cem_acpt/goss/api.rb

@@ -47,6 +47,7 @@ module CemAcpt
           raise ArgumentError, 'actions must be an Array' unless actions.is_a?(Array)
 
           actions.map!(&:to_sym)
+          actions.select! { |action| ACTIONS.key?(action) }
           logger.info('CemAcpt::Goss::Api') do
             "Running test actions #{actions.join(', ')} against #{hosts.size} host(s)..."
           end
@@ -69,6 +70,14 @@ module CemAcpt
           results
         end
 
+        def run_action_async(context = {})
+          context[:results] ||= Queue.new
+          context[:hosts].each do |host|
+            context[:results] << run_action(context[:internet], host, context[:action])
+          end
+          context[:results]
+        end
+
         # Run the specified action against the specified host.
         # @param internet [Async::HTTP::Internet] The Async::HTTP::Internet object to use for the request.
         # @param host [String] The host to run the action against. This should be

data/lib/cem_acpt/test_runner.rb

@@ -57,7 +57,6 @@ module CemAcpt
         pre_provision_test_nodes
         provision_test_nodes
         @instance_names_ips = provisioner_output
-        logger.info('CemAcpt::TestRunner') { "Instance names and IPs class: #{@instance_names_ips.class}" }
         @provisioned = true
         logger.info('CemAcpt::TestRunner') { 'Provisioned test nodes...' }
         logger.debug('CemAcpt::TestRunner') { "Instance names and IPs: #{@instance_names_ips}" }
@@ -115,12 +114,13 @@ module CemAcpt
       # Configures the actions to run based on the config
       def configure_actions
         logger.info('CemAcpt::TestRunner') { 'Configuring and registering actions...' }
-        goss_actions = CemAcpt::Goss::Api::ACTIONS.keys
         CemAcpt::Actions.configure(config) do |c|
-          c.register_group(:goss, order: 0).register_action(goss_actions.first) do |context|
-            run_goss_tests(context)
+          c.register_group(:goss, order: 0, async: true)
+          CemAcpt::Goss::Api::ACTIONS.each_key do |a|
+            c[:goss].register_action(a) do |context|
+              run_goss_test(context)
+            end
           end
-          goss_actions[1..-1].each { |a| c[:goss].register_action(a) }
           c.register_group(:bolt, order: 1).register_action(:bolt) do |context|
             run_bolt_tests(context)
           end
@@ -193,8 +193,15 @@ module CemAcpt
 
       def setup_bolt
         logger.info('CemAcpt::TestRunner') { 'Setting up Bolt...' }
-        @bolt_test_runner = CemAcpt::Bolt::TestRunner.new(config, run_data: @run_data)
-        @bolt_test_runner.setup!
+        begin
+          @bolt_test_runner = CemAcpt::Bolt::TestRunner.new(config, run_data: @run_data)
+          @bolt_test_runner.setup!
+        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'
+          return
+        end
         return unless @bolt_test_runner.tests.to_a.empty?
 
         if !CemAcpt::Actions.config.only.empty? && CemAcpt::Actions.config.only.include?('bolt')
@@ -250,8 +257,6 @@ module CemAcpt
       def run_tests
         logger.info('CemAcpt::TestRunner') { 'Preparing to run tests...' }
         logger.verbose('CemAcpt::TestRunner') { "Hosts: #{@hosts}" }
-        logger.verbose('CemAcpt::TestRunner') { "Only actions: #{CemAcpt::Actions.only}" }
-        logger.verbose('CemAcpt::TestRunner') { "Except actions: #{CemAcpt::Actions.except}" }
         @results = CemAcpt::TestRunner::TestResults.new(config, @instance_names_ips)
         CemAcpt::Actions.execute
       end
@@ -263,6 +268,13 @@ module CemAcpt
         CemAcpt::Goss::Api.run_actions_async(context)
       end
 
+      def run_goss_test(context = {})
+        logger.info('CemAcpt::TestRunner') { "Running Goss test for action #{context[:action]}..." }
+        context[:hosts] = @hosts
+        context[:results] = @results
+        CemAcpt::Goss::Api.run_action_async(context)
+      end
+
       def run_bolt_tests(_context = {})
         logger.info('CemAcpt::TestRunner') { 'Running Bolt tests...' }
         # If the Bolt config has tests:only or tests:ignore lists, we need to filter the hosts
@@ -311,14 +323,17 @@ module CemAcpt
           logger.info('CemAcpt::TestRunner') { "Processing #{@results.size} test result(s)..." }
           until @results.empty?
             result = @results.pop
+            res_status = result.status
+            if @exit_code.zero? && !SUCCESS_STATUS.include?(res_status.to_i)
+              logger.debug('CemAcpt::TestRunner') { "Setting exit code to 1 because of result: #{result}" }
+              @exit_code = 1
+            end
             @statuses << result.status
             log_test_result(result)
           end
           if @statuses.empty?
             logger.error('CemAcpt::TestRunner') { 'No test results to process' }
             @exit_code = 1
-          else
-            @exit_code = (@statuses.any? { |s| SUCCESS_STATUS.include?(s.to_i) }) ? 1 : 0
           end
         end
         @duration = Time.now - @start_time
@@ -353,7 +368,7 @@ module CemAcpt
       end
 
       def log_error_test_result(result)
-        logger.fatal { result.log_formatter.results.join("\n") }
+        logger.error { result.log_formatter.results.join("\n") }
       end
 
       # Upload the cem_windows module to the bucket if we're testing the cem_windows module

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http