cem_acpt 0.10.4 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f6d280d4ac5c56cd722e9a2a906647996cc18a5db7babc1f950b74a44306fc3
-  data.tar.gz: f62af838277ee9e25b2af58093d1183460bc9022a175399c5830d38e49d01620
+  metadata.gz: f55a13b7ba6760d6d6b36ca313f7cddf637ae86b76ab48613de5938cb16f4d0e
+  data.tar.gz: 63838f21061f45475f880a7e6966664b0a043938b2f74548f79afebaf9801eca
 SHA512:
-  metadata.gz: 0d573fb143effd9425d6b38f6e764c8bafb44acb583bf95b9f2a600ca787e975875e2004edcaedc78876c303342663376334fde8fff37c5fef1bed3b131c9442
-  data.tar.gz: a4e164fd64921e3bdde69e664f846ebe3fc307e1d919fff61df40634ac34794124d5e15539c3c657f874c6e9403228e3dca2593c4fe54358b0c588ba92e5e698
+  metadata.gz: 3679136cf4a7f393254856444f9c9bc922f608c86068f984620f8bcae3b5636bbcd22ce9fb2f72c80ba1e00e44df22ff0d445fb729f7d0f598ad3ce0dbed67e6
+  data.tar.gz: a46c919e4d0418377d9d06e9fe4b5c253794d26ae8e5e5f43f9d8e6f72ac6da453fc326e9a86d918daacf35ef554ab19d56565aad4da76055de98b3922fcc536

data/Gemfile.lock

@@ -1,144 +1,184 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.10.4)
+    cem_acpt (0.10.7)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)
-      ed25519 (>= 1.2, < 2.0)
+      ed25519 (>= 1.0, < 2.0)
       puppet-modulebuilder (>= 0.0.1)
       winrm (>= 2.3, < 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    async (2.5.0)
-      console (~> 1.10)
-      io-event (~> 1.1)
-      timers (~> 4.1)
-    async-http (0.60.1)
+    ast (2.4.3)
+    async (2.23.1)
+      console (~> 1.29)
+      fiber-annotation
+      io-event (~> 1.9)
+      metrics (~> 0.12)
+      traces (~> 0.15)
+    async-http (0.69.0)
+      async (>= 2.10.2)
+      async-pool (~> 0.7)
+      io-endpoint (~> 0.11)
+      io-stream (~> 0.4)
+      protocol-http (~> 0.26)
+      protocol-http1 (~> 0.19)
+      protocol-http2 (~> 0.18)
+      traces (>= 0.10)
+    async-pool (0.10.3)
       async (>= 1.25)
-      async-io (>= 1.28)
-      async-pool (>= 0.2)
-      protocol-http (~> 0.24.0)
-      protocol-http1 (~> 0.15.0)
-      protocol-http2 (~> 0.15.0)
-      traces (>= 0.8.0)
-    async-io (1.34.3)
-      async
-    async-pool (0.4.0)
-      async (>= 1.25)
-    bcrypt_pbkdf (1.1.0)
-    builder (3.2.4)
+    base64 (0.2.0)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
+    bigdecimal (3.1.9)
+    builder (3.3.0)
     coderay (1.1.3)
-    console (1.16.2)
-      fiber-local
+    console (1.30.2)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     deep_merge (1.2.2)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
+    diff-lcs (1.6.1)
+    docile (1.4.1)
     ed25519 (1.3.0)
-    erubi (1.12.0)
-    ffi (1.15.5)
-    fiber-local (1.0.0)
+    erubi (1.13.1)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.4.0)
       builder (>= 2.1.2)
       rexml (~> 3.0)
-    httpclient (2.8.3)
-    io-event (1.1.7)
-    json (2.6.3)
+    httpclient (2.9.0)
+      mutex_m
+    io-endpoint (0.15.2)
+    io-event (1.10.0)
+    io-stream (0.6.1)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     little-plugger (1.1.4)
-    logging (2.3.1)
+    logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    method_source (1.0.0)
-    minitar (0.9)
+    method_source (1.1.0)
+    metrics (0.12.2)
+    minitar (0.12.1)
     multi_json (1.15.0)
-    nori (2.6.0)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    mutex_m (0.3.0)
+    nori (2.7.1)
+      bigdecimal
+    parallel (1.26.3)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
-    pathspec (1.1.3)
-    protocol-hpack (1.4.2)
-    protocol-http (0.24.1)
-    protocol-http1 (0.15.0)
+      racc
+    pathspec (2.1.0)
+    prism (1.4.0)
+    protocol-hpack (1.5.1)
+    protocol-http (0.49.0)
+    protocol-http1 (0.34.0)
       protocol-http (~> 0.22)
-    protocol-http2 (0.15.1)
+    protocol-http2 (0.22.1)
       protocol-hpack (~> 1.4)
-      protocol-http (~> 0.18)
-    pry (0.14.2)
+      protocol-http (~> 0.47)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    puppet-modulebuilder (0.3.0)
+    puppet-modulebuilder (2.0.2)
       minitar (~> 0.9)
-      pathspec (>= 0.2.1, < 2.0.0)
+      pathspec (>= 0.2.1, < 3.0.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rexml (3.4.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.48.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.75.1)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.43.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-performance (1.19.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.23.2)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.24.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
-    rubyntlm (0.6.3)
-    simplecov (0.21.2)
+    rubyntlm (0.6.5)
+      base64
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    timers (4.3.5)
-    traces (0.9.1)
-    unicode-display_width (2.4.2)
-    winrm (2.3.6)
+    traces (0.15.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    winrm (2.3.9)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
+      nori (~> 2.0, >= 2.7.1)
+      rexml (~> 3.0)
       rubyntlm (~> 0.6.0, >= 0.6.3)
 
 PLATFORMS
-  arm64-darwin-22
-  x86_64-darwin-20
-  x86_64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   cem_acpt!
@@ -151,4 +191,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.19
+   2.5.22

data/cem_acpt.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'async-http', '>= 0.60', '< 0.70'
   spec.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
   spec.add_runtime_dependency 'deep_merge', '>= 1.2', '< 2.0'
-  spec.add_runtime_dependency 'ed25519', '>= 1.2', '< 2.0'
+  spec.add_runtime_dependency 'ed25519', '>= 1.0', '< 2.0'
   spec.add_runtime_dependency 'puppet-modulebuilder', '>= 0.0.1'
   spec.add_runtime_dependency 'winrm', '>= 2.3', '< 3.0'
   spec.add_development_dependency 'pry'

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

@@ -107,7 +107,7 @@ module CemAcpt
           logger.debug('CemAcpt::Bolt') { "Running Bolt command: #{cmd}" }
           logger.debug('CemAcpt::Bolt') { "Bolt command environment: #{cmd_env}" }
           begin
-            out = CemAcpt::Utils::Shell.run_cmd(cmd, cmd_env, output: nil, raise_on_fail: false)
+            out = CemAcpt::Utils::Shell.run_cmd(cmd, cmd_env, output: nil, raise_on_fail: false, combine_out_err: false)
             logger.debug('CemAcpt::Bolt') { "Bolt command raw output:\n#{out}" }
             CemAcpt::Bolt::Cmd::Output.new(out, strict: strict, **(@item_defaults || {}))
           rescue StandardError => e

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/inventory.rb

@@ -43,6 +43,7 @@ module CemAcpt
               'config' => {
                 'transport' => 'ssh',
                 'ssh' => {
+                  'native-ssh' => true,
                   'connect-timeout' => 60,
                   'disconnect-timeout' => 60,
                   'host-key-check' => false,

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
@@ -316,7 +316,11 @@ module CemAcpt
           @inventory = inventory
           @project = project
           @test_data = nil
+          @tasks_only = @config&.get('bolt.tasks.only') || []
+          @tasks_ignore = @config&.get('bolt.tasks.ignore') || []
           @tasks = []
+          @tests_only = @config&.get('boly.tests.only') || []
+          @tests_ignore = @config&.get('bolt.tests.ignore') || []
           @tests = []
           @loaded = false
           @setup = false
@@ -378,7 +382,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
@@ -391,12 +395,35 @@ module CemAcpt
           end
         end
 
+        def run_task?(task_name)
+          (@tasks_only.empty? || @tasks_only.include?(task_name)) &&
+            (@tasks_ignore.empty? || !@tasks_ignore.include?(task_name))
+        end
+
+        def run_test?(test_group)
+          (@tests_only.empty? || @tests_only.include?(test_group)) &&
+            (@tests_ignore.empty? || !@tests_ignore.include?(test_group)) &&
+            @config.get('tests').include?(test_group)
+        end
+
         def new_test_array(tasks, test_data)
           tw_created = {}
           logger.debug('CemAcpt::Bolt::Tests') { 'Creating tests for Bolt tasks' }
           tasks.each do |task|
+            if run_task?(task.full_name)
+              logger.verbose('CemAcpt::Bolt::Tests') { "Running tests for task #{task.full_name}" }
+            else
+              logger.debug('CemAcpt::Bolt::Tests') { "Skipping tests for task #{task.full_name}" }
+              next
+            end
+
             test_data.each do |group, tdata|
-              next unless @config.get('tests').include?(group)
+              if run_test?(group)
+                logger.verbose('CemAcpt::Bolt::Tests') { "Running tests for group #{group}" }
+              else
+                logger.debug('CemAcpt::Bolt::Tests') { "Skipping tests for group #{group}" }
+                next
+              end
 
               if tw_created.key?(task.full_name)
                 tw_created[task.full_name].add_group(group)

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/bolt.rb

@@ -55,8 +55,8 @@ module CemAcpt
 
       def teardown!
         logger.debug('CemAcpt::Bolt') { 'Tearing down Bolt project...' }
-        @inventory.delete!
-        @project.delete!
+        @inventory.delete! unless @config.get('bolt.keep_inventory')
+        @project.delete! unless @config.get('bolt.keep_project')
       end
 
       def hosts=(hosts)

data/lib/cem_acpt/cli.rb

@@ -41,6 +41,16 @@ module CemAcpt
             options[:bolt][:tests] ||= {}
             options[:bolt][:tests][:enabled] = false
           end
+
+          opts.on('--bolt-keep-inventory', 'Keep the Bolt inventory after tests') do
+            options[:bolt] ||= {}
+            options[:bolt][:keep_inventory] = true
+          end
+
+          opts.on('--bolt-keep-project', 'Keep the Bolt project after tests') do
+            options[:bolt] ||= {}
+            options[:bolt][:keep_project] = true
+          end
         when :cem_acpt_image
           opts.on('--dry-run', 'Logs the information for the images that would be created. Does not create images.') do
             options[:dry_run] = true

data/lib/cem_acpt/config/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'digest'
+require 'deep_merge'
 require 'fileutils'
 require 'json'
 require 'yaml'
@@ -40,6 +41,11 @@ module CemAcpt
         verbose
       ].freeze
 
+      DEEP_MERGE_OPTS = {
+        overwrite_arrays: true,
+        merge_nil_values: true,
+      }.freeze
+
       attr_reader :config, :env_vars
 
       def initialize(opts: {}, config_file: nil, load_user_config: true)
@@ -84,9 +90,9 @@ module CemAcpt
         create_config_dirs!
         init_config!(opts: opts, config_file: config_file)
         add_env_vars!(@config)
-        @config.merge!(user_config) if user_config && @load_user_config
-        @config.merge!(config_from_file) if config_from_file
-        @config.merge!(@options) if @options
+        @config.deep_merge!(user_config, **DEEP_MERGE_OPTS) if user_config && @load_user_config
+        @config.deep_merge!(config_from_file, **DEEP_MERGE_OPTS) if config_from_file
+        @config.deep_merge!(@options, **DEEP_MERGE_OPTS) if @options
         add_static_options!(@config)
         @config.format! # Symbolize keys of all hashes
         validate_config!
@@ -217,9 +223,8 @@ module CemAcpt
           config.dset('log_level', 'debug')
           config.dset('verbose', true)
         end
-        if ENV['GITHUB_ACTIONS'] == 'true' || ENV['CI'] == 'true'
-          config.dset('ci_mode', true)
-        end
+        return unless ENV['GITHUB_ACTIONS'] == 'true' || ENV['CI'] == 'true'
+        config.dset('ci_mode', true)
       end
 
       # Used to source the config during loading of config files.
@@ -269,10 +274,10 @@ module CemAcpt
         return @user_config unless @user_config.nil? || @user_config.empty?
 
         @user_config = if user_config_file && File.exist?(user_config_file)
-                        load_config_file(user_config_file)
-                      else
-                        {}
-                      end
+                         load_config_file(user_config_file)
+                       else
+                         {}
+                       end
 
         @user_config
       end

data/lib/cem_acpt/image_builder/provision_commands.rb

@@ -14,7 +14,7 @@ module CemAcpt
         end
 
         def default_provision_commands
-          [enable_puppet_repository_command, install_puppet_agent_command]
+          [enable_puppet_repository_command, set_repo_username_and_password, upgrade_packages_command, install_puppet_agent_command].flatten
         end
 
         def provision_commands
@@ -41,8 +41,24 @@ module CemAcpt
           "sudo #{package_manager} install -y #{package_manager_utils}"
         end
 
+        # Update to the new private Puppet platform repository URL
         def puppet_platform_repository_url
-          "https://yum.puppet.com/puppet#{@puppet_version}-release-el-#{@os_major_version}.noarch.rpm"
+          "https://yum-puppetcore.puppet.com/public/puppet#{@puppet_version}-release-el-#{@os_major_version}.noarch.rpm"
+        end
+
+        def set_repo_username_and_password
+          commands = []
+          # Replace the commented out username and password lines with the actual username and password
+          # This is necessary to access the private Puppet platform repository
+          # 
+          # Updating the username first
+          commands.push("sudo sed -i 's/^.*#username=.*$/username=forge-key/' /etc/yum.repos.d/puppet#{@puppet_version}-release.repo")
+
+          # Updating the password next
+          # The password is from the environment variable PUPPET_AUTH_TOKEN
+          # "sudo sed -i 's/#password=/password=#{ENV['PUPPET_AUTH_TOKEN']}/' /etc/yum.repos.d/puppet#{@puppet_version}-release.repo"
+          commands.push("sudo sed -i 's/^.*#password=.*$/password=$PUPPET_AUTH_TOKEN/' /etc/yum.repos.d/puppet#{@puppet_version}-release.repo")
+          commands
         end
 
         def enable_puppet_repository_command
@@ -84,7 +100,7 @@ module CemAcpt
         end
 
         def default_provision_commands
-          [install_curl_command, enable_puppet_repository_command, upgrade_packages_command, install_puppet_agent_command]
+          [install_curl_command, enable_puppet_repository_command, set_repo_username_and_password, upgrade_packages_command, install_puppet_agent_command].flatten
         end
 
         def provision_commands
@@ -104,12 +120,27 @@ module CemAcpt
           end
         end
 
+        def set_repo_username_and_password
+          commands = []
+          # This is necessary to access the private Puppet platform repository 
+          # Modifying the conf file at /et/apt/auth.conf.d/puppetcore.conf by adding the username and password
+          
+          # Adding the server URL
+          commands.push("sudo echo machine apt-puppetcore.puppet.com | sudo tee /etc/apt/auth.conf.d/apt-puppetcore-puppet.conf > /dev/null")
+          # Adding the username
+          commands.push("sudo echo login forge-key | sudo tee -a /etc/apt/auth.conf.d/apt-puppetcore-puppet.conf > /dev/null")
+          # Adding the password
+          commands.push("sudo echo password $PUPPET_AUTH_TOKEN | sudo tee -a /etc/apt/auth.conf.d/apt-puppetcore-puppet.conf > /dev/null")
+          commands
+        end
+
+        # Update to the new private Puppet platform repository URL for apt
         def puppet_platform_repository_url
-          "https://apt.puppet.com/puppet#{@puppet_version}-release-focal.deb"
+          "https://apt-puppetcore.puppet.com/public/puppet#{@puppet_version}-release-focal.deb"
         end
 
         def enable_puppet_repository_command
-          "wget #{puppet_platform_repository_url} && sudo dpkg -i puppet#{@puppet_version}-release-focal.deb"
+          "wget --content-disposition #{puppet_platform_repository_url} && sudo dpkg -i puppet#{@puppet_version}-release-focal.deb"
         end
 
         def install_puppet_agent_command

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/utils/shell.rb

@@ -19,28 +19,38 @@ module CemAcpt
       #   command to in real time. Typically this is a Logger object. Defaults to $stdout.
       #   If the object responds to #:debug, the command will be logged at the debug level.
       # @param raise_on_fail [Boolean] Whether to raise an error if the command fails
-      # @return [String] The string output of the command
-      def self.run_cmd(cmd, env = {}, output: $stdout, raise_on_fail: true)
-        io_outerr = StringIO.new
+      # @param combine_out_err [Boolean] Whether to combine the output and error streams into the output.
+      #   If false, the stderr stream will not be written to the output stream or returned with
+      #   the output string.
+      # @return [String] The string output of the command, and the error output of the command
+      def self.run_cmd(cmd, env = {}, output: $stdout, raise_on_fail: true, combine_out_err: true)
+        io_out = StringIO.new
         if output.respond_to?(:debug)
           output.debug('CemAcpt::Utils::Shell') { "Running command:\n\t#{cmd}\nWith environment:\n\t#{env}" }
         elsif output
           output << "Running command:\n\t#{cmd}\nWith environment:\n\t#{env}\n"
         end
-        val = Open3.popen2e(env, cmd) do |stdin, outerr, wait_thr|
-          stdin.close
-          outerr.sync = true
+        val = Open3.popen3(env, cmd) do |i, o, e, t|
+          i.close
+          o.sync = true
+          e.sync = true
           output_thread = Thread.new do
-            while (line = outerr.gets("\n"))
+            while (line = o.gets("\n"))
               output << line if output
-              io_outerr.write(line) unless line.chomp.empty?
+              io_out.write(line) unless line.chomp.empty?
+            end
+            if combine_out_err
+              while (line = e.gets("\n"))
+                output << line if output && combine_out_err
+                io_out.write(line) unless line.chomp.empty?
+              end
             end
           end
-          wait_thr.join
+          t.join
           output_thread.exit
-          wait_thr.value
+          t.value
         end
-        io_string = io_outerr.string
+        io_string = io_out.string
         raise CemAcpt::ShellCommandError, "Error running command: #{cmd}\n#{io_string}" if raise_on_fail && !val.success?
 
         io_string

data/lib/cem_acpt/version.rb

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

data/lib/terraform/image/gcp/linux/main.tf

@@ -40,6 +40,19 @@ variable "public_key" {
     type = string
 }
 
+# TF_VAR_PUPPET_AUTH_TOKEN must be defined as an environment variable on the running host (i.e the GitHub action runner node, or your local machine)
+# for this variable to be initialized correctly
+variable "PUPPET_AUTH_TOKEN" {
+    description = "Puppet Forge Auth Token"
+    type        = string
+
+    validation {
+        condition = length(var.PUPPET_AUTH_TOKEN) > 0
+        error_message = "TF_VAR_PUPPET_AUTH_TOKEN must be defined as a local environment variable to proceed"
+    }
+}
+
+
 variable "node_data" {
     type = map(object({
         image_family = string
@@ -88,8 +101,10 @@ resource "google_compute_instance" "acpt-test-node" {
             port = 22
             private_key = "${file(var.private_key)}"
             agent = false
+            script_path = "/home/${var.username}/terraform_%RAND%.sh"
         }
-        inline = each.value.provision_commands
+        # Appending the command to export the PUPPET_AUTH_TOKEN to the existing provision_commands list
+        inline = concat(["export PUPPET_AUTH_TOKEN=${var.PUPPET_AUTH_TOKEN}"], each.value.provision_commands)
     }
 
     metadata = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.7
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: CEM Acceptance Tests