cem_acpt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ce3a10380b032387479fc85590e5a9ca59c2dc5cec33d71cb9d79eaf6938a7
-  data.tar.gz: d3d12c621ee070af7cab276e6887c45343519c51e9260a1c6e6fd0fc4ca64e80
+  metadata.gz: d2313771f18f69c69e46f669fb17f42ead2cff90cd460075bab231df62cb2e07
+  data.tar.gz: dcc3955e5efbf03a347e73e577959df0290091b1f0b8556878dee7f4275e2ff2
 SHA512:
-  metadata.gz: d394053e259fb6d502a44d219b8dd056e1777d61a67a1a3da34360288ee6b623eadb842381900fe1d56d4944f0b9823c10c59f136f6ac486a8c0c47722dbfddf
-  data.tar.gz: c73ede8616dc75ab9da65573f5ad3a77c4ec604089183ede90e2a97a9fa2f5699ae012ba157935c0f7bdec9e2744f996d154958b40fde9271c545900f884de77
+  metadata.gz: 13f7edce58eb395c1f441e94ef9d1fef96b610547ccddc4096e2f78329f8dac1d7ee2a2cccbea982d079da1f25daa50379b3e8d3b4e64685b3fef50784d1f3a6
+  data.tar.gz: 723f4a38d9a89e50882b0c66577b8c760a5dc26c45357b7bc830073492fdf01976aacbba28eeb3ef382ec59fe7cae28d95a2da9b9eb77602cd02918bb829c29a

data/Gemfile.lock

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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Heston Snodgrass