bolt 0.17.2 → 0.18.0

data/lib/bolt/puppetdb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bolt/error'
 require 'bolt/puppetdb/client'
 require 'bolt/puppetdb/config'

data/lib/bolt/puppetdb/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'uri'
 require 'httpclient'
@@ -41,11 +43,11 @@ module Bolt
           raise Bolt::PuppetDBError, "Failed to query PuppetDB: #{response.body}"
         else
           results = JSON.parse(response.body)
-          if results.first && !results.first.key?('certname')
-            fields = results.first.keys
+          if results&.first && !results.first&.key?('certname')
+            fields = results.first&.keys
             raise Bolt::PuppetDBError, "Query results did not contain a 'certname' field: got #{fields.join(', ')}"
           end
-          results.map { |result| result['certname'] }.uniq
+          results&.map { |result| result['certname'] }.uniq
         end
       end
 

data/lib/bolt/puppetdb/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Bolt

data/lib/bolt/result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'bolt/error'
 

data/lib/bolt/result_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bolt
   class ResultSet
     attr_reader :results

data/lib/bolt/target.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 require 'bolt/error'
 

data/lib/bolt/transport/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logging'
 
 module Bolt
@@ -53,7 +55,7 @@ module Bolt
       end
 
       def with_events(target, callback)
-        callback.call(type: :node_start, target: target) if callback
+        callback&.call(type: :node_start, target: target)
 
         result = begin
           yield
@@ -61,7 +63,7 @@ module Bolt
           Bolt::Result.from_exception(target, ex)
         end
 
-        callback.call(type: :node_result, result: result) if callback
+        callback&.call(type: :node_result, result: result)
         result
       end
 

data/lib/bolt/transport/local.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'fileutils'
 require 'tmpdir'

data/lib/bolt/transport/local/shell.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 require 'bolt/node/output'
 

data/lib/bolt/transport/orch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 require 'concurrent'
 require 'json'
@@ -122,7 +124,7 @@ module Bolt
           end
         end
         results.each do |result|
-          callback.call(type: :node_result, result: result) if callback
+          callback&.call(type: :node_result, result: result)
         end
       end
 

data/lib/bolt/transport/ssh.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bolt/node/errors'
 require 'bolt/transport/base'
 require 'json'
@@ -57,7 +59,7 @@ module Bolt
         yield conn
       ensure
         begin
-          conn.disconnect if conn
+          conn&.disconnect
         rescue StandardError => ex
           logger.info("Failed to close connection to #{target.uri} : #{ex.message}")
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logging'
 require 'shellwords'
 require 'bolt/node/errors'
@@ -274,7 +276,7 @@ module Bolt
           dir = make_tempdir
           yield dir
         ensure
-          dir.delete if dir
+          dir&.delete
         end
 
         def write_remote_executable(dir, file, filename = nil)

data/lib/bolt/transport/winrm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bolt/transport/base'
 
 module Bolt
@@ -8,7 +10,7 @@ module Bolt
       ].freeze
 
       def self.options
-        %w[port user password connect-timeout ssl tmpdir cacert extensions]
+        %w[port user password connect-timeout ssl ssl-verify tmpdir cacert extensions]
       end
 
       def self.validate(options)
@@ -17,6 +19,11 @@ module Bolt
           raise Bolt::CLIError, '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'
+        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}"
@@ -36,7 +43,7 @@ module Bolt
         yield conn
       ensure
         begin
-          conn.disconnect if conn
+          conn&.disconnect
         rescue StandardError => ex
           logger.info("Failed to close connection to #{target.uri} : #{ex.message}")
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bolt/node/errors'
 require 'bolt/node/output'
 
@@ -40,7 +42,8 @@ module Bolt
                       password: target.password,
                       retry_limit: 1,
                       transport: transport,
-                      ca_trust_path: target.options['cacert'] }
+                      ca_trust_path: target.options['cacert'],
+                      no_ssl_peer_verification: !target.options['ssl-verify'] }
 
           Timeout.timeout(target.options['connect-timeout']) do
             @connection = ::WinRM::Connection.new(options)
@@ -72,6 +75,11 @@ module Bolt
           if target.options['ssl'] && @port == HTTP_PORT
             theres_your_problem = "\nAre you using SSL to connect to a non-SSL port?"
           end
+          if target.options['ssl-verify'] && e.message.include?('certificate verify failed')
+            theres_your_problem = "\nIs the remote host using a self-signed SSL"\
+                                  "certificate? Use --no-ssl-verify to disable "\
+                                  "remote host SSL verification."
+          end
           raise Bolt::Node::ConnectError.new(
             "Failed to connect to #{endpoint}: #{e.message}#{theres_your_problem}",
             "CONNECT_ERROR"
@@ -84,7 +92,7 @@ module Bolt
         end
 
         def disconnect
-          @session.close if @session
+          @session&.close
           @logger.debug { "Closed session" }
         end
 
@@ -377,7 +385,7 @@ PS
           @shell_initialized = true
         end
 
-        def execute(command, _ = {})
+        def execute(command)
           result_output = Bolt::Node::Output.new
 
           @logger.debug { "Executing command: #{command}" }

data/lib/bolt/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bolt
   module Util
     # CODEREVIEW I hate mixing in random modules
@@ -15,17 +17,11 @@ module Bolt
         end
 
         path = File.expand_path(path)
-        # safe_load doesn't work with psych in ruby 2.0
-        # The user controls the configfile so this isn't a problem
-        # rubocop:disable YAMLLoad
-        File.open(path, "r:UTF-8") { |f| YAML.load(f.read) }
+        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}"
         end
-      # In older releases of psych SyntaxError is not a subclass of Exception
-      rescue Psych::SyntaxError
-        raise Bolt::CLIError, "Could not parse #{file_name} file: #{path}"
       rescue Psych::Exception
         raise Bolt::CLIError, "Could not parse #{file_name} file: #{path}"
       rescue IOError, SystemCallError
@@ -43,6 +39,12 @@ module Bolt
         hash1.merge(hash2, &recursive_merge)
       end
 
+      def map_vals(hash)
+        hash.each_with_object({}) do |(k, v), acc|
+          acc[k] = yield(v)
+        end
+      end
+
       # Accepts a Data object and returns a copy with all hash keys
       # modifed by block. use &:to_s to stringify keys or :to_sym to symbolize them
       def walk_keys(data, &block)

data/lib/bolt/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bolt
-  VERSION = '0.17.2'.freeze
+  VERSION = '0.18.0'
 end

data/lib/bolt_ext/puppetdb_inventory.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bolt/puppetdb/config'
 require 'json'
@@ -99,11 +100,11 @@ query results.
           puts result
         end
 
-        return 0
+        0
       rescue StandardError => e
         puts "Error: #{e}"
         puts e.backtrace if @trace
-        return 1
+        1
       end
 
       def resolve_group(group)

data/modules/aggregate/lib/puppet/functions/aggregate/count.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Aggregates the key/value pairs in the results of a ResultSet into a hash
 # mapping the keys to a hash of each distinct value and how many nodes returned
 # that value for the key.

data/modules/aggregate/lib/puppet/functions/aggregate/nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Aggregates the key/value pairs in the results of a ResultSet into a hash
 # mapping the keys to a hash of each distinct value and the list of nodes
 # returning that value for the key.

data/modules/canary/lib/puppet/functions/canary/merge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Merges two ResultSets into a new ResultSet
 Puppet::Functions.create_function(:'canary::merge') do
   dispatch :merge_results do

data/modules/canary/lib/puppet/functions/canary/random_split.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Splits an array into two groups, where the 1st group is a randomly selected
 # sample of the input (of the specified size) and the 2nd group is the remainder.
 #

data/modules/canary/lib/puppet/functions/canary/skip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Returns a ResultSet with canary/skipped-node errors for each Target provided.
 #
 # This function takes a single parameter:

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: logging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: win32-dir
   requirement: !ruby/object:Gem::Requirement
@@ -255,33 +255,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.8
 - !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +322,8 @@ files:
 - bolt-modules/boltlib/lib/puppet/datatypes/result.rb
 - bolt-modules/boltlib/lib/puppet/datatypes/resultset.rb
 - bolt-modules/boltlib/lib/puppet/datatypes/target.rb
+- bolt-modules/boltlib/lib/puppet/functions/add_facts.rb
+- bolt-modules/boltlib/lib/puppet/functions/facts.rb
 - bolt-modules/boltlib/lib/puppet/functions/fail_plan.rb
 - bolt-modules/boltlib/lib/puppet/functions/file_upload.rb
 - bolt-modules/boltlib/lib/puppet/functions/get_targets.rb
@@ -1622,7 +1624,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="