bolt 1.38.0 → 1.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56eab83c9278b21bfe1241b6fcbbfac9a06adc976d77a7d5900a4940393ea5cd
-  data.tar.gz: c1389de9cad81f4f8ba9b2af9b3aa74bffdbc92e0f9c88ae6f018e7fa43ded1a
+  metadata.gz: 99b27a1cfbd744e85a99efe9c4785b4ab3a15e9a6fe15af9ac0496bd463736c7
+  data.tar.gz: 530cbd2525700cdaebf9920aebf1ea3b104a2867dfb030a695e0046e162152a2
 SHA512:
-  metadata.gz: 104b2eda64ad81d4fc6bbf054309498866b6e8f3e256f455c06b19bb5a2c6e50192dc2c480ffa7c885e2afb2bebc0648e5feb295f22f7a9cc6b5f250b548ea22
-  data.tar.gz: 6115db7ac02b54224e346d12c2bd2fa98d6eee3031b4ae5093f89d0c2883e000cccb63428ace63b6e9a6ed173afafe327274b0b829109c9d3bd1c6fd75b9f699
+  metadata.gz: cf7e5a175d04bf27ad2e2e0b4e464f334be20e4d08e9f0d072a51da695eb00698623eada2153865ec68fe125ace42e4c4939a5ef24513ec9139b1d87d302a6b0
+  data.tar.gz: fedbec2378ba33c83b3cbbb1fce8e3a610c2dbbe66c200ddc72f2e6728b49a2f38a7f60ecebbc4ebb0959227d4402175108ad0da5d15220b3ddc91b52d5ae725

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

@@ -32,6 +32,9 @@ Puppet::Functions.create_function(:resolve_references) do
         )
     end
 
+    executor = Puppet.lookup(:bolt_executor)
+    executor.report_function_call(self.class.name)
+
     plugins = Puppet.lookup(:bolt_inventory).plugins
     plugins.resolve_references(references)
   end

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

@@ -80,11 +80,14 @@ Puppet::Functions.create_function(:run_task) do
         raise Bolt::Error.unknown_task(task_name)
       end
 
+      task = Bolt::Task.new(task_signature.task_hash)
+
+      # Set the default value for any params that have one and were not provided
+      params = task.parameter_defaults.merge(params)
+
       task_signature.runnable_with?(params) do |mismatch_message|
         raise with_stack(:TYPE_MISMATCH, mismatch_message)
       end || (raise with_stack(:TYPE_MISMATCH, 'Task parameters do not match'))
-
-      task = Bolt::Task.new(task_signature.task_hash)
     end
 
     unless Puppet::Pops::Types::TypeFactory.data.instance?(params)

data/lib/bolt/applicator.rb

@@ -156,7 +156,7 @@ module Bolt
       end
 
       # collect plan vars and merge them over target vars
-      plan_vars = scope.to_hash
+      plan_vars = scope.to_hash(true, true)
       %w[trusted server_facts facts].each { |k| plan_vars.delete(k) }
 
       targets = @inventory.get_targets(args[0])

data/lib/bolt/cli.rb

@@ -99,9 +99,12 @@ module Bolt
                   "option or param=value pairs, not both"
           end
           options[:params_parsed] = true
-        else
+        elsif task_options.any?
           options[:params_parsed] = false
           options[:task_options] = Hash[task_options.map { |a| a.split('=', 2) }]
+        else
+          options[:params_parsed] = true
+          options[:task_options] = {}
         end
       end
       options[:leftovers] = remaining

data/lib/bolt/inventory/group2.rb

@@ -108,6 +108,10 @@ module Bolt
           raise ValidationError.new("No name or uri for target: #{target}", @name)
         end
 
+        unless t_name.is_a? String
+          raise ValidationError.new("Target name must be a String, not #{t_name.class}", @name)
+        end
+
         unless t_name.ascii_only?
           raise ValidationError.new("Target name must be ASCII characters: #{target}", @name)
         end
@@ -153,6 +157,10 @@ module Bolt
         end
       end
 
+      def clear_alia(target_name)
+        @aliases.reject! { |_alias, name| name == target_name }
+      end
+
       def data_merge(data1, data2)
         if data2.nil? || data1.nil?
           return data2 || data1
@@ -162,7 +170,8 @@ module Bolt
           'config' => Bolt::Util.deep_merge(data1['config'], data2['config']),
           'name' => data1['name'] || data2['name'],
           'uri' => data1['uri'] || data2['uri'],
-          'alias' => data1['alias'] || data2['alias'],
+          # Collect all aliases across all groups for each target uri
+          'alias' => [*data1['alias'], *data2['alias']],
           # Shallow merge instead of deep merge so that vars with a hash value
           # are assigned a new hash, rather than merging the existing value
           # with the value meant to replace it

data/lib/bolt/inventory/inventory2.rb

@@ -173,10 +173,12 @@ module Bolt
         existing_target = @targets.key?(new_target.name)
         @targets[new_target.name] = new_target
 
-        unless existing_target
+        if existing_target
+          clear_alia_from_group(@groups, new_target.name)
+        else
           add_to_group([new_target], 'all')
         end
-        # Insert target alias into groups that contain the target
+
         if (aliases = new_target.target_alias)
           aliases = [aliases] if aliases.is_a?(String)
           unless aliases.is_a?(Array)
@@ -184,18 +186,18 @@ module Bolt
             raise ValidationError.new(msg, @name)
           end
 
-          insert_alias_into_group(@groups, new_target.name, aliases)
+          @groups.insert_alia(new_target.name, aliases)
         end
 
         new_target
       end
 
-      def insert_alias_into_group(group, target_name, aliases)
+      def clear_alia_from_group(group, target_name)
         if group.all_target_names.include?(target_name)
-          group.insert_alia(target_name, aliases)
+          group.clear_alia(target_name)
         end
         group.groups.each do |grp|
-          insert_alias_into_group(grp, target_name, aliases)
+          clear_alia_from_group(grp, target_name)
         end
       end
 

data/lib/bolt/outputter/human.rb

@@ -223,6 +223,7 @@ module Bolt
 
         task['metadata']['parameters']&.each do |k, v|
           pretty_params << "- #{k}: #{v['type'] || 'Any'}\n"
+          pretty_params << "    Default: #{v['default'].inspect}\n" if v.key?('default')
           pretty_params << "    #{v['description']}\n" if v['description']
           usage << if v['type'].is_a?(Puppet::Pops::Types::POptionalType)
                      " [#{k}=<value>]"

data/lib/bolt/plugin.rb

@@ -51,7 +51,7 @@ module Bolt
       private :serial_executor
 
       def empty_inventory
-        @empty_inventory ||= Bolt::Inventory::Inventory2.new({}, @config, plugins: @plugins)
+        @empty_inventory ||= Bolt::Inventory::Inventory2.new({}, plugins: @plugins)
       end
       private :empty_inventory
 

data/lib/bolt/task.rb

@@ -42,6 +42,12 @@ module Bolt
       metadata['parameters']
     end
 
+    def parameter_defaults
+      (parameters || {}).each_with_object({}) do |(name, param_spec), defaults|
+        defaults[name] = param_spec['default'] if param_spec.key?('default')
+      end
+    end
+
     def supports_noop
       metadata['supports_noop']
     end

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.39.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'