cem_acpt 0.2.11-universal-java-17 → 0.3.1-universal-java-17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c97a0886b1604384a7e03f5edec960b594842f69502e5b1fcd4d2a6a18ecb3fc
-  data.tar.gz: 8ad5f879c25f70d0050ec0f7fd24891339b7a80271193d2549e8a6a7224d7727
+  metadata.gz: f977844689308ecaf3b9002e6665ad973a79eb6c0c0c728ceeb1423dbc83e62c
+  data.tar.gz: d38363d98ecc2a895932f239acc9d7de6d23090898c1822924a7ec6385a1abdd
 SHA512:
-  metadata.gz: 2279fa0e8ab932d0f02982cf8cacf6aaf4bf8c0a5e709eeb7e3cd0d093a4712f501c175f2a57f64cd0c441e56fa0c51e4238ab1a196d89037f719194981536a1
-  data.tar.gz: 76ca3f9c58e4f1450b3e442b0edc825b68ea5b533796b34e90963630dc219731238128f44dbe1267979199d06efa1a3cef99913318bb3684af663e377ec8b97f
+  metadata.gz: 41ec4792a70f45c501fd7c5c3de8f93bed4ee409e6ccea1f00d67aa1037338a9ba0cb005f87b4618cf8e412a9f6abdfdfd8d3bf6442e9fc9db573b021177cb69
+  data.tar.gz: 111909e4ceb4470d0853af023d1da617e0c3deda96a1e2cdb73a959979e316a16d00678b28c0c29e5720ef08e4e846a803a01ad6eecc0c0857cf234a0250cb4c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.2.11-universal-java-17)
+    cem_acpt (0.3.1-universal-java-17)
       concurrent-ruby (>= 1.1, < 2.0)
       deep_merge (>= 1.2, < 2.0)
       ed25519 (>= 1.2, < 2.0)
@@ -19,8 +19,8 @@ GEM
     ed25519 (1.3.0-java)
     minitar (0.9)
     multi_json (1.15.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.0.1)
     net-telnet (0.1.1)
     parallel (1.22.1)
@@ -68,7 +68,7 @@ GEM
       rspec-its
       specinfra (~> 2.83.1)
     sfl (2.3)
-    specinfra (2.83.3)
+    specinfra (2.83.4)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -85,4 +85,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   2.3.15
+   2.3.25

data/lib/cem_acpt/context.rb

@@ -62,8 +62,8 @@ module CemAcpt
       end
 
       def clean_up_test_suite(opts)
-        @ctx&.node_inventory&.clear!
-        @ctx&.node_inventory&.clean_local_files
+        @ctx&.node_inventory&.clear! unless opts[:no_destroy_nodes]
+        @ctx&.node_inventory&.clean_local_files unless opts[:no_destroy_nodes]
         clean_test_ssh_key unless opts[:no_ephemeral_ssh_key]
         @run_handler&.destroy_test_nodes
         @keep_terminal_alive&.kill

data/lib/cem_acpt/platform/gcp/cmd.rb

@@ -242,7 +242,7 @@ module CemAcpt::Platform::Gcp
       apply_cmd << "--hiera_config=#{opts[:apply][:hiera_config]}" if opts[:apply][:hiera_config]
       apply_cmd << '--debug' if opts[:apply][:debug]
       apply_cmd << '--noop' if opts[:apply][:noop]
-      apply_cmd << '--detailed-exitcodes' if opts[:apply][:detailed_exitcodes]
+      apply_cmd << '--detailed-exitcodes' if opts[:apply][:detailed_exit_codes]
 
       run_shell(
         instance_name,
@@ -337,7 +337,10 @@ module CemAcpt::Platform::Gcp
 
     # This function returns the currently authenticated user's name sanitized for use in SSH
     def authenticated_user_name
-      local_exec('compute os-login describe-profile', project_flag: false)['posixAccounts'][0]['username']
+      profile = local_exec('compute os-login describe-profile', project_flag: false)
+      accounts = profile['posixAccounts']
+      raise "cannot find any posix accounts in profile: #{profile}" if not accounts
+      accounts[0]['username']
     rescue StandardError => e
       raise "failed to find authenticated user name from os-login profile: #{e.message}"
     end

data/lib/cem_acpt/platform/gcp.rb

@@ -81,5 +81,14 @@ module Platform
     def run_shell(instance_name, cmd, opts = {})
       command_provider.run_shell(instance_name, cmd, opts)
     end
+
+    # Uploads a file to the given instance
+    # @param instance_name [String] the name of the instance to upload the file to
+    # @param local [String] the local file path
+    # @param remote [String] the remote file path
+    # @return [String] the output of the upload file command
+    def scp_upload(instance_name, local, remote)
+      command_provider.scp_upload(instance_name, local, remote)
+    end
   end
 end

data/lib/cem_acpt/spec_helper_acceptance.rb

@@ -144,6 +144,12 @@ module CemAcpt
       result
     end
 
+    # This method uploads a file to the test node.
+    def scp_upload(local, remote)
+      host = RSpec.configuration.acpt_test_data[:node_name]
+      RSpec.configuration.acpt_test_data[:platform].scp_upload(host, local, remote)
+    end
+
     # This method runs a shell command on the test node.
     def run_shell(cmd, opts = {})
       cmd = cmd.join(' ') if cmd.is_a?(Array)

data/lib/cem_acpt/test_data.rb

@@ -33,14 +33,16 @@ module CemAcpt
       # @return [Array<Hash>] an array of test data hashes
       def acceptance_test_data
         logger.info 'Gathering acceptance test data...'
-        acceptance_tests.each_with_object([]) do |t, a|
-          logger.debug("Processing #{t}...")
-          test_name = File.basename(t, '_spec.rb')
+        raise "No 'tests' entry found in config file" unless @config.has?('tests')
+        @config.get('tests').each_with_object([]) do |test_name, a|
+          logger.debug("Processing test #{test_name}...")
+          test_file = acceptance_tests.find { |f| File.basename(f, '_spec.rb') == test_name }
+          raise "Test file not found for test #{test_name}" unless test_file
+          logger.debug("Test file found for test #{test_name}: #{test_file}")
           test_data = {
             test_name: test_name,
-            test_file: File.expand_path(t),
+            test_file: File.expand_path(test_file),
           }
-          next unless @config.has?('tests') && @config.get('tests').include?(test_name)
 
           process_for_each(test_data).each do |test_data_i|
             process_static_vars(test_data_i)

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.1
 platform: universal-java-17
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement