cem_acpt 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52762f33465c435a0c6009002d7915dd249c145210493cd503936e7e816177a2
-  data.tar.gz: 6b7f8cb35ed65f914269ae0a5179a89f7ca3cc4d0f0d940bfd9a913b0c2cabf2
+  metadata.gz: 98336b152de85be1f1d7bfd20cd901da25d728d9ea120fb713becff384986560
+  data.tar.gz: ab6e2579bb7df9e58a0c4ed290e40a64a4b1a0c6a6f00894b924694de915e65e
 SHA512:
-  metadata.gz: e6e1a5986dda72b212bb344c8b62ddceb5ca8277be3fc392ff6f5dea61981a1666ace99f205a43d7ba63013d4fce0e509ec48819e4a96e9577fa5dbae52c180f
-  data.tar.gz: 529dbb05eabffe98ee9c7feaa1635858245d4ac20d681451a43d377c04a42f77516371c986c1a5add2c719631e8625dd454471b99fbb1e5270c8ee1d49ce4127
+  metadata.gz: 3c353057f6cda43e7b2e2a6eacfba36cdd41c2c78e459f7548b3e3ddd789a1c732e143b008b62f7c4e8fbb11e823a3e69f16a9a810c3c81db86be77e45b4b89e
+  data.tar.gz: c2cb83e57613ec0bed0292411e83a99705af80f0d205b699b52dd07ae49814d4adc8d235a9233c65b658d9652686b3dd302f5a1f45d0c19551f8c2811ef62ade

data/Gemfile.lock

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

data/lib/cem_acpt/config.rb

@@ -359,6 +359,7 @@ module CemAcpt
         checksum = File.read(module_terraform_checksum_file).strip
         return if checksum == module_terraform_checksum
       end
+      FileUtils.rm_rf(File.join(user_config_dir, 'terraform'))
       FileUtils.cp_r(File.expand_path(File.join(__dir__, '..', 'terraform')), user_config_dir)
       @module_terraform_checksum = new_module_terraform_checksum
       File.write(module_terraform_checksum_file, module_terraform_checksum)

data/lib/cem_acpt/logging.rb

@@ -126,9 +126,11 @@ module CemAcpt
       # Wraps the given block in a Github Actions group if in CI mode
       # @param name [String] the name of the group
       def with_ci_group(name)
-        return yield unless @ci_mode
-
-        self.<< "::group::#{name}\n"
+        if @ci_mode
+          self.<< "::group::#{name}\n"
+        else
+          info(name)
+        end
         yield
       ensure
         self.<< "::endgroup::\n" if @ci_mode

data/lib/cem_acpt/provision/terraform.rb

@@ -14,7 +14,7 @@ module CemAcpt
       DEFAULT_VARS_FILE = 'testvars.json'
       include CemAcpt::Logging
 
-      attr_reader :environment, :working_dir
+      attr_reader :environment, :working_dir, :module_package_path, :private_key, :public_key
 
       def initialize(config, provision_data)
         @config = config
@@ -22,11 +22,14 @@ module CemAcpt
         @backend = new_backend(@provision_data[:test_data].first[:test_name])
         @environment = new_environment(@config)
         @working_dir = nil
+        @module_package_path = nil
+        @private_key = nil
+        @public_key = nil
       end
 
-      def provision
+      def provision(reuse_working_dir: false)
         logger.info('Terraform') { 'Provisioning nodes...' }
-        @working_dir = new_working_dir
+        @working_dir = new_working_dir unless reuse_working_dir
         validate_working_dir!
         save_vars_to_file!(formatted_vars) # Easier to reuse nodes this way
 
@@ -42,6 +45,9 @@ module CemAcpt
         logger.verbose('Terraform') { "Deleting old working directory #{working_dir}" }
         FileUtils.rm_rf(working_dir)
         @working_dir = nil
+        @module_package_path = nil
+        @private_key = nil
+        @public_key = nil
       end
 
       def show
@@ -156,7 +162,18 @@ module CemAcpt
         FileUtils.cp_r(@backend.provision_directory, work_dir)
         logger.verbose('Terraform') { "Copied provision directory #{@backend.provision_directory} to #{work_dir}" }
         FileUtils.cp(@provision_data[:module_package_path], work_dir)
+        @module_package_path = File.join(work_dir, File.basename(@provision_data[:module_package_path]))
         logger.verbose('Terraform') { "Copied module package #{@provision_data[:module_package_path]} to #{work_dir}" }
+        if File.exist?(@provision_data[:private_key])
+          FileUtils.cp(@provision_data[:private_key], work_dir)
+          @private_key = File.join(work_dir, File.basename(@provision_data[:private_key]))
+          logger.verbose('Terraform') { "Copied private key #{@provision_data[:private_key]} to #{work_dir}" }
+        end
+        if File.exist?(@provision_data[:public_key])
+          FileUtils.cp(@provision_data[:public_key], work_dir)
+          @public_key = File.join(work_dir, File.basename(@provision_data[:public_key]))
+          logger.verbose('Terraform') { "Copied public key #{@provision_data[:public_key]} to #{work_dir}" }
+        end
         work_dir
       rescue StandardError => e
         logger.error('Terraform') { 'Error creating working directory' }
@@ -204,9 +221,9 @@ module CemAcpt
       def formatted_vars
         @provision_data[:nodes].first.platform_data.merge(
           {
-            puppet_module_package: @provision_data[:module_package_path],
-            private_key: @provision_data[:private_key],
-            public_key: @provision_data[:public_key],
+            puppet_module_package: @module_package_path,
+            private_key: @private_key,
+            public_key: @public_key,
             node_data: provision_node_data,
           }
         )

data/lib/cem_acpt/test_runner.rb

@@ -39,27 +39,27 @@ module CemAcpt
       def run
         @run_data = {}
         @start_time = Time.now
-        logger.info('CemAcpt') { "Starting CemAcpt v#{CemAcpt::VERSION}..." }
-        logger.info('CemAcpt') { "Test suite started at #{@start_time}..." }
-        logger.info('CemAcpt') { "Using module directory: #{config.get('module_dir')}..." }
-        Dir.chdir(config.get('module_dir')) do
-          keep_terminal_alive
-          @run_data[:private_key], @run_data[:public_key], @run_data[:known_hosts] = new_ephemeral_ssh_keys
-          logger.info('CemAcpt') { 'Created ephemeral SSH key pair...' }
-          @run_data[:module_package_path] = build_module_package
-          logger.info('CemAcpt') { "Created module package: #{@run_data[:module_package_path]}..." }
-          @run_data[:test_data] = new_test_data
-          logger.info('CemAcpt') { 'Created test data...' }
-          logger.verbose('CemAcpt') { "Test data: #{@run_data[:test_data]}" }
-          @run_data[:nodes] = new_node_data
-          logger.info('CemAcpt') { 'Created node data...' }
-          logger.verbose('CemAcpt') { "Node data: #{@run_data[:nodes]}" }
-          @instance_names_ips = provision_test_nodes
-          logger.info('CemAcpt') { 'Provisioned test nodes...' }
-          logger.debug('CemAcpt') { "Instance names and IPs: #{@instance_names_ips}" }
-          @results = run_tests(@instance_names_ips.map { |_, v| v['ip'] },
-                               config.get('actions.only'),
-                               config.get('actions.except'))
+        logger.with_ci_group("CemAcpt v#{CemAcpt::VERSION} run started at #{@start_time}") do
+          logger.info('CemAcpt') { "Using module directory: #{config.get('module_dir')}..." }
+          Dir.chdir(config.get('module_dir')) do
+            keep_terminal_alive
+            @run_data[:private_key], @run_data[:public_key], @run_data[:known_hosts] = new_ephemeral_ssh_keys
+            logger.info('CemAcpt') { 'Created ephemeral SSH key pair...' }
+            @run_data[:module_package_path] = build_module_package
+            logger.info('CemAcpt') { "Created module package: #{@run_data[:module_package_path]}..." }
+            @run_data[:test_data] = new_test_data
+            logger.info('CemAcpt') { 'Created test data...' }
+            logger.verbose('CemAcpt') { "Test data: #{@run_data[:test_data]}" }
+            @run_data[:nodes] = new_node_data
+            logger.info('CemAcpt') { 'Created node data...' }
+            logger.verbose('CemAcpt') { "Node data: #{@run_data[:nodes]}" }
+            @instance_names_ips = provision_test_nodes
+            logger.info('CemAcpt') { 'Provisioned test nodes...' }
+            logger.debug('CemAcpt') { "Instance names and IPs: #{@instance_names_ips}" }
+            @results = run_tests(@instance_names_ips.map { |_, v| v['ip'] },
+                                config.get('actions.only'),
+                                config.get('actions.except'))
+          end
         end
       ensure
         clean_up
@@ -105,7 +105,7 @@ module CemAcpt
       end
 
       def clean_ephemeral_ssh_keys
-        return if config.get('no_ephemeral_ssh_key')
+        return if config.get('no_ephemeral_ssh_key') || config.get('no_destroy_nodes')
 
         CemAcpt::Utils::SSH::Ephemeral.clean
       end
@@ -124,13 +124,17 @@ module CemAcpt
       end
 
       def destroy_test_nodes
-        @provisioner&.destroy if config.get('no_destroy_nodes')
+        return no_destroy if config.get('no_destroy_nodes')
+
+        logger.with_ci_group("CemAcpt v#{CemAcpt::VERSION} run finished at #{Time.now}") { @provisioner&.destroy }
       end
 
       def no_destroy
         logger.warn('CemAcpt') { 'Not destroying test nodes...' }
-        @provisioner&.show
-        logger.info('CemAcpt') { "Test SSH Keys:\n  Private Key: #{@run_data[:private_key]}\n  Public Key:#{@run_data[:public_key]}" }
+        logger.with_ci_group("CemAcpt v#{CemAcpt::VERSION} run finished at #{Time.now}") do
+          @provisioner&.show
+          logger.info('CemAcpt') { "Test SSH Keys:\n  Private Key: #{@run_data[:private_key]}\n  Public Key:#{@run_data[:public_key]}" }
+        end
       end
 
       def run_tests(hosts, only_actions, except_actions)

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http