bolt 2.36.0 → 2.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1881e4097a89e606b9326f93e2e6fd9d934a7db1eb8609e6f9a09ffa322ac7c4
-  data.tar.gz: '02509b1919e57f137bf4e868332be3b73238d22d83251680dc29c7c93ef90a19'
+  metadata.gz: 2cbd90e42181c76bad4eee913ee67369202296852cfa5153a1f5490def4e77d3
+  data.tar.gz: 87ac43d10edeebefaa31f581f49cbcf9f729e25f5d7efec583e09dcf04f97be6
 SHA512:
-  metadata.gz: 1fc1215430ac99b765c24c87ee210afb03a247a6c0baac9af3b00e34d56cfb58bacb2140dcfafbe197fd655602713463e2697c2df5083c259b66c8d8cd7bc112
-  data.tar.gz: 445a5f77a5beaf8a1a3c4cb2193e973ada23cb4a7a5f3a8caba2ccc47be4fc8a8fdef3ba797e082c0df3b9553c2f2e67c06084f2c2b2684347d2b9a86e45bde0
+  metadata.gz: 392f0d453c49a536852692e873e5c5f55807294fa0bd914593722c26d39459e494b83453a3b995319b04b8f2e6f3a1f04f7661400841192bdffc56df47e4170e
+  data.tar.gz: 750cd8e9c29008e8bb4dfc7350d52a268c01d91fa088e9007ff241648e31a90e76d9cabfef9f1db5675d33f6b82b2898a54f758bc21c17c18d888919d0441807

data/lib/bolt/bolt_option_parser.rb

@@ -14,7 +14,7 @@ module Bolt
                 global_config_setters: PROJECT_PATHS + %w[modulepath],
                 transports: %w[transport connect-timeout tty native-ssh ssh-command copy-command],
                 display: %w[format color verbose trace],
-                global: %w[help version debug log-level] }.freeze
+                global: %w[help version debug log-level clear-cache] }.freeze
 
     ACTION_OPTS = OPTIONS.values.flatten.freeze
 
@@ -969,8 +969,8 @@ module Bolt
       end
 
       separator "\nPLAN OPTIONS"
-      define('--pp', 'Create a new Puppet language plan.') do |pp|
-        @options[:puppet] = pp
+      define('--pp', 'Create a new Puppet language plan.') do |_|
+        @options[:puppet] = true
       end
 
       separator "\nDISPLAY OPTIONS"
@@ -1025,6 +1025,10 @@ module Bolt
              "trace, debug, info, warn, error, fatal, any.") do |level|
         @options[:log] = { 'console' => { 'level' => level } }
       end
+      define('--clear-cache',
+             "Clear plugin cache before executing") do |_|
+        @options[:clear_cache] = true
+      end
       define('--plugin PLUGIN', 'Select the plugin to use') do |plug|
         @options[:plugin] = plug
       end

data/lib/bolt/cli.rb

@@ -197,7 +197,12 @@ module Bolt
       @parser_deprecations.each { |dep| Bolt::Logger.deprecation_warning(dep[:type], dep[:msg]) }
       config.deprecations.each { |dep| Bolt::Logger.deprecation_warning(dep[:type], dep[:msg]) }
 
+      if options[:clear_cache] && File.exist?(config.project.cache_file)
+        FileUtils.rm(config.project.cache_file)
+      end
+
       warn_inventory_overrides_cli(options)
+      validate_ps_version
 
       options
     rescue Bolt::Error => e
@@ -205,6 +210,17 @@ module Bolt
       raise e
     end
 
+    private def validate_ps_version
+      if Bolt::Util.powershell?
+        target = inventory.get_target('localhost')
+        Bolt::Transport::Local.new.with_connection(target) do |conn|
+          # This will automatically validate the powershell version on the Bolt
+          # controller
+          Bolt::Shell::Powershell.new(target, conn)
+        end
+      end
+    end
+
     def update_targets(options)
       target_opts = options.keys.select { |opt| %i[query rerun targets].include?(opt) }
       target_string = "'--targets', '--rerun', or '--query'"

data/lib/bolt/config.rb

@@ -216,8 +216,8 @@ module Bolt
       data         = Bolt::Util.read_yaml_hash(filepath, 'config')
       logs         = [{ debug: "Loaded configuration from #{filepath}" }]
       deprecations = [{ type: 'Using bolt.yaml for system configuration',
-                        msg: "Configuration file #{filepath} is deprecated and will be removed in a future version "\
-                        "of Bolt. Use '#{dir + BOLT_DEFAULTS_NAME}' instead." }]
+                        msg: "Configuration file #{filepath} is deprecated and will be removed in Bolt 3.0. "\
+                        "See https://pup.pt/update-bolt-config for how to update to the latest Bolt practices." }]
 
       # Validate the config against the schema. This will raise a single error
       # with all validation errors.
@@ -448,10 +448,18 @@ module Bolt
             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
+
+          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
@@ -521,6 +529,10 @@ module Bolt
       @data['modulepath'] = value
     end
 
+    def plugin_cache
+      @project.plugin_cache || @data['plugin-cache'] || {}
+    end
+
     def concurrency
       @data['concurrency']
     end

data/lib/bolt/config/options.rb

@@ -33,6 +33,18 @@ module Bolt
             "_plugin" => {
               description: "The name of the plugin.",
               type: "string"
+            },
+            "_cache" => {
+              description: "This feature is experimental. Enable plugin caching and set a time-to-live.",
+              type: "object",
+              required: ["ttl"],
+              properties: {
+                "ttl" => {
+                  description: "Time in seconds to keep the plugin cache.",
+                  type: "integer",
+                  minimum: 0
+                }
+              }
             }
           }
         }
@@ -190,6 +202,20 @@ module Bolt
           _example: "~/.puppetlabs/bolt/inventory.yaml",
           _default: "project/inventory.yaml"
         },
+        "plugin-cache" => {
+          description: "This feature is experimental. Enable plugin caching and set the time-to-live.",
+          type: Hash,
+          required: ["ttl"],
+          properties: {
+            "ttl" => {
+              description: "Time in seconds to keep the plugin cache.",
+              type: Integer,
+              minimum: 0
+            }
+          },
+          _plugin: false,
+          _example: { "ttl" => 3600 }
+        },
         "log" => {
           description: "A map of configuration for the logfile output. Under `log`, you can configure log options "\
                        "for `console` and add configuration for individual log files, such as "\
@@ -207,7 +233,7 @@ module Bolt
                 "level" => {
                   description: "The type of information to log.",
                   type: String,
-                  enum: %w[trace debug error info warn fatal any],
+                  enum: %w[trace debug error info notice warn fatal any],
                   _default: "warn"
                 }
               }
@@ -226,7 +252,7 @@ module Bolt
               "level" => {
                 description: "The type of information to log.",
                 type: String,
-                enum: %w[trace debug error info warn fatal any],
+                enum: %w[trace debug error info notice warn fatal any],
                 _default: "warn"
               }
             }
@@ -540,6 +566,7 @@ module Bolt
         format
         inventory-config
         log
+        plugin-cache
         plugin-hooks
         plugin_hooks
         plugins
@@ -563,6 +590,7 @@ module Bolt
         modules
         name
         plans
+        plugin-cache
         plugin-hooks
         plugin_hooks
         plugins

data/lib/bolt/plugin.rb

@@ -4,6 +4,7 @@ require 'bolt/inventory'
 require 'bolt/executor'
 require 'bolt/module'
 require 'bolt/pal'
+require 'bolt/plugin/cache'
 require 'bolt/plugin/puppetdb'
 
 module Bolt
@@ -36,6 +37,13 @@ module Bolt
           super("Plugin #{plugin_name} does not support #{hook}", 'bolt/unsupported-hook')
         end
       end
+
+      class LoadingDisabled < PluginError
+        def initialize(plugin_name)
+          msg = "Cannot load plugin #{plugin_name}: plugin loading is disabled"
+          super(msg, 'bolt/plugin-loading-disabled', { 'plugin_name' => plugin_name })
+        end
+      end
     end
 
     class PluginContext
@@ -119,8 +127,8 @@ module Bolt
       end
     end
 
-    def self.setup(config, pal, analytics = Bolt::Analytics::NoopClient.new)
-      plugins = new(config, pal, analytics)
+    def self.setup(config, pal, analytics = Bolt::Analytics::NoopClient.new, **opts)
+      plugins = new(config, pal, analytics, **opts)
 
       config.plugins.each_key do |plugin|
         plugins.by_name(plugin)
@@ -141,12 +149,13 @@ module Bolt
 
     private_class_method :new
 
-    def initialize(config, pal, analytics)
+    def initialize(config, pal, analytics, load_plugins: true)
       @config = config
       @analytics = analytics
       @plugin_context = PluginContext.new(config, pal, self)
       @plugins = {}
       @pal = pal
+      @load_plugins = load_plugins
       @unknown = Set.new
       @resolution_stack = []
       @unresolved_plugin_configs = config.plugins.dup
@@ -169,6 +178,8 @@ module Bolt
     end
 
     def add_ruby_plugin(plugin_name)
+      raise PluginError::LoadingDisabled, plugin_name unless @load_plugins
+
       cls_name = Bolt::Util.snake_name_to_class_name(plugin_name)
       filename = "bolt/plugin/#{plugin_name}"
       require filename
@@ -185,10 +196,17 @@ module Bolt
     def add_module_plugin(plugin_name)
       opts = {
         context: @plugin_context,
+        # Make sure that the plugin's config is validated _before_ the unknown-plugin
+        # and loading-disabled checks. This way, we can fail early on invalid plugin
+        # config instead of _after_ loading the modulepath (which can be expensive).
         config: config_for_plugin(plugin_name)
       }
 
-      plugin = Bolt::Plugin::Module.load(plugin_name, modules, opts)
+      mod = modules[plugin_name]
+      raise PluginError::Unknown, plugin_name unless mod&.plugin?
+      raise PluginError::LoadingDisabled, plugin_name unless @load_plugins
+
+      plugin = Bolt::Plugin::Module.load(mod, opts)
       add_plugin(plugin)
     end
 
@@ -277,6 +295,16 @@ module Bolt
     # Evaluates a single reference. The value returned may be another
     # reference.
     def resolve_single_reference(reference)
+      plugin_cache = if cache?(reference)
+                       cache = Bolt::Plugin::Cache.new(reference,
+                                                       @config.project.cache_file,
+                                                       @config.plugin_cache)
+                       entry = cache.read_and_clean_cache
+                       return entry unless entry.nil?
+
+                       cache
+                     end
+
       plugin_name = reference['_plugin']
       hook = get_hook(plugin_name, :resolve_reference)
 
@@ -288,16 +316,24 @@ module Bolt
 
       validate_proc.call(reference)
 
-      begin
+      result = begin
         # Evaluate the plugin and then recursively evaluate any plugin returned by it.
         hook.call(reference)
       rescue StandardError => e
         loc = "resolve_reference in #{plugin_name}"
         raise PluginError::ExecutionError.new(e.message, plugin_name, loc)
       end
+
+      plugin_cache.write_cache(result) if cache?(reference)
+
+      result
     end
     private :resolve_single_reference
 
+    private def cache?(reference)
+      reference.key?('_cache') || @config.plugin_cache.key?('ttl')
+    end
+
     # Checks whether a given value is a _plugin reference
     def reference?(input)
       input.is_a?(Hash) && input.key?('_plugin')

data/lib/bolt/plugin/cache.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'bolt/error'
+require 'bolt/util'
+
+module Bolt
+  class Plugin
+    class Cache
+      attr_reader :reference, :cache_file, :default_config, :id
+
+      def initialize(reference, cache_file, default_config)
+        @reference = reference
+        @cache_file = cache_file
+        @default_config = default_config
+      end
+
+      def read_and_clean_cache
+        return if ttl == 0
+        validate
+
+        # Luckily we don't need to use a serious hash algorithm
+        require 'digest/bubblebabble'
+        r = reference.select { |k, _| k == '_cache' }.sort.to_s
+        @id = Digest::SHA2.bubblebabble(r)[0..20]
+
+        unmodified = true
+        # First remove any cache entries past their ttl
+        # This prevents removing plugins from leaving orphaned cache entries
+        cache.delete_if do |_, entry|
+          expired = Time.now - Time.parse(entry['mtime']) >= entry['ttl']
+          unmodified = false if expired
+          expired
+        end
+        File.write(cache_file, cache.to_json) unless cache.empty? || unmodified
+
+        cache.dig(id, 'result')
+      end
+
+      private def cache
+        @cache ||= Bolt::Util.read_optional_json_file(@cache_file, 'cache')
+      end
+
+      def write_cache(result)
+        cache.merge!({ id => { 'result' => result,
+                               'mtime' => Time.now,
+                               'ttl' => ttl } })
+        FileUtils.touch(cache_file)
+        File.write(cache_file, cache.to_json)
+      end
+
+      def validate
+        # The default cache `plugin-cache` will be validated by the config
+        # validator
+        return if reference['_cache'].nil?
+        r = reference['_cache']
+        unless r.is_a?(Hash)
+          raise Bolt::ValidationError,
+                "_cache must be a Hash, received #{r.class}: #{r.inspect}"
+        end
+
+        unless r.key?('ttl')
+          raise Bolt::ValidationError, "_cache must set 'ttl' key."
+        end
+
+        unless r['ttl'] >= 0
+          raise Bolt::ValidationError, "'ttl' key under '_cache' must be a minimum of 0."
+        end
+      end
+
+      private def ttl
+        @ttl ||= reference.dig('_cache', 'ttl') || default_config['ttl']
+      end
+    end
+  end
+end

data/lib/bolt/plugin/module.rb

@@ -12,15 +12,15 @@ module Bolt
         end
       end
 
-      def self.load(name, modules, opts)
-        mod = modules[name]
-        if mod&.plugin?
+      # mod should not be nil
+      def self.load(mod, opts)
+        if mod.plugin?
           opts[:mod] = mod
           plugin = Bolt::Plugin::Module.new(**opts)
           plugin.setup
           plugin
         else
-          raise PluginError::Unknown, name
+          raise PluginError::Unknown, mod.name
         end
       end
 

data/lib/bolt/project.rb

@@ -14,7 +14,7 @@ module Bolt
     attr_reader :path, :data, :config_file, :inventory_file, :hiera_config,
                 :puppetfile, :rerunfile, :type, :resource_types, :logs, :project_file,
                 :deprecations, :downloads, :plans_path, :modulepath, :managed_moduledir,
-                :backup_dir
+                :backup_dir, :cache_file
 
     def self.default_project(logs = [])
       create_project(File.expand_path(File.join('~', '.puppetlabs', 'bolt')), 'user', logs)
@@ -27,23 +27,31 @@ module Bolt
     # directory called Boltdir or a file called bolt.yaml (for a control repo
     # type Project). Otherwise, repeat the check on each directory up the
     # hierarchy, falling back to the default if we reach the root.
-    def self.find_boltdir(dir, logs = [])
+    def self.find_boltdir(dir, logs = [], deprecations = [])
       dir = Pathname.new(dir)
 
       if (dir + BOLTDIR_NAME).directory?
         create_project(dir + BOLTDIR_NAME, 'embedded', logs)
-      elsif (dir + 'bolt.yaml').file? || (dir + CONFIG_NAME).file?
+      elsif (dir + 'bolt.yaml').file?
+        command = Bolt::Util.powershell? ? 'Update-BoltProject' : 'bolt project migrate'
+        msg = "Configuration file #{dir + 'bolt.yaml'} is deprecated and will be "\
+          "removed in Bolt 3.0.\nUpdate your Bolt project to the latest Bolt practices "\
+          "using #{command}"
+        deprecations << { type: "Project level bolt.yaml",
+                          msg: msg }
+        create_project(dir, 'local', logs, deprecations)
+      elsif (dir + CONFIG_NAME).file?
         create_project(dir, 'local', logs)
       elsif dir.root?
         default_project(logs)
       else
         logs << { debug: "Did not detect Boltdir, bolt.yaml, or bolt-project.yaml at '#{dir}'. "\
                   "This directory won't be loaded as a project." }
-        find_boltdir(dir.parent, logs)
+        find_boltdir(dir.parent, logs, deprecations)
       end
     end
 
-    def self.create_project(path, type = 'option', logs = [])
+    def self.create_project(path, type = 'option', logs = [], deprecations = [])
       fullpath = Pathname.new(path).expand_path
 
       if type == 'user'
@@ -72,7 +80,6 @@ module Bolt
       data         = Bolt::Util.read_optional_yaml_hash(File.expand_path(project_file), 'project')
       default      = type =~ /user|system/ ? 'default ' : ''
       exist        = File.exist?(File.expand_path(project_file))
-      deprecations = []
 
       logs << { info: "Loaded #{default}project from '#{fullpath}'" } if exist
 
@@ -116,6 +123,7 @@ module Bolt
       @plans_path        = @path + 'plans'
       @managed_moduledir = @path + '.modules'
       @backup_dir        = @path + '.bolt-bak'
+      @cache_file        = @path + '.plugin_cache.json'
 
       tc = Bolt::Config::INVENTORY_OPTIONS.keys & raw_data.keys
       if tc.any?
@@ -184,6 +192,10 @@ module Bolt
       @data['plans']
     end
 
+    def plugin_cache
+      @data['plugin-cache']
+    end
+
     def modules
       @modules ||= @data['modules']&.map do |mod|
         if mod.is_a?(String)

data/lib/bolt/rerun.rb

@@ -12,15 +12,11 @@ module Bolt
     end
 
     def data
-      @data ||= JSON.parse(File.read(@path))
+      @data ||= Bolt::Util.read_json_file(@path, 'rerun')
       unless @data.is_a?(Array) && @data.all? { |r| r['target'] && r['status'] }
         raise Bolt::FileError.new("Missing data in rerun file: #{@path}", @path)
       end
       @data
-    rescue JSON::ParserError
-      raise Bolt::FileError.new("Could not parse rerun file: #{@path}", @path)
-    rescue IOError, SystemCallError
-      raise Bolt::FileError.new("Could not read rerun file: #{@path}", @path)
     end
 
     def get_targets(filter)

data/lib/bolt/shell/bash.rb

@@ -436,8 +436,14 @@ module Bolt
         result_output.stderr << read_streams[err]
         result_output.exit_code = t.value.respond_to?(:exitstatus) ? t.value.exitstatus : t.value
 
-        if result_output.exit_code == 0
+        case result_output.exit_code
+        when 0
           @logger.trace { "Command `#{command_str}` returned successfully" }
+        when 126
+          msg = "\n\nThis may be caused by the default tmpdir being mounted "\
+            "using 'noexec'. See http://pup.pt/task-failure for details and workarounds."
+          result_output.stderr << msg
+          @logger.trace { "Command #{command_str} failed with exit code #{result_output.exit_code}" }
         else
           @logger.trace { "Command #{command_str} failed with exit code #{result_output.exit_code}" }
         end

data/lib/bolt/shell/powershell.rb

@@ -14,6 +14,22 @@ module Bolt
         extensions = [target.options['extensions'] || []].flatten.map { |ext| ext[0] == '.' ? ext : '.' + ext }
         extensions += target.options['interpreters'].keys if target.options['interpreters']
         @extensions = DEFAULT_EXTENSIONS + extensions
+        validate_ps_version
+      end
+
+      def validate_ps_version
+        version = execute("$PSVersionTable.PSVersion.Major").stdout.string.chomp
+        if !version.empty? && version.to_i < 3
+          # This lets us know how many targets have Powershell 2, and lets the
+          # user know how many targets they have with PS2
+          msg = "Detected PowerShell 2 on one or more targets.\nPowerShell 2 "\
+            "is deprecated, and support will be removed in Bolt 3.0. See "\
+            "bolt-debug.log or run with '--log-level debug' to see the full "\
+            "list of targets with PowerShell 2."
+
+          Bolt::Logger.deprecation_warning("PowerShell 2", msg)
+          @logger.debug("Detected PowerShell 2 on #{target}.")
+        end
       end
 
       def provided_features

data/lib/bolt/util.rb

@@ -22,6 +22,28 @@ module Bolt
         raise Bolt::FileError.new("Error attempting to read #{file}: #{e}", file)
       end
 
+      def read_json_file(path, filename)
+        require 'json'
+
+        logger = Bolt::Logger.logger(self)
+        path = File.expand_path(path)
+        content = JSON.parse(File.read(path))
+        logger.trace("Loaded #{filename} from #{path}")
+        content
+      rescue Errno::ENOENT
+        raise Bolt::FileError.new("Could not read #{filename} file at #{path}", path)
+      rescue JSON::ParserError => e
+        msg = "Unable to parse #{filename} file at #{path} as JSON: #{e.message}"
+        raise Bolt::FileError.new(msg, path)
+      rescue IOError, SystemCallError => e
+        raise Bolt::FileError.new("Could not read #{filename} file at #{path}\n#{e.message}",
+                                  path)
+      end
+
+      def read_optional_json_file(path, file_name)
+        File.exist?(path) && !File.zero?(path) ? read_yaml_hash(path, file_name) : {}
+      end
+
       def read_yaml_hash(path, file_name)
         require 'yaml'
 

data/lib/bolt/version.rb

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

data/lib/bolt_server/plugin.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'bolt/error'
+
+module BoltServer
+  class Plugin
+    class PluginNotSupported < Bolt::Error
+      def initialize(msg, plugin_name)
+        super(msg, 'bolt/plugin-not-supported', { "plugin_name" => plugin_name })
+      end
+    end
+  end
+end

data/lib/bolt_server/plugin/puppet_connect_data.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module BoltServer
+  class Plugin
+    class PuppetConnectData
+      def initialize(data, **_opts)
+        @data = data
+      end
+
+      def name
+        'puppet_connect_data'
+      end
+
+      def hooks
+        %i[resolve_reference validate_resolve_reference]
+      end
+
+      def resolve_reference(opts)
+        key = opts['key']
+
+        @data.dig(key, 'value')
+      end
+
+      def validate_resolve_reference(opts)
+        unless opts['key']
+          raise Bolt::ValidationError,
+                "puppet_connect_data plugin requires that 'key' be specified"
+        end
+
+        unless @data.key?(opts['key'])
+          raise Bolt::ValidationError,
+                "puppet_connect_data plugin tried to lookup key '#{opts['key']}' but no value was found"
+        end
+      end
+    end
+  end
+end

data/lib/bolt_server/schemas/connect-data.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "project_inventory_targets connect plugin data",
+  "description": "POST project_inventory_targets connect plugin data",
+  "type": "object",
+  "properties": {
+    "puppet_connect_data": {
+      "type": "object",
+      "patternProperties": {
+        ".*": {
+          "type": "object",
+          "properties": {
+            "value": {}
+          },
+          "required": ["value"]
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "required": ["puppet_connect_data"]
+}

data/lib/bolt_server/transport_app.rb

@@ -8,6 +8,8 @@ require 'bolt/inventory'
 require 'bolt/project'
 require 'bolt/target'
 require 'bolt_server/file_cache'
+require 'bolt_server/plugin'
+require 'bolt_server/plugin/puppet_connect_data'
 require 'bolt/task/puppet_server'
 require 'json'
 require 'json-schema'
@@ -35,6 +37,7 @@ module BoltServer
       action-upload_file
       transport-ssh
       transport-winrm
+      connect-data
     ].freeze
 
     # PE_BOLTLIB_PATH is intended to function exactly like the BOLTLIB_PATH used
@@ -285,8 +288,6 @@ module BoltServer
           config: bolt_config
         }
         yield context
-      rescue Bolt::Error => e
-        [400, e.to_json]
       end
     end
 
@@ -521,6 +522,8 @@ module BoltServer
         plan_info = allowed_helper(plan_info, context[:config].project.plans)
         [200, plan_info.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the metadata for a single task
@@ -549,6 +552,8 @@ module BoltServer
         task_info = allowed_helper(task_info, context[:config].project.tasks)
         [200, task_info.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the list of plans for an environment, optionally fetching all metadata for each plan
@@ -592,6 +597,8 @@ module BoltServer
         # to bolt-server smaller/simpler.
         [200, plans_response.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the list of tasks for an environment
@@ -626,6 +633,8 @@ module BoltServer
         # to bolt-server smaller/simpler.
         [200, tasks_response.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Implements puppetserver's file_metadatas endpoint for projects.
@@ -638,6 +647,8 @@ module BoltServer
         metadatas = file_metadatas(context[:pal], params[:module_name], file)
         [200, metadatas.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     rescue ArgumentError => e
       [400, e.message]
     end
@@ -647,16 +658,33 @@ module BoltServer
     # @param project_ref [String] the project_ref to compute the inventory from
     post '/project_inventory_targets' do
       return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      bolt_config = config_from_project(params['project_ref'])
-      if bolt_config.inventoryfile && bolt_config.project.inventory_file.to_s != bolt_config.inventoryfile
-        raise Bolt::ValidationError, "Project inventory must be defined in the " \
-          "inventory.yaml file at the root of the project directory"
-      end
-      plugins = Bolt::Plugin.setup(bolt_config, nil)
-      inventory = Bolt::Inventory.from_config(bolt_config, plugins)
-      target_list = inventory.get_targets('all').map { |targ| targ.to_h.merge({ 'transport' => targ.transport }) }
+      content_type :json
+      body = JSON.parse(request.body.read)
+      error = validate_schema(@schemas["connect-data"], body)
+      return [400, error_result(error).to_json] unless error.nil?
+      in_bolt_project(params['project_ref']) do |context|
+        if context[:config].inventoryfile &&
+           context[:config].project.inventory_file.to_s !=
+           context[:config].inventoryfile
+          raise Bolt::ValidationError, "Project inventory must be defined in the " \
+            "inventory.yaml file at the root of the project directory"
+        end
+
+        Bolt::Util.validate_file('inventory file', context[:config].project.inventory_file)
+
+        begin
+          connect_plugin = BoltServer::Plugin::PuppetConnectData.new(body['puppet_connect_data'])
+          plugins = Bolt::Plugin.setup(context[:config], context[:pal], load_plugins: false)
+          plugins.add_plugin(connect_plugin)
+          inventory = Bolt::Inventory.from_config(context[:config], plugins)
+          target_list = inventory.get_targets('all').map { |targ| targ.to_h.merge({ 'transport' => targ.transport }) }
+        rescue Bolt::Plugin::PluginError::LoadingDisabled => e
+          msg = "Cannot load plugin #{e.details['plugin_name']}: plugin not supported"
+          raise BoltServer::Plugin::PluginNotSupported.new(msg, e.details['plugin_name'])
+        end
 
-      [200, target_list.to_json]
+        [200, target_list.to_json]
+      end
     rescue Bolt::Error => e
       [500, e.to_json]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.37.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -505,6 +505,7 @@ files:
 - lib/bolt/plan_creator.rb
 - lib/bolt/plan_result.rb
 - lib/bolt/plugin.rb
+- lib/bolt/plugin/cache.rb
 - lib/bolt/plugin/env_var.rb
 - lib/bolt/plugin/module.rb
 - lib/bolt/plugin/prompt.rb
@@ -556,11 +557,14 @@ files:
 - lib/bolt_server/base_config.rb
 - lib/bolt_server/config.rb
 - lib/bolt_server/file_cache.rb
+- lib/bolt_server/plugin.rb
+- lib/bolt_server/plugin/puppet_connect_data.rb
 - lib/bolt_server/schemas/action-check_node_connections.json
 - lib/bolt_server/schemas/action-run_command.json
 - lib/bolt_server/schemas/action-run_script.json
 - lib/bolt_server/schemas/action-run_task.json
 - lib/bolt_server/schemas/action-upload_file.json
+- lib/bolt_server/schemas/connect-data.json
 - lib/bolt_server/schemas/partials/target-any.json
 - lib/bolt_server/schemas/partials/target-ssh.json
 - lib/bolt_server/schemas/partials/target-winrm.json