puppet_litmus 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010e8b1b5a215086d880ace04e48f7beeb259d27d565e0d187f6509412aaf42e
-  data.tar.gz: 48cabdd685b1fb4ec5772ae64bea6f3ccdef822f7237029f19279b62c6bdc5a6
+  metadata.gz: 815ccaf832ee6fa876fa73222f64246bf39d1510488cd5c655ea880976e94c32
+  data.tar.gz: 40c94ee82672dd7a48d100d54cdf1091fea06b8b706e69c0382e4dbf5edfdb86
 SHA512:
-  metadata.gz: eba91d7ef1dbd290daf9e50cccb85548cd0ae8975de31ef3761ea6794bb339f9a8efc3911ffe02a6308d525d76c3dd21ad00d353f18f2ac9f276faff581c4e7b
-  data.tar.gz: 5d4dc9f8ea6b08663e527737bb5974e5dcd5cd691a88994d5c0271f0c6df4e205dcff8766995ee74a693c118ed621cca8d221e7b83120433d6eafdc4c044711d
+  metadata.gz: 6aa9e819c9d11d3d2f149e29792ee373c715cac86d4f6b2f6620efba1111b27b2fb9756470bed981e3fcf0d9b1897e398390a6dd8215e9d3cced0842311f58bb
+  data.tar.gz: 14fa50906d8122c789d13a380dc245e41da0106c9ee9b1c7993b62b40de2661aa3a700303dcb2f7194756cbb34d3f143b94fb987d620a21cfd31a73bdf243382

data/lib/puppet_litmus/rake_helper.rb

@@ -207,4 +207,18 @@ module PuppetLitmus::RakeHelper
     install_module_command = "puppet module uninstall #{module_name}"
     run_command(install_module_command, target_nodes, config: nil, inventory: inventory_hash)
   end
+
+  def check_connectivity?(inventory_hash, target_node_name)
+    require 'bolt_spec/run'
+    include BoltSpec::Run
+    target_nodes = find_targets(inventory_hash, target_node_name)
+    results = run_command('cd .', target_nodes, config: nil, inventory: inventory_hash)
+    failed = []
+    results.each do |result|
+      failed.push(result['target']) if result['status'] == 'failure'
+    end
+    raise "Connectivity has failed on: #{failed}" unless failed.length.zero?
+
+    true
+  end
 end

data/lib/puppet_litmus/rake_tasks.rb

@@ -53,7 +53,7 @@ namespace :litmus do
       end
 
       if result.first['status'] != 'success'
-        failed_image_message += "=====\n#{result.first['node']}\n#{result.first['result']['_output']}\n"
+        failed_image_message += "=====\n#{result.first['node']}\n#{result.first['result']['_output']}\n#{result.inspect}"
       else
         STDOUT.puts "#{result.first['result']['node_name']}, #{image}"
       end
@@ -175,6 +175,20 @@ namespace :litmus do
     end
   end
 
+  # Check that the nodes in the inventory are still contactable
+  #
+  # @param :target_node_name [Array] nodes on which to check connnectivity
+  desc 'check_connectivity - build and install module'
+  task :check_connectivity, [:target_node_name] do |_task, args|
+    inventory_hash = inventory_hash_from_inventory_file
+    target_nodes = find_targets(inventory_hash, args[:target_node_name])
+    if target_nodes.empty?
+      puts 'No targets found'
+      exit 0
+    end
+    check_connectivity?(inventory_hash, args[:target_node_name])
+  end
+
   # Install the puppet module under test on a collection of nodes
   #
   # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
@@ -366,23 +380,10 @@ namespace :litmus do
         # output test summary
         puts "Successful on #{success_list.size} nodes: #{success_list}" if success_list.any?
         puts "Failed on #{failure_list.size} nodes: #{failure_list}" if failure_list.any?
+        Rake::Task['litmus:check_connectivity'].invoke
         exit 1 if failure_list.any?
       end
 
-      # Run acceptance tests against all machines in the inventory file in serial.
-      desc 'Run tests in serial against all machines in the inventory file'
-      task :serial do
-        # Iterate over all of the acceptance test tasks and invoke them;
-        # We can rely on them always being in the format `litmus:acceptance:host_name:port`
-        # The host_name might be localhost or an IP or a DNS-resolvable node.
-        prefix = 'litmus:acceptance:'
-        tasks = Rake::Task.tasks.select { |task| task.name =~ %r{^#{prefix}.+:\d+$} }
-        tasks.each do |task|
-          puts "Running acceptance tests against #{task.name[prefix.length..-1]}"
-          task.invoke
-        end
-      end
-
       targets.each do |target|
         desc "Run serverspec against #{target}"
         next if target == 'litmus_localhost'

data/lib/puppet_litmus/spec_helper_acceptance.rb

@@ -9,6 +9,7 @@ module PuppetLitmus
 
     RSpec.configure do |config|
       config.include PuppetLitmus
+      config.extend PuppetLitmus
     end
 
     if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
@@ -73,7 +74,9 @@ module PuppetLitmus
         set :os, family: 'windows'
         user = node_config.dig('winrm', 'user') unless node_config.dig('winrm', 'user').nil?
         pass = node_config.dig('winrm', 'password') unless node_config.dig('winrm', 'password').nil?
-        endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
+        endpoint = URI("http://#{ENV['TARGET_HOST']}")
+        endpoint.port = 5985 if endpoint.port == 80
+        endpoint.path = '/wsman'
 
         opts = {
           user: user,

data/lib/puppet_litmus/version.rb

@@ -2,5 +2,5 @@
 
 # version of this gem
 module PuppetLitmus
-  VERSION ||= '0.13.1'
+  VERSION ||= '0.14.0'
 end

data/spec/lib/puppet_litmus/puppet_helpers_spec.rb

@@ -122,10 +122,10 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     let(:local) { '/tmp' }
     let(:remote) { '/remote_tmp' }
     # Ignore rubocop because these hashes are representative of output from an external method and editing them leads to test failures.
-    # rubocop:disable SpaceInsideHashLiteralBraces, SpaceInsideBlockBraces, SpaceAroundOperators, LineLength, SpaceAfterComma
+    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
     let(:result_success) {[{'node'=>'some.host','target'=>'some.host','action'=>'upload','object'=>'C:\foo\bar.ps1','status'=>'success','result'=>{'_output'=>'Uploaded \'C:\foo\bar.ps1\' to \'some.host:C:\bar\''}}]}
     let(:result_failure) {[{'node'=>'some.host','target'=>'some.host','action'=>nil,'object'=>nil,'status'=>'failure','result'=>{'_error'=>{'kind'=>'puppetlabs.tasks/task_file_error','msg'=>'No such file or directory @ rb_sysopen - /nonexistant/file/path','details'=>{},'issue_code'=>'WRITE_ERROR'}}}]}
-    # rubocop:enable SpaceInsideHashLiteralBraces, SpaceInsideBlockBraces, SpaceAroundOperators, LineLength, SpaceAfterComma
+    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
     let(:inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'some.host', 'config' => { 'transport' => 'local' } }] }] } }
     let(:localhost_inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'litmus_localhost', 'config' => { 'transport' => 'local' } }] }] } }
 
@@ -228,11 +228,11 @@ RSpec.describe PuppetLitmus::PuppetHelpers do
     let(:params) { { 'action' => 'install', 'name' => 'foo' } }
     let(:config_data) { { 'modulepath' => File.join(Dir.pwd, 'spec', 'fixtures', 'modules') } }
     # Ignore rubocop because these hashes are representative of output from an external method and editing them leads to test failures.
-    # rubocop:disable SpaceInsideHashLiteralBraces, SpaceBeforeBlockBraces, SpaceInsideBlockBraces, SpaceAroundOperators, LineLength, SpaceAfterComma
+    # rubocop:disable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
     let(:result_unstructured_task_success){ [{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'success','result'=>{'_output'=>'SUCCESS!'}}]}
     let(:result_structured_task_success){ [{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::structured','status'=>'success','result'=>{'key1'=>'foo','key2'=>'bar'}}]}
     let(:result_failure) {[{'node'=>'some.host','target'=>'some.host','action'=>'task','object'=>'testtask::unstructured','status'=>'failure','result'=>{'_error'=>{'msg'=>'FAILURE!','kind'=>'puppetlabs.tasks/task-error','details'=>{'exitcode'=>123}}}}]}
-    # rubocop:enable SpaceInsideHashLiteralBraces, SpaceBeforeBlockBraces, SpaceInsideBlockBraces, SpaceAroundOperators, LineLength, SpaceAfterComma
+    # rubocop:enable Layout/SpaceInsideHashLiteralBraces, Layout/SpaceBeforeBlockBraces, Layout/SpaceInsideBlockBraces, Layout/SpaceAroundOperators, Metrics/LineLength, Layout/SpaceAfterComma
     let(:inventory_hash) { { 'groups' => [{ 'name' => 'local', 'nodes' => [{ 'name' => 'some.host', 'config' => { 'transport' => 'local' } }] }] } }
 
     it 'responds to bolt_run_task' do

data/spec/lib/puppet_litmus/rake_helper_spec.rb

@@ -78,6 +78,27 @@ RSpec.describe PuppetLitmus::RakeHelper do
     end
   end
 
+  context 'with check_connectivity' do
+    let(:inventory_hash) do
+      { 'groups' =>
+        [{ 'name' => 'ssh_nodes', 'nodes' =>
+          [{ 'name' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
+    end
+    let(:targets) { ['some.host'] }
+    let(:command) { 'cd .' }
+
+    it 'node available' do
+      allow(Open3).to receive(:capture3).with('cd .').and_return(['success', '', 0])
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(command, targets, config: nil, inventory: inventory_hash).and_return([{ 'target' => 'some.host', 'status' => 'success' }])
+      described_class.check_connectivity?(inventory_hash, nil)
+    end
+
+    it 'node unavailable' do
+      allow_any_instance_of(BoltSpec::Run).to receive(:run_command).with(command, targets, config: nil, inventory: inventory_hash).and_return([{ 'target' => 'some.host', 'status' => 'failure' }])
+      expect { described_class.check_connectivity?(inventory_hash, nil) }.to raise_error(RuntimeError, %r{Connectivity has failed on:})
+    end
+  end
+
   context 'with uninstall module' do
     let(:inventory_hash) do
       { 'groups' =>

data/spec/lib/puppet_litmus/rake_tasks_spec.rb

@@ -81,4 +81,15 @@ describe 'litmus rake tasks' do
       expect { Rake::Task['litmus:provision_list'].invoke('deet') }.to raise_error(%r{deet})
     end
   end
+
+  context 'with litmus:check_connectivity task' do
+    let(:inventory_hash) { { 'groups' => [{ 'name' => 'ssh_nodes', 'nodes' => [{ 'name' => 'some.host' }] }] } }
+
+    it 'happy path' do
+      stub_const('ENV', ENV.to_hash.merge('TARGET_HOST' => 'some.host'))
+      expect_any_instance_of(PuppetLitmus::InventoryManipulation).to receive(:inventory_hash_from_inventory_file).and_return(inventory_hash)
+      expect_any_instance_of(PuppetLitmus::RakeHelper).to receive(:check_connectivity?).with(inventory_hash, nil).and_return(true)
+      Rake::Task['litmus:check_connectivity'].invoke
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_litmus
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -163,18 +163,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Providing a simple command line tool for puppet content creators, to enable
   simple and complex test deployments.
 test_files:
-- spec/data/doot.tar.gz
-- spec/data/inventory.yaml
-- spec/data/jim.yaml
-- spec/lib/puppet_litmus/inventory_manipulation_spec.rb
-- spec/lib/puppet_litmus/puppet_helpers_spec.rb
-- spec/lib/puppet_litmus/rake_helper_spec.rb
+- spec/spec_helper.rb
 - spec/lib/puppet_litmus/rake_tasks_spec.rb
 - spec/lib/puppet_litmus/version_spec.rb
-- spec/spec_helper.rb
+- spec/lib/puppet_litmus/inventory_manipulation_spec.rb
+- spec/lib/puppet_litmus/rake_helper_spec.rb
+- spec/lib/puppet_litmus/puppet_helpers_spec.rb
+- spec/data/doot.tar.gz
+- spec/data/jim.yaml
+- spec/data/inventory.yaml