bolt 0.20.2 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39bf1a34b5705fc648c41ca2f722631fc9f0c556
-  data.tar.gz: f401ef340be9a8acb42b9e54547b2560679784da
+  metadata.gz: 607e97f4d7609e2927f6e055baec22293cefb698
+  data.tar.gz: 7481be4e30655f46ee4908fb735dbcdc6de2383f
 SHA512:
-  metadata.gz: 9206ab261f57b68900ed68d3f6d492fde9935b4c232546fbc762a6a6bc80bc1e9b5c011a1d98312c8f4336525dd549f232c50c3d3e823a0709c6a5855976cfca
-  data.tar.gz: f9b91fa75d5ffe98d10bf21aeda2c86ce62a48af7fbaff18dabc784d9ffbed63af9c64ead474777eee1a32485815d7b68c930551979cbd2df94cb74f6bd9209b
+  metadata.gz: 82322ab31eaeddbc94d4d50ec10dd494c107de3837e3eaaee1ce727827133a921f92fe794585fc2e9f79126afc4f9a344e7eaffbd23987f55ff8b88340ddb84f
+  data.tar.gz: 1a7918248d6319a32fe7ca5daa73b6c506ea15d5cb66f733f6f562038ffeb228115f725d01e3fdce5a30a3bec20abe02e3ad0f35288d8001995fe801b62a4a8b

data/bolt-modules/boltlib/lib/puppet/functions/puppetdb_fact.rb

@@ -29,10 +29,6 @@ Puppet::Functions.create_function(:puppetdb_fact) do
       )
     end
 
-    begin
-      puppetdb_client.facts_for_node(certnames)
-    rescue StandardError => e
-      raise Bolt::CLIError, "Could not retrieve targets from PuppetDB: #{e}"
-    end
+    puppetdb_client.facts_for_node(certnames)
   end
 end

data/lib/bolt/cli.rb

@@ -307,7 +307,7 @@ Available options are:
       def read_arg_file(file)
         File.read(file)
       rescue StandardError => err
-        raise Bolt::CLIError, "Error attempting to read #{file}: #{err}"
+        raise Bolt::FileError.new("Error attempting to read #{file}: #{err}", file)
       end
     end
 
@@ -481,8 +481,6 @@ Available options are:
 
     def query_puppetdb_nodes(query)
       puppetdb_client.query_certnames(query)
-    rescue StandardError => e
-      raise Bolt::CLIError, "Could not retrieve targets from PuppetDB: #{e}"
     end
 
     def execute(options)
@@ -618,12 +616,12 @@ Available options are:
       stat = file_stat(path)
 
       if !stat.readable?
-        raise Bolt::CLIError, "The #{type} '#{path}' is unreadable"
+        raise Bolt::FileError.new("The #{type} '#{path}' is unreadable", path)
       elsif !stat.file?
-        raise Bolt::CLIError, "The #{type} '#{path}' is not a file"
+        raise Bolt::FileError.new("The #{type} '#{path}' is not a file", path)
       end
     rescue Errno::ENOENT
-      raise Bolt::CLIError, "The #{type} '#{path}' does not exist"
+      raise Bolt::FileError.new("The #{type} '#{path}' does not exist", path)
     end
 
     def file_stat(path)

data/lib/bolt/config.rb

@@ -200,16 +200,16 @@ module Bolt
     def validate
       self[:log].each_pair do |name, params|
         if params.key?(:level) && !Bolt::Logger.valid_level?(params[:level])
-          raise Bolt::CLIError,
+          raise Bolt::ValidationError,
                 "level of log #{name} must be one of: #{Bolt::Logger.levels.join(', ')}; received #{params[:level]}"
         end
         if params.key?(:append) && params[:append] != true && params[:append] != false
-          raise Bolt::CLIError, "append flag of log #{name} must be a Boolean, received #{params[:append]}"
+          raise Bolt::ValidationError, "append flag of log #{name} must be a Boolean, received #{params[:append]}"
         end
       end
 
       unless %w[human json].include? self[:format]
-        raise Bolt::CLIError, "Unsupported format: '#{self[:format]}'"
+        raise Bolt::ValidationError, "Unsupported format: '#{self[:format]}'"
       end
 
       unless self[:transport].nil? || Bolt::TRANSPORTS.include?(self[:transport].to_sym)

data/lib/bolt/error.rb

@@ -64,6 +64,7 @@ module Bolt
     end
   end
 
+  # This class is used to treat a Puppet Error datatype as a ruby error outside PAL
   class PuppetError < Error
     def self.from_error(err)
       new(err.msg, err.kind, err.details, err.issue_code)
@@ -78,4 +79,16 @@ module Bolt
               'result_string' => result_str })
     end
   end
+
+  class ValidationError < Bolt::Error
+    def initialize(msg)
+      super(msg, 'bolt.transport/validation-error')
+    end
+  end
+
+  class FileError < Bolt::Error
+    def initialize(msg, path)
+      super(msg, 'bolt/file-error', { "path" => path })
+    end
+  end
 end

data/lib/bolt/executor.rb

@@ -27,7 +27,7 @@ module Bolt
 
       @noop = noop
       @run_as = nil
-      @pool = Concurrent::CachedThreadPool.new(max_threads: @config[:concurrency])
+      @pool = Concurrent::ThreadPoolExecutor.new(max_threads: @config[:concurrency])
       @logger.debug { "Started with #{@config[:concurrency]} max thread(s)" }
       @notifier = Bolt::Notifier.new
     end

data/lib/bolt/inventory.rb

@@ -45,7 +45,7 @@ module Bolt
         begin
           data = YAML.safe_load(ENV[ENVIRONMENT_VAR])
         rescue Psych::Exception
-          raise Bolt::CLIError, "Could not parse inventory from $#{ENVIRONMENT_VAR}"
+          raise Bolt::Error.new("Could not parse inventory from $#{ENVIRONMENT_VAR}", 'bolt/parse-error')
         end
       else
         data = Bolt::Util.read_config_file(config[:inventoryfile], default_paths, 'inventory')

data/lib/bolt/logger.rb

@@ -56,7 +56,7 @@ module Bolt
               level: default_level
             )
           rescue ArgumentError => e
-            raise Bolt::CLIError, "Failed to open log #{name}: #{e.message}"
+            raise Bolt::Error.new("Failed to open log #{name}: #{e.message}", 'bolt/log-error')
           end
 
           root_logger.add_appenders appender

data/lib/bolt/outputter/human.rb

@@ -161,22 +161,12 @@ module Bolt
         @stream.puts(plan_info)
       end
 
-      # @param [Hash] A hash representing the plan result
-      def print_plan_result(result)
-        if result.nil?
+      # @param [Bolt::PlanResult] A PlanResult object
+      def print_plan_result(plan_result)
+        if plan_result.value.nil?
           @stream.puts("Plan completed successfully with no result")
-        # Otherwise if object has a json representation display it
-        elsif result.respond_to?(:to_json)
-          # Guard against to_json methods that don't accept options
-          # and don't print empty results on multiple lines
-          if result.method(:to_json).arity == 0 ||
-             (result.respond_to?(:empty?) && result.empty?)
-            @stream.puts(result.to_json)
-          else
-            @stream.puts(::JSON.pretty_generate(result, quirks_mode: true))
-          end
         else
-          @stream.puts result.to_s
+          @stream.puts(::JSON.pretty_generate(plan_result, quirks_mode: true))
         end
       end
 

data/lib/bolt/pal.rb

@@ -9,6 +9,31 @@ module Bolt
     BOLTLIB_PATH = File.join(__FILE__, '../../../bolt-modules')
     MODULES_PATH = File.join(__FILE__, '../../../modules')
 
+    # PALError is used to convert errors from executing puppet code into
+    # Bolt::Errors
+    class PALError < Bolt::Error
+      # Puppet sometimes rescues exceptions notes the location and reraises.
+      # Return the original error.
+      def self.from_preformatted_error(err)
+        if err.cause&.is_a? Bolt::Error
+          err.cause
+        else
+          from_error(err.cause || err)
+        end
+      end
+
+      # Generate a Bolt::Pal::PALError for non-bolt errors
+      def self.from_error(err)
+        e = new(err.message)
+        e.set_backtrace(err.backtrace)
+        e
+      end
+
+      def initialize(msg)
+        super(msg, 'bolt/pal-error')
+      end
+    end
+
     def initialize(config)
       # Nothing works without initialized this global state. Reinitializing
       # is safe and in practice only happen in tests
@@ -40,7 +65,7 @@ module Bolt
       begin
         require_relative '../../vendored/require_vendored'
       rescue LoadError
-        raise Bolt::CLIError, "Puppet must be installed to execute tasks"
+        raise Bolt::Error.new("Puppet must be installed to execute tasks", "bolt/puppet-missing")
       end
 
       require 'bolt/pal/logging'
@@ -72,25 +97,9 @@ module Bolt
           begin
             yield compiler
           rescue Puppet::PreformattedError => err
-            # Puppet sometimes rescues exceptions notes the location and reraises.
-            # Return the original error.
-            if err.cause
-              if err.cause.is_a? Bolt::Error
-                err.cause
-              else
-                e = Bolt::CLIError.new(err.cause.message)
-                e.set_backtrace(err.cause.backtrace)
-                e
-              end
-            else
-              e = Bolt::CLIError.new(err.message)
-              e.set_backtrace(err.backtrace)
-              e
-            end
+            PALError.from_preformatted_error(err)
           rescue StandardError => err
-            e = Bolt::CLIError.new(err.message)
-            e.set_backtrace(err.backtrace)
-            e
+            PALError.from_preformatted_error(err)
           end
         end
       end
@@ -188,7 +197,7 @@ module Bolt
       end
 
       if task.nil?
-        raise Bolt::CLIError, Bolt::Error.unknown_task(task_name)
+        raise Bolt::Error.new(Bolt::Error.unknown_task(task_name), 'bolt/unknown-task')
       end
 
       task.task_hash
@@ -222,7 +231,7 @@ module Bolt
       end
 
       if plan_info.nil?
-        raise Bolt::CLIError, Bolt::Error.unknown_plan(plan_name)
+        raise Bolt::Error.new(Bolt::Error.unknown_plan(plan_name), 'bolt/unknown-plan')
       end
       plan_info
     end

data/lib/bolt/transport/orch.rb

@@ -25,7 +25,7 @@ module Bolt
       def self.validate(options)
         validation_flag = options['local-validation']
         unless !!validation_flag == validation_flag
-          raise Bolt::CLIError, 'local-validation option must be a Boolean true or false'
+          raise Bolt::ValidationError, 'local-validation option must be a Boolean true or false'
         end
       end
 

data/lib/bolt/transport/orch/connection.rb

@@ -23,11 +23,11 @@ module Bolt
           client_opts = client_keys.each_with_object({}) do |k, acc|
             acc[k] = opts[k] if opts.include?(k)
           end
+          client_opts['User-Agent'] = "Bolt/#{VERSION}"
           logger.debug("Creating orchestrator client for #{client_opts}")
 
           @client = OrchestratorClient.new(client_opts, true)
           @plan_job = start_plan(plan_context)
-
           @environment = opts["task-environment"]
         end
 

data/lib/bolt/transport/ssh.rb

@@ -22,12 +22,12 @@ module Bolt
 
         host_key = options['host-key-check']
         unless !!host_key == host_key
-          raise Bolt::CLIError, 'host-key-check option must be a Boolean true or false'
+          raise Bolt::ValidationError, 'host-key-check option must be a Boolean true or false'
         end
 
         if (key_opt = options['private-key'])
           unless key_opt.instance_of?(String) || (key_opt.instance_of?(Hash) && key_opt.include?('key-data'))
-            raise Bolt::CLIError,
+            raise Bolt::ValidationError,
                   "private-key option must be the path to a private key file or a hash containing the 'key-data'"
           end
         end
@@ -35,7 +35,7 @@ module Bolt
         timeout_value = options['connect-timeout']
         unless timeout_value.is_a?(Integer) || timeout_value.nil?
           error_msg = "connect-timeout value must be an Integer, received #{timeout_value}:#{timeout_value.class}"
-          raise Bolt::CLIError, error_msg
+          raise Bolt::ValidationError, error_msg
         end
       end
 

data/lib/bolt/transport/winrm.rb

@@ -16,18 +16,18 @@ module Bolt
       def self.validate(options)
         ssl_flag = options['ssl']
         unless !!ssl_flag == ssl_flag
-          raise Bolt::CLIError, 'ssl option must be a Boolean true or false'
+          raise Bolt::ValidationError, 'ssl option must be a Boolean true or false'
         end
 
         ssl_verify_flag = options['ssl-verify']
         unless !!ssl_verify_flag == ssl_verify_flag
-          raise Bolt::CLIError, 'ssl-verify option must be a Boolean true or false'
+          raise Bolt::ValidationError, 'ssl-verify option must be a Boolean true or false'
         end
 
         timeout_value = options['connect-timeout']
         unless timeout_value.is_a?(Integer) || timeout_value.nil?
           error_msg = "connect-timeout value must be an Integer, received #{timeout_value}:#{timeout_value.class}"
-          raise Bolt::CLIError, error_msg
+          raise Bolt::ValidationError, error_msg
         end
       end
 

data/lib/bolt/util.rb

@@ -20,12 +20,12 @@ module Bolt
         File.open(path, "r:UTF-8") { |f| YAML.safe_load(f.read) }
       rescue Errno::ENOENT
         if path_passed
-          raise Bolt::CLIError, "Could not read #{file_name} file: #{path}"
+          raise Bolt::FileError.new("Could not read #{file_name} file: #{path}", path)
         end
       rescue Psych::Exception
-        raise Bolt::CLIError, "Could not parse #{file_name} file: #{path}"
+        raise Bolt::FileError.new("Could not parse #{file_name} file: #{path}", path)
       rescue IOError, SystemCallError
-        raise Bolt::CLIError, "Could not read #{file_name} file: #{path}"
+        raise Bolt::FileError.new("Could not read #{file_name} file: #{path}", path)
       end
 
       def deep_merge(hash1, hash2)

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '0.20.2'
+  VERSION = '0.20.3'
 end

data/modules/facts/tasks/bash.sh

@@ -29,6 +29,24 @@ if [ -z "${name}" ]; then
     fi
 fi
 
+# if lsb not available try os-release
+if [ -z "${name}" ]; then
+    if [ -e /etc/os-release ]; then
+        name=$(grep "^NAME" /etc/os-release | cut -d'=' -f2 | sed "s/\"//g")
+        release=$(grep "^VERSION_ID" /etc/os-release | cut -d'=' -f2 | sed "s/\"//g")
+    elif [-e /usr/lib/os-release ]; then
+        name=$(grep "^NAME" /usr/lib/os-release | cut -d'=' -f2 | sed "s/\"//g")
+        release=$(grep "^VERSION_ID" /usr/lib/os-release | cut -d'=' -f2 | sed "s/\"//g")
+    fi
+    if [ -n "${name}" ]; then
+        if echo "${name}" | egrep -iq "(.*red)(.*hat)"; then
+            name="RedHat"
+        elif echo "${name}" | egrep -iq "debian"; then
+            name="Debian"
+        fi
+    fi
+fi
+
 if [ -z "${name}" ]; then
     name=$(uname)
     release=$(uname -r)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable