bolt 1.29.1 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319eb2a2f42911eed9c4a7e9aa8e9bd351146f7ab3cdf69b34c9e364a2fbf574
-  data.tar.gz: ad22b5b96fc923b68d7109fdeba19f4a1046b327d0dcb0a1934bfc7a774425f6
+  metadata.gz: f863b5a29cc2286bc59ed3e987545be4e692c3b17e026ea33b4529625677c086
+  data.tar.gz: 65a2a7eff22001527871c72fcda6a65eeb6f8a943e1c043c232e1bd873dc9c27
 SHA512:
-  metadata.gz: a2e9e0277e1b7ee2cb7eb86120250e62a2ef91068893e7d86e7fb8ce542b3eaf016f0f7ca8a8245202a6c1c64a4a3d1af82c6e10fd826d5bec8df0f9f42c8d65
-  data.tar.gz: 64d7965e9e75abee048a0c251bcaaf2ce6f9a592ac86bc8f73fc330dba77ff847acaf4574ebdd194c6747d90b3d8496ae85c34658d3c0831c85befbe3a8b0aa9
+  metadata.gz: 1a0c09806f427b335ed26848072de21ae37ac53d196329dd5f8bcb5e1458460fc59804272a35336c9fc3196067bd74642baa9ac3a50be884eda99aba646c008b
+  data.tar.gz: d0dbfa6c28ab4a7c0f753e91c99ee0bf4379fe9e1843c7124d52555ea4fdc5ed9c7c46d6783206cb1b518f9e463dbe6d693c115c79c261ec7ae0adda99bab0b8

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

@@ -2,14 +2,17 @@
 
 require 'bolt/task'
 
-# Installs the puppet-agent package on targets if needed then collects facts, including any custom
-# facts found in Bolt's modulepath.
+# Installs the puppet-agent package on targets if needed, then collects facts,
+# including any custom facts found in Bolt's modulepath. The package is
+# installed using either the configured plugin or the `task` plugin with the
+# `puppet_agent::install` task.
 #
 # Agent detection will be skipped if the target includes the 'puppet-agent' feature, either as a
 # property of its transport (PCP) or by explicitly setting it as a feature in Bolt's inventory.
 #
-# If no agent is detected on the target using the 'puppet_agent::version' task, it's installed
-# using 'puppet_agent::install' and the puppet service is stopped/disabled using the 'service' task.
+# If Bolt does not detect an agent on the target using the 'puppet_agent::version' task,
+# it will install the agent using either the configured plugin or the
+# task plugin.
 #
 # **NOTE:** Not available in apply block
 Puppet::Functions.create_function(:apply_prep) do
@@ -24,14 +27,31 @@ Puppet::Functions.create_function(:apply_prep) do
     @script_compiler ||= Puppet::Pal::ScriptCompiler.new(closure_scope.compiler)
   end
 
-  def run_task(executor, targets, name, args = {})
+  def inventory
+    Puppet.lookup(:bolt_inventory)
+  end
+
+  def get_task(name, params = {})
     tasksig = script_compiler.task_signature(name)
     raise Bolt::Error.new("#{name} could not be found", 'bolt/apply-prep') unless tasksig
 
-    task = Bolt::Task.new(tasksig.task_hash)
-    results = executor.run_task(targets, task, args)
-    raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
-    results
+    errors = []
+    unless tasksig.runnable_with?(params) { |msg| errors << msg }
+      # This relies on runnable with printing a partial message before the first real error
+      raise Bolt::ValidationError, "Invalid parameters for #{errors.join("\n")}"
+    end
+
+    Bolt::Task.new(tasksig.task_hash)
+  end
+
+  # rubocop:disable Naming/AccessorMethodName
+  def set_agent_feature(target)
+    inventory.set_feature(target, 'puppet-agent')
+  end
+  # rubocop:enable Naming/AccessorMethodName
+
+  def run_task(targets, task, args = {})
+    executor.run_task(targets, task, args)
   end
 
   # Returns true if the target has the puppet-agent feature defined, either from inventory or transport.
@@ -40,6 +60,10 @@ Puppet::Functions.create_function(:apply_prep) do
       executor.transport(target.transport).provided_features.include?('puppet-agent') || target.remote?
   end
 
+  def executor
+    Puppet.lookup(:bolt_executor)
+  end
+
   def apply_prep(target_spec)
     unless Puppet[:tasks]
       raise Puppet::ParseErrorWithIssue
@@ -47,8 +71,6 @@ Puppet::Functions.create_function(:apply_prep) do
     end
 
     applicator = Puppet.lookup(:apply_executor)
-    executor = Puppet.lookup(:bolt_executor)
-    inventory = Puppet.lookup(:bolt_inventory)
 
     executor.report_function_call(self.class.name)
 
@@ -61,21 +83,47 @@ Puppet::Functions.create_function(:apply_prep) do
         agent_targets.each { |target| Puppet.debug "Puppet Agent feature declared for #{target.name}" }
         unless unknown_targets.empty?
           # Ensure Puppet is installed
-          versions = run_task(executor, unknown_targets, 'puppet_agent::version')
+          version_task = get_task('puppet_agent::version')
+          versions = run_task(unknown_targets, version_task)
+          raise Bolt::RunFailure.new(versions, 'run_task', 'puppet_agent::version') unless versions.ok?
           need_install, installed = versions.partition { |r| r['version'].nil? }
           installed.each do |r|
             Puppet.debug "Puppet Agent #{r['version']} installed on #{r.target.name}"
-            inventory.set_feature(r.target, 'puppet-agent')
+            set_agent_feature(r.target)
           end
 
           unless need_install.empty?
             need_install_targets = need_install.map(&:target)
-            run_task(executor, need_install_targets, 'puppet_agent::install')
-            # Service task works best when targets have puppet-agent feature
-            need_install_targets.each { |target| inventory.set_feature(target, 'puppet-agent') }
-            # Ensure the Puppet service is stopped after new install
-            run_task(executor, need_install_targets, 'service', 'action' => 'stop', 'name' => 'puppet')
-            run_task(executor, need_install_targets, 'service', 'action' => 'disable', 'name' => 'puppet')
+            # lazy-load expensive gem code
+            require 'concurrent'
+            pool = Concurrent::ThreadPoolExecutor.new
+
+            hooks = need_install_targets.map do |t|
+              begin
+                opts = t.plugin_hooks&.fetch('puppet_library')
+                hook = inventory.plugins.get_hook(opts['plugin'], :puppet_library)
+                { 'target' => t,
+                  'hook_proc' => hook.call(opts, t, self) }
+              rescue StandardError => e
+                Bolt::Result.from_exception(t, e)
+              end
+            end
+
+            hook_errors, ok_hooks = hooks.partition { |h| h.is_a?(Bolt::Result) }
+
+            futures = ok_hooks.map do |hash|
+              Concurrent::Future.execute(executor: pool) do
+                hash['hook_proc'].call
+              end
+            end
+
+            results = futures.zip(ok_hooks).map do |f, hash|
+              f.value || Bolt::Result.from_exception(hash['target'], f.reason)
+            end
+            set = Bolt::ResultSet.new(results + hook_errors)
+            raise Bolt::RunFailure.new(set.error_set, 'apply_prep') unless set.ok
+
+            need_install_targets.each { |target| set_agent_feature(target) }
           end
         end
 
@@ -90,6 +138,7 @@ Puppet::Functions.create_function(:apply_prep) do
         task = applicator.custom_facts_task
         arguments = { 'plugins' => Puppet::Pops::Types::PSensitiveType::Sensitive.new(plugins) }
         results = executor.run_task(targets, task, arguments)
+        # TODO: Standardize RunFailure type with error above
         raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
 
         results.each do |result|

data/lib/bolt/config.rb

@@ -33,7 +33,7 @@ module Bolt
   class Config
     attr_accessor :concurrency, :format, :trace, :log, :puppetdb, :color, :save_rerun,
                   :transport, :transports, :inventoryfile, :compile_concurrency, :boltdir,
-                  :puppetfile_config, :plugins
+                  :puppetfile_config, :plugins, :plugin_hooks
     attr_writer :modulepath
 
     TRANSPORT_OPTIONS = %i[password run-as sudo-password extensions
@@ -71,6 +71,7 @@ module Bolt
       @save_rerun = true
       @puppetfile_config = {}
       @plugins = {}
+      @plugin_hooks = { 'puppet_library' => { 'plugin' => 'install_agent' } }
 
       # add an entry for the default console logger
       @log = { 'console' => {} }
@@ -161,6 +162,7 @@ module Bolt
 
       # Plugins are only settable from config not inventory so we can overwrite
       @plugins = data['plugins'] if data.key?('plugins')
+      @plugin_hooks.merge!(data['plugin_hooks']) if data.key?('plugin_hooks')
 
       %w[concurrency format puppetdb color transport].each do |key|
         send("#{key}=", data[key]) if data.key?(key)

data/lib/bolt/executor.rb

@@ -16,12 +16,9 @@ module Bolt
     attr_reader :noop, :transports
     attr_accessor :run_as
 
-    # FIXME: There must be a better way
-    # https://makandracards.com/makandra/36011-ruby-do-not-mix-optional-and-keyword-arguments
     def initialize(concurrency = 1,
                    analytics = Bolt::Analytics::NoopClient.new,
                    noop = false)
-
       # lazy-load expensive gem code
       require 'concurrent'
 

data/lib/bolt/inventory.rb

@@ -63,7 +63,7 @@ module Bolt
       version = (data || {}).delete('version') { 1 }
       case version
       when 1
-        new(data, config)
+        new(data, config, plugins: plugins)
       when 2
         Bolt::Inventory::Inventory2.new(data, config, plugins: plugins)
       else
@@ -71,7 +71,10 @@ module Bolt
       end
     end
 
-    def initialize(data, config = nil, target_vars: {}, target_facts: {}, target_features: {})
+    attr_reader :plugins, :config
+
+    def initialize(data, config = nil, plugins: nil, target_vars: {},
+                   target_facts: {}, target_features: {}, target_plugin_hooks: {})
       @logger = Logging.logger[self]
       # Config is saved to add config options to targets
       @config = config || Bolt::Config.default
@@ -81,6 +84,8 @@ module Bolt
       @target_vars = target_vars
       @target_facts = target_facts
       @target_features = target_features
+      @plugins = plugins
+      @target_plugin_hooks = target_plugin_hooks
 
       @groups.resolve_aliases(@groups.node_aliases)
       collect_groups
@@ -107,6 +112,10 @@ module Bolt
       @groups.node_names
     end
 
+    def plugin_hooks(target)
+      @target_plugin_hooks[target.name] || {}
+    end
+
     def get_targets(targets)
       targets = expand_targets(targets)
       targets = if targets.is_a? Array
@@ -213,6 +222,9 @@ module Bolt
       set_vars_from_hash(target.name, data['vars']) unless @target_vars[target.name]
       set_facts(target.name, data['facts']) unless @target_facts[target.name]
       data['features']&.each { |feature| set_feature(target, feature) } unless @target_features[target.name]
+      unless @target_plugin_hooks[target.name]
+        set_plugin_hooks(target.name, @config.plugin_hooks.merge(data['plugin_hooks'] || {}))
+      end
 
       # Use Config object to ensure config section is treated consistently with config file
       conf = @config.deep_clone
@@ -298,6 +310,14 @@ module Bolt
     end
     private :set_facts
 
+    def set_plugin_hooks(tname, hash)
+      if hash
+        @target_plugin_hooks[tname] ||= {}
+        @target_plugin_hooks[tname].merge!(hash)
+      end
+    end
+    private :set_plugin_hooks
+
     def add_node(current_group, target, desired_group, track = { 'all' => nil })
       if current_group.name == desired_group
         # Group to add to is found
@@ -305,13 +325,23 @@ module Bolt
         # Add target to nodes hash
         current_group.nodes[t_name] = { 'name' => t_name }.merge(target.options)
         # Inherit facts, vars, and features from hierarchy
-        current_group_data = { facts: current_group.facts, vars: current_group.vars, features: current_group.features }
+        current_group_data = { facts: current_group.facts,
+                               vars: current_group.vars,
+                               features: current_group.features,
+                               plugin_hooks: current_group.plugin_hooks }
         data = inherit_data(track, current_group.name, current_group_data)
         set_facts(t_name, @target_facts[t_name] ? data[:facts].merge(@target_facts[t_name]) : data[:facts])
         set_vars_from_hash(t_name, @target_vars[t_name] ? data[:vars].merge(@target_vars[t_name]) : data[:vars])
         data[:features].each do |feature|
           set_feature(target, feature)
         end
+        hook_data = @config.plugin_hooks.merge(data[:plugin_hooks])
+        hash = if @target_plugin_hooks[t_name]
+                 hook_data.merge(@target_plugin_hooks[t_name])
+               else
+                 hook_data
+               end
+        set_plugin_hooks(t_name, hash)
         return true
       end
       # Recurse on children Groups if not desired_group
@@ -327,6 +357,7 @@ module Bolt
         data[:facts] = track[name].facts.merge(data[:facts])
         data[:vars] = track[name].vars.merge(data[:vars])
         data[:features].concat(track[name].features)
+        data[:plugin_hooks] = track[name].plugin_hooks.merge(data[:plugin_hooks])
         inherit_data(track, track[name].name, data)
       end
       data

data/lib/bolt/inventory/group.rb

@@ -5,12 +5,13 @@ module Bolt
     # Group is a specific implementation of Inventory based on nested
     # structured data.
     class Group
-      attr_accessor :name, :nodes, :aliases, :name_or_alias, :groups, :config, :rest, :facts, :vars, :features
+      attr_accessor :name, :nodes, :aliases, :name_or_alias, :groups,
+                    :config, :rest, :facts, :vars, :features, :plugin_hooks
 
       # Regex used to validate group names and target aliases.
       NAME_REGEX = /\A[a-z0-9_][a-z0-9_-]*\Z/.freeze
 
-      DATA_KEYS = %w[name config facts vars features].freeze
+      DATA_KEYS = %w[name config facts vars features plugin_hooks].freeze
       NODE_KEYS = DATA_KEYS + ['alias']
       GROUP_KEYS = DATA_KEYS + %w[groups nodes]
       CONFIG_KEYS = Bolt::TRANSPORTS.keys.map(&:to_s) + ['transport']
@@ -33,6 +34,7 @@ module Bolt
         @vars = fetch_value(data, 'vars', Hash)
         @facts = fetch_value(data, 'facts', Hash)
         @features = fetch_value(data, 'features', Array)
+        @plugin_hooks = fetch_value(data, 'plugin_hooks', Hash)
         @config = fetch_value(data, 'config', Hash)
 
         unless (unexpected_keys = @config.keys - CONFIG_KEYS).empty?
@@ -198,6 +200,7 @@ module Bolt
             'vars' => data['vars'] || {},
             'facts' => data['facts'] || {},
             'features' => data['features'] || [],
+            'plugin_hooks' => data['plugin_hooks'] || {},
             # groups come from group_data
             'groups' => [] }
         end
@@ -208,6 +211,7 @@ module Bolt
           'vars' => @vars,
           'facts' => @facts,
           'features' => @features,
+          'plugin_hooks' => @plugin_hooks,
           'groups' => [@name] }
       end
 
@@ -216,6 +220,7 @@ module Bolt
           'vars' => {},
           'facts' => {},
           'features' => [],
+          'plugin_hooks' => {},
           'groups' => [] }
       end
 
@@ -232,6 +237,7 @@ module Bolt
           'vars' => data1['vars'].merge(data2['vars']),
           'facts' => Bolt::Util.deep_merge(data1['facts'], data2['facts']),
           'features' => data1['features'] | data2['features'],
+          'plugin_hooks' => data1['plugin_hooks'].merge(data2['plugin_hooks']),
           'groups' => data2['groups'] + data1['groups']
         }
       end

data/lib/bolt/inventory/group2.rb

@@ -5,13 +5,14 @@ require 'bolt/inventory/group'
 module Bolt
   class Inventory
     class Group2
-      attr_accessor :name, :targets, :aliases, :name_or_alias, :groups, :config, :rest, :facts, :vars, :features
+      attr_accessor :name, :targets, :aliases, :name_or_alias, :groups,
+                    :config, :rest, :facts, :vars, :features, :plugin_hooks
 
       # THESE are duplicates with the old groups for now.
       # Regex used to validate group names and target aliases.
       NAME_REGEX = /\A[a-z0-9_][a-z0-9_-]*\Z/.freeze
 
-      DATA_KEYS = %w[name config facts vars features].freeze
+      DATA_KEYS = %w[name config facts vars features plugin_hooks].freeze
       NODE_KEYS = DATA_KEYS + %w[alias uri]
       GROUP_KEYS = DATA_KEYS + %w[groups targets]
       CONFIG_KEYS = Bolt::TRANSPORTS.keys.map(&:to_s) + ['transport']
@@ -23,7 +24,7 @@ module Bolt
         raise ValidationError.new("Group does not have a name", nil) unless data.key?('name')
         @plugins = plugins
 
-        %w[name vars features facts].each do |key|
+        %w[name vars features facts plugin_hooks].each do |key|
           validate_config_plugin(data[key], key, nil)
         end
 
@@ -45,6 +46,7 @@ module Bolt
         @vars = fetch_value(data, 'vars', Hash)
         @facts = fetch_value(data, 'facts', Hash)
         @features = fetch_value(data, 'features', Array)
+        @plugin_hooks = fetch_value(data, 'plugin_hooks', Hash)
 
         @config = config_only_plugin(fetch_value(data, 'config', Hash))
 
@@ -134,6 +136,7 @@ module Bolt
             'vars' => data['vars'] || {},
             'facts' => data['facts'] || {},
             'features' => data['features'] || [],
+            'plugin_hooks' => data['plugin_hooks'] || {},
             # This allows us to determine if a target was found?
             'name' => data['name'] || nil,
             'uri' => data['uri'] || nil,
@@ -240,6 +243,7 @@ module Bolt
           'vars' => data1['vars'].merge(data2['vars']),
           'facts' => Bolt::Util.deep_merge(data1['facts'], data2['facts']),
           'features' => data1['features'] | data2['features'],
+          'plugin_hooks' => data1['plugin_hooks'].merge(data2['plugin_hooks']),
           'groups' => data2['groups'] + data1['groups']
         }
       end
@@ -346,7 +350,8 @@ module Bolt
       end
 
       # The data functions below expect and return nil or a hash of the schema
-      # { 'config' => Hash , 'vars' => Hash, 'facts' => Hash, 'features' => Array, groups => Array }
+      # {'config' => Hash, 'vars' => Hash, 'facts' => Hash, 'features' => Array,
+      #  'plugin_hooks' => Hash, 'groups' => Array}
       def data_for(target_name)
         data_merge(group_collect(target_name), target_collect(target_name))
       end
@@ -356,6 +361,7 @@ module Bolt
           'vars' => @vars,
           'facts' => @facts,
           'features' => @features,
+          'plugin_hooks' => @plugin_hooks,
           'groups' => [@name] }
       end
 
@@ -364,6 +370,7 @@ module Bolt
           'vars' => {},
           'facts' => {},
           'features' => [],
+          'plugin_hooks' => {},
           'groups' => [] }
       end
 

data/lib/bolt/inventory/inventory2.rb

@@ -12,16 +12,22 @@ module Bolt
         end
       end
 
-      def initialize(data, config = nil, plugins: nil, target_vars: {}, target_facts: {}, target_features: {})
+      attr_reader :plugins, :config
+
+      def initialize(data, config = nil, plugins: nil, target_vars: {},
+                     target_facts: {}, target_features: {},
+                     target_plugin_hooks: {})
         @logger = Logging.logger[self]
         # Config is saved to add config options to targets
         @config = config || Bolt::Config.default
         @data = data || {}
         @groups = Group2.new(@data.merge('name' => 'all'), plugins)
+        @plugins = plugins
         @group_lookup = {}
         @target_vars = target_vars
         @target_facts = target_facts
         @target_features = target_features
+        @target_plugin_hooks = target_plugin_hooks
         @groups.resolve_aliases(@groups.target_aliases, @groups.target_names)
         collect_groups
       end
@@ -103,6 +109,10 @@ module Bolt
         @target_features[target.name] || Set.new
       end
 
+      def plugin_hooks(target)
+        @target_plugin_hooks[target.name] || {}
+      end
+
       def data_hash
         {
           data: {},
@@ -153,6 +163,9 @@ module Bolt
         set_vars_from_hash(target.name, data['vars']) unless @target_vars[target.name]
         set_facts(target.name, data['facts']) unless @target_facts[target.name]
         data['features']&.each { |feature| set_feature(target, feature) } unless @target_features[target.name]
+        unless @target_plugin_hooks[target.name]
+          set_plugin_hooks(target.name, @config.plugin_hooks.merge(data['plugin_hooks'] || {}))
+        end
         data['config'] = config_plugin(data['config'])
 
         # Use Config object to ensure config section is treated consistently with config file
@@ -234,6 +247,14 @@ module Bolt
       end
       private :set_facts
 
+      def set_plugin_hooks(tname, hash)
+        if hash
+          @target_plugin_hooks[tname] ||= {}
+          @target_plugin_hooks[tname].merge!(hash)
+        end
+      end
+      private :set_plugin_hooks
+
       def add_target(current_group, target, desired_group, track = { 'all' => nil })
         if current_group.name == desired_group
           # Group to add to is found
@@ -246,13 +267,21 @@ module Bolt
           # Inherit facts, vars, and features from hierarchy
           current_group_data = { facts: current_group.facts,
                                  vars: current_group.vars,
-                                 features: current_group.features }
+                                 features: current_group.features,
+                                 plugin_hooks: current_group.plugin_hooks }
           data = inherit_data(track, current_group.name, current_group_data)
           set_facts(t_name, @target_facts[t_name] ? data[:facts].merge(@target_facts[t_name]) : data[:facts])
           set_vars_from_hash(t_name, @target_vars[t_name] ? data[:vars].merge(@target_vars[t_name]) : data[:vars])
           data[:features].each do |feature|
             set_feature(target, feature)
           end
+          hook_data = @config.plugin_hooks.merge(data[:plugin_hooks])
+          hash = if @target_plugin_hooks[t_name]
+                   hook_data.merge(@target_plugin_hooks[t_name])
+                 else
+                   hook_data
+                 end
+          set_plugin_hooks(t_name, hash)
           return true
         end
         # Recurse on children Groups if not desired_group
@@ -268,6 +297,7 @@ module Bolt
           data[:facts] = track[name].facts.merge(data[:facts])
           data[:vars] = track[name].vars.merge(data[:vars])
           data[:features].concat(track[name].features)
+          data[:plugin_hooks] = track[name].plugin_hooks.merge(data[:plugin_hooks])
           inherit_data(track, track[name].name, data)
         end
         data

data/lib/bolt/outputter/human.rb

@@ -161,7 +161,7 @@ module Bolt
         @plan_depth -= 1
         plan = event[:plan]
         duration = event[:duration]
-        @stream.puts(colorize(:green, "Finished: plan #{plan} in #{duration.round(2)} sec"))
+        @stream.puts(colorize(:green, "Finished: plan #{plan} in #{duration_to_string(duration)}"))
       end
 
       def print_summary(results, elapsed_time = nil)
@@ -185,7 +185,7 @@ module Bolt
         total_msg = format('Ran on %<size>d node%<plural>s',
                            size: results.size,
                            plural: results.size == 1 ? '' : 's')
-        total_msg += format(' in %<elapsed>.2f seconds', elapsed: elapsed_time) unless elapsed_time.nil?
+        total_msg << " in #{duration_to_string(elapsed_time)}" unless elapsed_time.nil?
         @stream.puts total_msg
       end
 
@@ -209,7 +209,7 @@ module Bolt
 
       def print_tasks(tasks, modulepath)
         print_table(tasks)
-        print_message("\nMODULEPATH:\n#{modulepath.join(':')}\n"\
+        print_message("\nMODULEPATH:\n#{modulepath.join(File::PATH_SEPARATOR)}\n"\
                         "\nUse `bolt task show <task-name>` to view "\
                         "details and parameters for a specific task.")
       end
@@ -278,7 +278,7 @@ module Bolt
 
       def print_plans(plans, modulepath)
         print_table(plans)
-        print_message("\nMODULEPATH:\n#{modulepath.join(':')}\n"\
+        print_message("\nMODULEPATH:\n#{modulepath.join(File::PATH_SEPARATOR)}\n"\
                         "\nUse `bolt plan show <plan-name>` to view "\
                         "details and parameters for a specific plan.")
       end
@@ -366,6 +366,20 @@ module Bolt
       def print_message(message)
         @stream.puts(message)
       end
+
+      def duration_to_string(duration)
+        hrs = (duration / 3600).floor
+        mins = ((duration % 3600) / 60).floor
+        secs = (duration % 60)
+        if hrs > 0
+          "#{hrs} hr, #{mins} min, #{secs.round} sec"
+        elsif mins > 0
+          "#{mins} min, #{secs.round} sec"
+        else
+          # Include 2 decimal places if the duration is under a minute
+          "#{secs.round(2)} sec"
+        end
+      end
     end
   end
 end

data/lib/bolt/plugin.rb

@@ -7,6 +7,7 @@ require 'bolt/plugin/prompt'
 require 'bolt/plugin/task'
 require 'bolt/plugin/aws'
 require 'bolt/plugin/vault'
+require 'bolt/plugin/install_agent'
 
 module Bolt
   class Plugin
@@ -40,6 +41,7 @@ module Bolt
       plugins.add_plugin(Bolt::Plugin::Task.new(config))
       plugins.add_plugin(Bolt::Plugin::Aws::EC2.new(config.plugins['aws'] || {}))
       plugins.add_plugin(Bolt::Plugin::Vault.new(config.plugins['vault'] || {}))
+      plugins.add_plugin(Bolt::Plugin::InstallAgent.new)
       plugins
     end
 

data/lib/bolt/plugin/install_agent.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Bolt
+  class Plugin
+    class InstallAgent
+      def hooks
+        %w[puppet_library]
+      end
+
+      def name
+        'install_agent'
+      end
+
+      def puppet_library(_opts, target, apply_prep)
+        install_task = apply_prep.get_task("puppet_agent::install")
+        service_task = apply_prep.get_task("service", 'action' => 'stop', 'name' => 'puppet')
+        proc do
+          apply_prep.run_task([target], install_task).first
+          apply_prep.set_agent_feature(target)
+          apply_prep.run_task([target], service_task, 'action' => 'stop', 'name' => 'puppet').first
+          apply_prep.run_task([target], service_task, 'action' => 'disable', 'name' => 'puppet').first
+        end
+      end
+    end
+  end
+end

data/lib/bolt/plugin/task.rb

@@ -86,6 +86,14 @@ module Bolt
 
         targets
       end
+
+      def puppet_library(opts, target, apply_prep)
+        params = opts['parameters'] || {}
+        task = apply_prep.get_task(opts['task'], params)
+        proc do
+          apply_prep.run_task([target], task, params).first
+        end
+      end
     end
   end
 end

data/lib/bolt/target.rb

@@ -88,6 +88,14 @@ module Bolt
       end
     end
 
+    def plugin_hooks
+      if @inventory
+        @inventory.plugin_hooks(self)
+      else
+        {}
+      end
+    end
+
     # TODO: WHAT does equality mean here?
     # should we just compare names? is there something else that is meaninful?
     def eql?(other)

data/lib/bolt/transport/ssh.rb

@@ -16,7 +16,6 @@ module Bolt
       def self.default_options
         {
           'connect-timeout' => 10,
-          'host-key-check' => true,
           'tty' => false,
           'load-config' => true,
           'disconnect-timeout' => 5
@@ -31,7 +30,7 @@ module Bolt
         validate_sudo_options(options)
 
         host_key = options['host-key-check']
-        unless !!host_key == host_key
+        unless host_key.nil? || !!host_key == host_key
           raise Bolt::ValidationError, 'host-key-check option must be a Boolean true or false'
         end
 

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

@@ -25,9 +25,10 @@ module Bolt
           @target = target
           @load_config = target.options['load-config']
 
-          ssh_user = @load_config ? Net::SSH::Config.for(target.host)[:user] : nil
-          @user = @target.user || ssh_user || Etc.getlogin
+          ssh_config = @load_config ? Net::SSH::Config.for(target.host) : {}
+          @user = @target.user || ssh_config[:user] || Etc.getlogin
           @run_as = nil
+          @strict_host_key_checking = ssh_config[:strict_host_key_checking]
 
           @logger = Logging.logger[@target.host]
           @transport_logger = transport_logger
@@ -61,16 +62,20 @@ module Bolt
           options[:password] = target.password if target.password
           # Support both net-ssh 4 and 5. We use 5 in packaging, but Beaker pins to 4 so we
           # want the gem to be compatible with version 4.
-          options[:verify_host_key] = if target.options['host-key-check']
-                                        if defined?(Net::SSH::Verifiers::Always)
-                                          Net::SSH::Verifiers::Always.new
+          options[:verify_host_key] = if target.options['host-key-check'].nil?
+                                        # Fall back to SSH behavior. This variable will only be set in net-ssh 5.3+.
+                                        if @strict_host_key_checking.nil? || @strict_host_key_checking
+                                          net_ssh_verifier(:always)
                                         else
-                                          Net::SSH::Verifiers::Secure.new
+                                          # SSH's behavior with StrictHostKeyChecking=no: adds new keys to known_hosts.
+                                          # If known_hosts points to /dev/null, then equivalent to :never where it
+                                          # accepts any key beacuse they're all new.
+                                          net_ssh_verifier(:accept_new_or_tunnel_local)
                                         end
-                                      elsif defined?(Net::SSH::Verifiers::Never)
-                                        Net::SSH::Verifiers::Never.new
+                                      elsif target.options['host-key-check']
+                                        net_ssh_verifier(:always)
                                       else
-                                        Net::SSH::Verifiers::Null.new
+                                        net_ssh_verifier(:never)
                                       end
           options[:timeout] = target.options['connect-timeout'] if target.options['connect-timeout']
 
@@ -267,6 +272,31 @@ module Bolt
           make_executable(remote_path)
           remote_path
         end
+
+        # This handles renaming Net::SSH verifiers between version 4.x and 5.x
+        # of the gem
+        def net_ssh_verifier(verifier)
+          case verifier
+          when :always
+            if defined?(Net::SSH::Verifiers::Always)
+              Net::SSH::Verifiers::Always.new
+            else
+              Net::SSH::Verifiers::Secure.new
+            end
+          when :never
+            if defined?(Net::SSH::Verifiers::Never)
+              Net::SSH::Verifiers::Never.new
+            else
+              Net::SSH::Verifiers::Null.new
+            end
+          when :accept_new_or_tunnel_local
+            if defined?(Net::SSH::Verifiers::AcceptNewOrLocalTunnel)
+              Net::SSH::Verifiers::AcceptNewOrLocalTunnel.new
+            else
+              Net::SSH::Verifiers::Lenient.new
+            end
+          end
+        end
       end
     end
   end

data/lib/bolt/version.rb

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

data/lib/bolt_server/transport_app.rb

@@ -103,7 +103,8 @@ module BoltServer
       error = validate_schema(@schemas["transport-ssh"], body)
       return [400, error.to_json] unless error.nil?
 
-      opts = body['target'].clone
+      defaults = { 'host-key-check' => false }
+      opts = defaults.merge(body['target'])
       if opts['private-key-content']
         opts['private-key'] = { 'key-data' => opts['private-key-content'] }
         opts.delete('private-key-content')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.30.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -397,6 +397,7 @@ files:
 - lib/bolt/plan_result.rb
 - lib/bolt/plugin.rb
 - lib/bolt/plugin/aws.rb
+- lib/bolt/plugin/install_agent.rb
 - lib/bolt/plugin/pkcs7.rb
 - lib/bolt/plugin/prompt.rb
 - lib/bolt/plugin/puppetdb.rb