cem_acpt 0.2.12-universal-java-17 → 0.3.2-universal-java-17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b50bf460a869a9d3d9bc39bfb173ff72a445d1cb0ad530592802dc7746a69ca
-  data.tar.gz: 464f0e379e111ca1c7ed6dd0247e1ab693158ed130836d44367d4830310d54e7
+  metadata.gz: c1403d7aad1f43c9ab46a2ec09e10e6e6971a895f864f908da36d1aa4f459ccb
+  data.tar.gz: 7c24f47c835e7422311e21fb3b398d871ba88fa8ba295a6b403c0b5006cfe890
 SHA512:
-  metadata.gz: c076c5eba5b8e3c297e1fcdaa39ea1d1a44387d90de40950f4d32e4b95866a9a50054fe4c20b226125535c105b3dd6675e7924f78f106a315112561002f4d0bd
-  data.tar.gz: efb086e7b909febc6bd777f1456562125c911ac7216e1a815800a3fcc1c9393b807a685165fe8678259aae6b5bb218cbb4afc7ec0b87416b483eb3fcf3603130
+  metadata.gz: d828aa44f6879dacbd6b5dabd5682dad73e7f4150436a0bffb51c73707345f61bd1b45527d102dfe67cb060acf0cec639c24c89df1a11b6c3f8598e48c939621
+  data.tar.gz: fa6b986ce60edafa468ee41a7dda019aad8fe09590918e93ec41325e9158a9bd96712a26b6575b1f08d7f239e66d14665ca2a3cbd90dcf08e0d6ce95347ceb73

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.2.12-universal-java-17)
+    cem_acpt (0.3.2-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

@@ -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

@@ -13,10 +13,10 @@ module Platform
   # Provision a GCP instance
   def provision
     creation_params = config.dup
-    creation_params[:disk][:image_name] = image_name
-    creation_params[:local_port] = local_port
+    creation_params[:disk][:image_name] = image_name.dup
+    creation_params[:local_port] = local_port.dup
     @instance = CemAcpt::Platform::Gcp::VM.new(
-      node_name,
+      node_name.dup,
       components: creation_params,
     )
     @instance.configure!
@@ -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.12'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.2
 platform: universal-java-17
 authors:
 - puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement