bolt 2.38.0 → 2.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e89c3fc601a61c1da47fe1f0c7773d54643738e959c297f34e5fe4096ef2b5
-  data.tar.gz: 0edc4e35b500bb08315ef5d6064563d7dad0cbaecd88d3aac03dc4cf43572b33
+  metadata.gz: 7cdc44f8a923197b1dbb6a51f9dd524f0fe10f8ceb5acc9ca97dc62f7c4b37d5
+  data.tar.gz: d2be21d9601d415b808d1a5f282e31e048be914a71e21bba340be4caf4f8a896
 SHA512:
-  metadata.gz: f2d3a5675a1560203dc0236cdd7b5a9367728b6b1decdfc85a99136488ab2ed1a10bc492996b2aa5b2681fdba8f2029f9e092a3011d8be4d5bfb2395358ffb6a
-  data.tar.gz: 79b4418d6628573320b1db7740d8196ddb73f55d93f299a68a3c5f436c5986fc9382e48bd5d2e14903d18e3bf648b47493041a9ad0196983e1fb7a06ff9cf4bd
+  metadata.gz: d6ca1c1bfd4c6fd6b891d006040c13b0897a44ec9904511e7e57f9eb5b2fd0d85dd2bd1371b226f488595ae2847764591754d6db4b50eaf8328fd2aeecce7ebb
+  data.tar.gz: 077f5217b308db31a118dc21884b65b15112bb9b6922a468ea5658c803e1851df4520aabc71fcdeb4f982dfc7c09955629564b600c2fadcf2d14d4b7e24631f6

data/lib/bolt/config.rb

@@ -448,39 +448,14 @@ module Bolt
         next if val == 'disable'
 
         name = normalize_log(key)
+        acc[name] = val.slice('append', 'level').transform_keys(&:to_sym)
 
-        # But otherwise it has to be a Hash
-        unless val.is_a?(Hash)
-          raise Bolt::ValidationError,
-                "config of log #{name} must be a Hash, received #{val.class} #{val.inspect}"
-        end
-
-        acc[name] = val.slice('append', 'level')
-                       .transform_keys(&:to_sym)
-
-        if (v = acc[name][:level])
-          unless v.is_a?(String) || v.is_a?(Symbol)
-            raise Bolt::ValidationError,
-                  "level of log #{name} must be a String or Symbol, received #{v.class} #{v.inspect}"
-          end
-
-          unless Bolt::Logger.valid_level?(v)
-            raise Bolt::ValidationError,
-                  "level of log #{name} must be one of #{Bolt::Logger.levels.join(', ')}; received #{v}"
-          end
+        next unless acc[name][:level] == 'notice'
 
-          if v == 'notice'
-            @deprecations << {
-              type: 'notice log level',
-              msg:  "Log level 'notice' is deprecated and will be removed in Bolt 3.0. Use 'info' instead."
-            }
-          end
-        end
-
-        if (v = acc[name][:append]) && v != true && v != false
-          raise Bolt::ValidationError,
-                "append flag of log #{name} must be a Boolean, received #{v.class} #{v.inspect}"
-        end
+        @deprecations << {
+          type: 'notice log level',
+          msg:  "Log level 'notice' is deprecated and will be removed in Bolt 3.0. Use 'info' instead."
+        }
       end
     end
 
@@ -509,10 +484,6 @@ module Bolt
         Bolt::Util.validate_file('inventory file', default_inventoryfile)
       end
 
-      unless TRANSPORT_CONFIG.include?(transport)
-        raise UnknownTransportError, transport
-      end
-
       # Warn the user how they should be using the 'puppetfile' or
       # 'module-install' config options. We don't error here since these
       # settings can be set at the user or system level.

data/lib/bolt/config/options.rb

@@ -509,6 +509,7 @@ module Bolt
         "remote" => {
           description: "A map of configuration options for the remote transport.",
           type: Hash,
+          additionalProperties: true,
           _plugin: true,
           _example: { "run-on" => "proxy_target" }
         },

data/lib/bolt/config/transport/options.rb

@@ -143,7 +143,8 @@ module Bolt
                          "`task.py`) and the extension is case sensitive. When a target's name is `localhost`, "\
                          "Ruby tasks run with the Bolt Ruby interpreter by default.",
             additionalProperties: {
-              type: String
+              type: String,
+              _plugin: false
             },
             propertyNames: {
               pattern: "^.?[a-zA-Z0-9]+$"

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

@@ -111,11 +111,6 @@ module Bolt
             @config['interpreters'] = normalize_interpreters(@config['interpreters'])
           end
 
-          if @config['login-shell'] && !LOGIN_SHELLS.include?(@config['login-shell'])
-            raise Bolt::ValidationError,
-                  "Unsupported login-shell #{@config['login-shell']}. Supported shells are #{LOGIN_SHELLS.join(', ')}"
-          end
-
           if @config['login-shell'] == 'powershell'
             %w[tty run-as].each do |key|
               if @config[key]

data/lib/bolt/inventory/group.rb

@@ -254,14 +254,6 @@ module Bolt
           msg = "Found unexpected key(s) #{unexpected_keys.join(', ')} in group #{@name}"
           @logger.warn(msg)
         end
-
-        Bolt::Util.walk_keys(input) do |key|
-          if @plugins.reference?(key)
-            raise ValidationError.new("Group keys cannot be specified as _plugin references", @name)
-          else
-            key
-          end
-        end
       end
 
       def validate(used_group_names = Set.new, used_target_names = Set.new, used_aliases = {})

data/lib/bolt/plugin/cache.rb

@@ -21,7 +21,7 @@ module Bolt
 
         # Luckily we don't need to use a serious hash algorithm
         require 'digest/bubblebabble'
-        r = reference.select { |k, _| k == '_cache' }.sort.to_s
+        r = reference.reject { |k, _| k == '_cache' }.sort.to_s
         @id = Digest::SHA2.bubblebabble(r)[0..20]
 
         unmodified = true

data/lib/bolt/validator.rb

@@ -47,17 +47,18 @@ module Bolt
     # the value's type, the value is passed off to an individual
     # validation method for the value's type.
     #
-    private def validate_value(value, definition)
-      definition = @schema.dig(:definitions, definition[:_ref]) if definition[:_ref]
+    private def validate_value(value, definition, plugin_supported = false)
+      definition       = @schema.dig(:definitions, definition[:_ref]) if definition[:_ref]
+      plugin_supported = definition[:_plugin] if definition.key?(:_plugin)
 
-      return if plugin_reference?(value, definition)
+      return if plugin_reference?(value, plugin_supported)
       return unless valid_type?(value, definition)
 
       case value
       when Hash
-        validate_hash(value, definition)
+        validate_hash(value, definition, plugin_supported)
       when Array
-        validate_array(value, definition)
+        validate_array(value, definition, plugin_supported)
       when String
         validate_string(value, definition)
       when Numeric
@@ -69,7 +70,7 @@ module Bolt
     # This will enumerate each key-value pair in the hash and validate each
     # value individually.
     #
-    private def validate_hash(value, definition)
+    private def validate_hash(value, definition, plugin_supported)
       properties = definition[:properties] ? definition[:properties].keys : []
 
       if definition[:properties] && definition[:additionalProperties].nil?
@@ -86,9 +87,9 @@ module Bolt
 
         if properties.include?(key)
           check_deprecated(key, definition[:properties][key])
-          validate_value(val, definition[:properties][key])
-        elsif definition[:additionalProperties]
-          validate_value(val, definition[:additionalProperties])
+          validate_value(val, definition[:properties][key], plugin_supported)
+        elsif definition[:additionalProperties].is_a?(Hash)
+          validate_value(val, definition[:additionalProperties], plugin_supported)
         end
       ensure
         @path.pop
@@ -99,7 +100,7 @@ module Bolt
     # This will enumerate the items in the array and validate each item
     # individually.
     #
-    private def validate_array(value, definition)
+    private def validate_array(value, definition, plugin_supported)
       if definition[:uniqueItems] && value.size != value.uniq.size
         @errors << "Value at '#{path}' must not include duplicate elements"
         return
@@ -109,7 +110,7 @@ module Bolt
 
       value.each_with_index do |item, index|
         @path.push(index)
-        validate_value(item, definition[:items])
+        validate_value(item, definition[:items], plugin_supported)
       ensure
         @path.pop
       end
@@ -168,9 +169,9 @@ module Bolt
     # plugin reference but cannot be one according to the schema, then this will
     # log an error.
     #
-    private def plugin_reference?(value, definition)
+    private def plugin_reference?(value, plugin_supported)
       if value.is_a?(Hash) && value.key?('_plugin')
-        unless definition[:_plugin]
+        unless plugin_supported
           @errors << "Value at '#{path}' is a plugin reference, which is unsupported at "\
                       "this location"
         end

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 2.38.0
+  version: 2.40.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -626,7 +626,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM