cem_acpt 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ce3a10380b032387479fc85590e5a9ca59c2dc5cec33d71cb9d79eaf6938a7
-  data.tar.gz: d3d12c621ee070af7cab276e6887c45343519c51e9260a1c6e6fd0fc4ca64e80
+  metadata.gz: a727f17ebb1ca0b67caa2380338d4e0f4c51b97f30833d0ff2def0b0d6679688
+  data.tar.gz: 6395e670075384a22f2935882ba999ad950065933d94d30f6b9cf5095f9a07dd
 SHA512:
-  metadata.gz: d394053e259fb6d502a44d219b8dd056e1777d61a67a1a3da34360288ee6b623eadb842381900fe1d56d4944f0b9823c10c59f136f6ac486a8c0c47722dbfddf
-  data.tar.gz: c73ede8616dc75ab9da65573f5ad3a77c4ec604089183ede90e2a97a9fa2f5699ae012ba157935c0f7bdec9e2744f996d154958b40fde9271c545900f884de77
+  metadata.gz: 3ad2d225b4d57f3d0e8b60c4539c8f3a0680fb390a4a56d04ce4f4f694a1f377832782c2e20ddf7d99e8814a029eb61713c6c64d6dd35f9628ac21cde3c1efb8
+  data.tar.gz: 704d7fac67463d27db15e9d32999de5166e9c4769e8b8c28f3fb26a28e61a8e7e94aca5ba0ef42b1e9095766bd5b39f4edc4ec96786ff508038f51d03f0f20ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.2.0)
+    cem_acpt (0.2.3)
       concurrent-ruby (~> 1.1.9)
       deep_merge (~> 1.2.2)
       net-ssh (~> 7.0.0.beta1)

data/cem_acpt.gemspec

@@ -5,14 +5,14 @@ require_relative 'lib/cem_acpt/version'
 Gem::Specification.new do |spec|
   spec.name          = 'cem_acpt'
   spec.version       = CemAcpt::VERSION
-  spec.authors       = ['Heston Snodgrass']
-  spec.email         = ['hsnodgrass3@gmail.com']
+  spec.authors       = ['puppetlabs']
+  spec.email         = ['abide-team@puppet.com']
 
   spec.summary       = 'CEM Acceptance Tests'
   spec.description   = 'Litmus-like library focusing on CEM Acceptance Tests'
   spec.homepage      = 'https://github.com/puppetlabs/cem_acpt'
   spec.license       = 'proprietary'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/puppetlabs/cem_acpt'

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

@@ -94,17 +94,10 @@ module CemAcpt::Platform::Gcp
         begin
           ::JSON.parse(stdout)
         rescue ::JSON::ParserError
-<<<<<<< HEAD
-          stdout
-        end
-      else
-        stdout
-=======
           stdout.chomp
         end
       else
         stdout.chomp
->>>>>>> 489757f (Fixes for race conditions)
       end
     end
 
@@ -239,20 +232,12 @@ module CemAcpt::Platform::Gcp
     end
 
     def apply_manifest(instance_name, manifest, opts = {})
-<<<<<<< HEAD
-      keep_manifest_file = opts[:apply][:keep_manifest_file] || false
-      with_temp_manifest_file(manifest, keep_manifest_file: keep_manifest_file) do |tf|
-        upload_temp_manifest(instance_name, tf.path, opts: opts)
-      end
-      apply_cmd = ["#{opts[:puppet_path]} apply /tmp/acpt_manifest.pp"]
-=======
       unless opts[:apply][:no_upload]
         with_temp_manifest_file(manifest) do |tf|
           upload_temp_manifest(instance_name, tf.path, remote_path: '/tmp/acpt_manifest.pp', opts: opts)
         end
       end
       apply_cmd = [opts[:puppet_path], 'apply', '/tmp/acpt_manifest.pp']
->>>>>>> 489757f (Fixes for race conditions)
       apply_cmd << '--trace' if opts[:apply][:trace]
       apply_cmd << "--hiera_config=#{opts[:apply][:hiera_config]}" if opts[:apply][:hiera_config]
       apply_cmd << '--debug' if opts[:apply][:debug]
@@ -276,11 +261,7 @@ module CemAcpt::Platform::Gcp
       cmd_parts.join(' ')
     end
 
-<<<<<<< HEAD
-    def with_temp_manifest_file(manifest, file_name: 'acpt_manifest', keep_manifest_file: false)
-=======
     def with_temp_manifest_file(manifest, file_name: 'acpt_manifest')
->>>>>>> 489757f (Fixes for race conditions)
       require 'tempfile'
       tf = Tempfile.new(file_name)
       tf.write(manifest)
@@ -288,25 +269,12 @@ module CemAcpt::Platform::Gcp
       begin
         yield tf
       ensure
-<<<<<<< HEAD
-        if keep_manifest_file
-          @manifest_file_exists = true
-        else
-          tf.unlink
-          @manifest_file_exists = false
-        end
-=======
         tf.unlink
->>>>>>> 489757f (Fixes for race conditions)
       end
     end
 
     def upload_temp_manifest(instance_name, local_path, remote_path: '/tmp/acpt_manifest.pp', opts: {})
-<<<<<<< HEAD
-      scp_upload(instance_name, local_path, remote_path, opts: opts[:ssh_opts]) unless @manifest_file_exists
-=======
       scp_upload(instance_name, local_path, remote_path, opts: opts[:ssh_opts]) unless opts[:apply][:no_upload]
->>>>>>> 489757f (Fixes for race conditions)
     end
 
     def gcloud_ssh(instance_name, command, ignore_command_errors: false)
@@ -322,15 +290,7 @@ module CemAcpt::Platform::Gcp
     # Default options for Net::SSH
     def default_ssh_opts
       {
-<<<<<<< HEAD
-        verify_host_key: :never,
-        keys: [ssh_key],
-        kex: ['diffie-hellman-group-exchange-sha256'], # ecdh algos cause jruby to shit the bed
-        keys_only: true,
-        config: false,
-=======
         auth_methods: ['publickey'],
->>>>>>> 489757f (Fixes for race conditions)
         check_host_ip: false,
         compression: true,
         config: false,
@@ -341,10 +301,7 @@ module CemAcpt::Platform::Gcp
         port: 22,
         user: user_name,
         user_known_hosts_file: File.join(ENV['HOME'], '.ssh', 'acpt_test_known_hosts'),
-<<<<<<< HEAD
-=======
         verify_host_key: :never,
->>>>>>> 489757f (Fixes for race conditions)
       }
     end
 

data/lib/cem_acpt/test_runner/runner.rb

@@ -42,11 +42,6 @@ module CemAcpt
         @module_pkg_path = @context.module_package_path
         @node_exists = false
         @run_result = CemAcpt::TestRunner::RunnerResult.new(@node, debug: @debug_mode)
-<<<<<<< HEAD
-        validate!
-      end
-
-=======
         @completed_steps = []
         validate!
       end
@@ -61,7 +56,6 @@ module CemAcpt
         destroy unless step_sym == :destroy
       end
 
->>>>>>> 489757f (Fixes for race conditions)
       # Executes test suite steps
       def start
         async_info("Starting test suite for #{@node.node_name}", log_prefix('RUNNER'))
@@ -85,23 +79,11 @@ module CemAcpt
 
       private
 
-<<<<<<< HEAD
-      def run_step(step_sym)
-        send(step_sym)
-      rescue StandardError => e
-        raise CemAcpt::TestRunner::RunnerStepError.new(step_sym, e)
-      end
-
-=======
->>>>>>> 489757f (Fixes for race conditions)
       def step_error_logging(err)
         prefix = err.respond_to?(:step) ? log_prefix(err.step.capitalize) : log_prefix('RUNNER')
         fatal_msg = ["runner failed: #{err.message}"]
         async_fatal(fatal_msg, prefix)
-<<<<<<< HEAD
-=======
         async_debug("Completed steps: #{@completed_steps}", prefix)
->>>>>>> 489757f (Fixes for race conditions)
         async_debug("Failed runner backtrace:\n#{err.backtrace.join("\n")}", prefix)
         async_debug("Failed runner test data: #{@node.test_data}", prefix)
       end

data/lib/cem_acpt/utils.rb

@@ -18,7 +18,7 @@ module CemAcpt
     # File-related utilities
     module File
       def self.set_permissions(permission, *file_paths)
-        file_paths.map { |p| File.chmod(permission, p) }
+        file_paths.map { |p| ::File.chmod(permission, p) }
       end
     end
 
@@ -32,7 +32,7 @@ module CemAcpt
       # Finds and returns the Puppet executable
       def self.puppet_executable
         this_os = CemAcpt::Utils.os
-        if File.file?(DEFAULT_PUPPET_PATH[this_os]) && File.executable?(DEFAULT_PUPPET_PATH[this_os])
+        if ::File.file?(DEFAULT_PUPPET_PATH[this_os]) && ::File.executable?(DEFAULT_PUPPET_PATH[this_os])
           return DEFAULT_PUPPET_PATH[this_os]
         end
 
@@ -41,9 +41,9 @@ module CemAcpt
           exts = ENV['PATHEXT'] ? ".{#{ENV['PATHEXT'].tr(';', ',').tr('.', '').downcase}}" : '.{exe,com,bat}'
           file_name = "#{file_name}#{exts}"
         end
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-          if File.file?(File.join(path, file_name)) && File.executable?(File.join(path, file_name))
-            return File.join(path, file_name)
+        ENV['PATH'].split(::File::PATH_SEPARATOR).each do |path|
+          if ::File.file?(::File.join(path, file_name)) && ::File.executable?(::File.join(path, file_name))
+            return ::File.join(path, file_name)
           end
         end
         raise 'Could not find Puppet executable! Is Puppet installed?'
@@ -75,30 +75,32 @@ module CemAcpt
     module Node
       def self.random_instance_name(prefix: 'cem-acpt-', length: 24)
         rand_length = length - prefix.length
-        "#{prefix}#{SecureRandom.hex(rand_length)}"
+        "#{prefix}#{::SecureRandom.hex(rand_length)}"
       end
     end
 
     # SSH-related utilities
     module SSH
-      def self.keygen
-        bin_path = `command -v ssh-keygen`.chomp
+      def self.ssh_keygen
+        bin_path = `#{ENV['SHELL']} -c 'command -v ssh-keygen'`.chomp
         raise 'Cannot find ssh-keygen! Install it and verify PATH' unless bin_path
 
         bin_path
+      rescue StandardError => e
+        raise "Cannot find ssh-keygen! Install it and verify PATH. Orignal error: #{e}"
       end
 
       def self.default_keydir
-        ssh_dir = File.join(ENV['HOME'], '.ssh')
-        raise "SSH directory at #{ssh_dir} does not exist" unless File.directory?(ssh_dir)
+        ssh_dir = ::File.join(ENV['HOME'], '.ssh')
+        raise "SSH directory at #{ssh_dir} does not exist" unless ::File.directory?(ssh_dir)
 
         ssh_dir
       end
 
       def self.ephemeral_ssh_key(type: 'rsa', bits: '4096', comment: nil, keydir: default_keydir)
-        raise ArgumentError, 'keydir does not exist' unless File.directory?(keydir)
+        raise ArgumentError, 'keydir does not exist' unless ::File.directory?(keydir)
 
-        keyfile = File.join(keydir, SecureRandom.hex(16))
+        keyfile = ::File.join(keydir, SecureRandom.hex(16))
         keygen_cmd = [ssh_keygen, "-t #{type}", "-b #{bits}", "-f #{keyfile}", '-N ""']
         keygen_cmd << "-C \"#{comment}\"" if comment
         _, stderr, status = Open3.capture3(keygen_cmd.join(' '))
@@ -108,8 +110,8 @@ module CemAcpt
       end
 
       def self.acpt_known_hosts(keydir: default_keydir, file_name: 'acpt_known_hosts', overwrite: true)
-        kh_file = File.join(keydir, file_name)
-        File.open(kh_file, 'w') { |f| f.write("\n") } unless File.exist?(kh_file) && !overwrite
+        kh_file = ::File.join(keydir, file_name)
+        ::File.open(kh_file, 'w') { |f| f.write("\n") } unless ::File.exist?(kh_file) && !overwrite
         kh_file
       end
 

data/lib/cem_acpt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
-- Heston Snodgrass
+- puppetlabs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: Litmus-like library focusing on CEM Acceptance Tests
 email:
-- hsnodgrass3@gmail.com
+- abide-team@puppet.com
 executables:
 - cem_acpt
 extensions: []
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="