bolt 2.35.0 → 2.40.2

data/lib/bolt/config.rb

@@ -7,6 +7,7 @@ require 'bolt/project'
 require 'bolt/logger'
 require 'bolt/util'
 require 'bolt/config/options'
+require 'bolt/validator'
 
 module Bolt
   class UnknownTransportError < Bolt::Error
@@ -32,53 +33,110 @@ module Bolt
     end
 
     def self.from_project(project, overrides = {})
-      logs = []
+      logs         = []
+      deprecations = []
+
       conf = if project.project_file == project.config_file
                project.data
              else
                c = Bolt::Util.read_optional_yaml_hash(project.config_file, 'config')
+
+               # Validate the config against the schema. This will raise a single error
+               # with all validation errors.
+               Bolt::Validator.new.tap do |validator|
+                 validator.validate(c, bolt_schema, project.config_file.to_s)
+
+                 validator.warnings.each { |warning| logs << { warn: warning } }
+
+                 validator.deprecations.each do |dep|
+                   deprecations << { type: "#{BOLT_CONFIG_NAME} #{dep[:option]}", msg: dep[:message] }
+                 end
+               end
+
                logs << { debug: "Loaded configuration from #{project.config_file}" } if File.exist?(project.config_file)
                c
              end
-
       data = load_defaults(project).push(
-        filepath: project.config_file,
-        data: conf,
-        logs: logs,
-        deprecations: []
+        filepath:     project.config_file,
+        data:         conf,
+        logs:         logs,
+        deprecations: deprecations
       )
 
       new(project, data, overrides)
     end
 
     def self.from_file(configfile, overrides = {})
-      project = Bolt::Project.create_project(Pathname.new(configfile).expand_path.dirname)
-      logs = []
+      project      = Bolt::Project.create_project(Pathname.new(configfile).expand_path.dirname)
+      logs         = []
+      deprecations = []
 
       conf = if project.project_file == project.config_file
                project.data
              else
                c = Bolt::Util.read_yaml_hash(configfile, 'config')
+
+               # Validate the config against the schema. This will raise a single error
+               # with all validation errors.
+               Bolt::Validator.new.tap do |validator|
+                 validator.validate(c, bolt_schema, project.config_file.to_s)
+
+                 validator.warnings.each { |warning| logs << { warn: warning } }
+
+                 validator.deprecations.each do |dep|
+                   deprecations << { type: "#{BOLT_CONFIG_NAME} #{dep[:option]}", msg: dep[:message] }
+                 end
+               end
+
                logs << { debug: "Loaded configuration from #{configfile}" }
                c
              end
 
       data = load_defaults(project).push(
-        filepath: configfile,
-        data: conf,
-        logs: logs,
-        deprecations: []
+        filepath:     configfile,
+        data:         conf,
+        logs:         logs,
+        deprecations: deprecations
       )
 
       new(project, data, overrides)
     end
 
-    def self.system_path
-      # Lazy-load expensive gem code
-      require 'win32/dir' if Bolt::Util.windows?
+    # Builds a hash of definitions for transport configuration.
+    #
+    def self.transport_definitions
+      INVENTORY_OPTIONS.each_with_object({}) do |(option, definition), acc|
+        acc[option] = TRANSPORT_CONFIG.key?(option) ? definition.merge(TRANSPORT_CONFIG[option].schema) : definition
+      end
+    end
+
+    # Builds the schema for bolt-defaults.yaml used by the validator.
+    #
+    def self.defaults_schema
+      schema = {
+        type:        Hash,
+        properties:  BOLT_DEFAULTS_OPTIONS.map { |opt| [opt, _ref: opt] }.to_h,
+        definitions: OPTIONS.merge(transport_definitions)
+      }
+
+      schema[:definitions]['inventory-config'][:properties] = transport_definitions
+
+      schema
+    end
 
+    # Builds the schema for bolt.yaml used by the validator.
+    #
+    def self.bolt_schema
+      {
+        type:        Hash,
+        properties:  (BOLT_OPTIONS + INVENTORY_OPTIONS.keys).map { |opt| [opt, _ref: opt] }.to_h,
+        definitions: OPTIONS.merge(transport_definitions)
+      }
+    end
+
+    def self.system_path
       if Bolt::Util.windows?
-        Pathname.new(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'bolt', 'etc'))
+        Pathname.new(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs', 'bolt', 'etc'))
       else
         Pathname.new(File.join('/etc', 'puppetlabs', 'bolt'))
       end
@@ -94,9 +152,10 @@ module Bolt
     # projects. This file does not allow project-specific configuration such as 'hiera-config' and
     # 'inventoryfile', and nests all default inventory configuration under an 'inventory-config' key.
     def self.load_bolt_defaults_yaml(dir)
-      filepath = dir + BOLT_DEFAULTS_NAME
-      data     = Bolt::Util.read_yaml_hash(filepath, 'config')
-      logs     = [{ debug: "Loaded configuration from #{filepath}" }]
+      filepath     = dir + BOLT_DEFAULTS_NAME
+      data         = Bolt::Util.read_yaml_hash(filepath, 'config')
+      logs         = [{ debug: "Loaded configuration from #{filepath}" }]
+      deprecations = []
 
       # Warn if 'bolt.yaml' detected in same directory.
       if File.exist?(bolt_yaml = dir + BOLT_CONFIG_NAME)
@@ -106,6 +165,18 @@ module Bolt
         )
       end
 
+      # Validate the config against the schema. This will raise a single error
+      # with all validation errors.
+      Bolt::Validator.new.tap do |validator|
+        validator.validate(data, defaults_schema, filepath)
+
+        validator.warnings.each { |warning| logs << { warn: warning } }
+
+        validator.deprecations.each do |dep|
+          deprecations << { type: "#{BOLT_DEFAULTS_NAME} #{dep[:option]}", msg: dep[:message] }
+        end
+      end
+
       # Remove project-specific config such as hiera-config, etc.
       project_config = data.slice(*(BOLT_PROJECT_OPTIONS - BOLT_DEFAULTS_OPTIONS))
 
@@ -148,18 +219,30 @@ module Bolt
         data = data.merge(data.delete('inventory-config'))
       end
 
-      { filepath: filepath, data: data, logs: logs, deprecations: [] }
+      { filepath: filepath, data: data, logs: logs, deprecations: deprecations }
     end
 
     # Loads a 'bolt.yaml' file, the legacy configuration file. There's no special munging needed
     # here since Bolt::Config will just ignore any invalid keys.
     def self.load_bolt_yaml(dir)
-      filepath = dir + BOLT_CONFIG_NAME
-      data     = Bolt::Util.read_yaml_hash(filepath, 'config')
-      logs     = [{ debug: "Loaded configuration from #{filepath}" }]
+      filepath     = dir + BOLT_CONFIG_NAME
+      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.
+      Bolt::Validator.new.tap do |validator|
+        validator.validate(data, bolt_schema, filepath)
+
+        validator.warnings.each { |warning| logs << { warn: warning } }
+
+        validator.deprecations.each do |dep|
+          deprecations << { type: "#{BOLT_CONFIG_NAME} #{dep[:option]}", msg: dep[:message] }
+        end
+      end
 
       { filepath: filepath, data: data, logs: logs, deprecations: deprecations }
     end
@@ -206,17 +289,21 @@ module Bolt
       @config_files = []
 
       default_data = {
+        'apply-settings'      => {},
         'apply_settings'      => {},
         'color'               => true,
         'compile-concurrency' => Etc.nprocessors,
         'concurrency'         => default_concurrency,
         'format'              => 'human',
         'log'                 => { 'console' => {} },
+        'module-install'      => {},
+        'plugin-hooks'        => {},
         'plugin_hooks'        => {},
         'plugins'             => {},
         'puppetdb'            => {},
         'puppetfile'          => {},
         'save-rerun'          => true,
+        'spinner'             => true,
         'transport'           => 'ssh'
       }
 
@@ -271,7 +358,7 @@ module Bolt
 
       # Set console log to debug if in debug mode
       if options[:debug]
-        overrides['log'] = { 'console' => { 'level' => :debug } }
+        overrides['log'] = { 'console' => { 'level' => 'debug' } }
       end
 
       if options[:puppetfile_path]
@@ -280,6 +367,9 @@ module Bolt
 
       overrides['trace'] = opts['trace'] if opts.key?('trace')
 
+      # Validate the overrides
+      Bolt::Validator.new.validate(overrides, self.class.bolt_schema, 'command line')
+
       overrides
     end
 
@@ -296,7 +386,7 @@ module Bolt
           when *TRANSPORT_CONFIG.keys
             Bolt::Util.deep_merge(val1, val2)
           # Hash values are shallow merged
-          when 'puppetdb', 'plugin_hooks', 'apply_settings', 'log'
+          when 'puppetdb', 'plugin-hooks', 'plugin_hooks', 'apply-settings', 'apply_settings', 'log'
             val1.merge(val2)
           # All other values are overwritten
           else
@@ -333,8 +423,9 @@ module Bolt
       end
 
       # Filter hashes to only include valid options
-      @data['apply_settings'] = @data['apply_settings'].slice(*OPTIONS['apply_settings'][:properties].keys)
-      @data['puppetfile'] = @data['puppetfile'].slice(*OPTIONS['puppetfile'][:properties].keys)
+      %w[apply-settings apply_settings module-install puppetfile].each do |opt|
+        @data[opt] = @data[opt].slice(*OPTIONS.dig(opt, :properties).keys)
+      end
     end
 
     private def normalize_log(target)
@@ -357,31 +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)
+        next unless acc[name][:level] == 'notice'
 
-        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
-        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
 
@@ -397,40 +471,36 @@ module Bolt
               "is automatically appended to the modulepath and cannot be configured."
       end
 
-      keys = OPTIONS.keys - %w[plugins plugin_hooks puppetdb]
-      keys.each do |key|
-        next unless Bolt::Util.references?(@data[key])
-        valid_keys = TRANSPORT_CONFIG.keys + %w[plugins plugin_hooks puppetdb]
-        raise Bolt::ValidationError,
-              "Found unsupported key _plugin in config setting #{key}. Plugins are only available in "\
-              "#{valid_keys.join(', ')}."
-      end
-
-      unless concurrency.is_a?(Integer) && concurrency > 0
-        raise Bolt::ValidationError,
-              "Concurrency must be a positive Integer, received #{concurrency.class} #{concurrency}"
-      end
-
-      unless compile_concurrency.is_a?(Integer) && compile_concurrency > 0
-        raise Bolt::ValidationError,
-              "Compile concurrency must be a positive Integer, received #{compile_concurrency.class} "\
-              "#{compile_concurrency}"
-      end
-
       compile_limit = 2 * Etc.nprocessors
       unless compile_concurrency < compile_limit
         raise Bolt::ValidationError, "Compilation is CPU-intensive, set concurrency less than #{compile_limit}"
       end
 
-      unless %w[human json rainbow].include? format
-        raise Bolt::ValidationError, "Unsupported format: '#{format}'"
+      %w[hiera-config trusted-external-command inventoryfile].each do |opt|
+        Bolt::Util.validate_file(opt, @data[opt]) if @data[opt]
       end
 
-      Bolt::Util.validate_file('hiera-config', @data['hiera-config']) if @data['hiera-config']
-      Bolt::Util.validate_file('trusted-external-command', trusted_external) if trusted_external
+      if File.exist?(default_inventoryfile)
+        Bolt::Util.validate_file('inventory file', default_inventoryfile)
+      end
 
-      unless TRANSPORT_CONFIG.include?(transport)
-        raise UnknownTransportError, transport
+      # 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.
+      if @project.modules && puppetfile_config.any? && module_install.empty?
+        command = Bolt::Util.powershell? ? 'Update-BoltProject' : 'bolt project migrate'
+        @logs << { warn: "Detected configuration for 'puppetfile'. This setting is not "\
+                         "used when 'modules' is configured. Use 'module-install' instead. "\
+                         "To automatically update your project configuration, run '#{command}'." }
+      elsif @project.modules.nil? && puppetfile_config.empty? && module_install.any?
+        @logs << { warn: "Detected configuration for 'module-install'. This setting is not "\
+                         "used when 'modules' is not configured. Use 'puppetfile' instead." }
+      elsif @project.modules && puppetfile_config.any? && module_install.any?
+        @logs << { warn: "Detected configuration for 'puppetfile' and 'module-install'. Using "\
+                         "configuration for 'module-install' because 'modules' is also configured." }
+      elsif @project.modules.nil? && puppetfile_config.any? && module_install.any?
+        @logs << { warn: "Detected configuration for 'puppetfile' and 'module-install'. Using "\
+                         "configuration for 'puppetfile' because 'modules' is not configured." }
       end
     end
 
@@ -464,6 +534,10 @@ module Bolt
       @data['modulepath'] = value
     end
 
+    def plugin_cache
+      @project.plugin_cache || @data['plugin-cache'] || {}
+    end
+
     def concurrency
       @data['concurrency']
     end
@@ -496,6 +570,10 @@ module Bolt
       @data['save-rerun']
     end
 
+    def spinner
+      @data['spinner']
+    end
+
     def inventoryfile
       @data['inventoryfile']
     end
@@ -513,7 +591,18 @@ module Bolt
     end
 
     def plugin_hooks
-      @data['plugin_hooks']
+      if @data['plugin-hooks'].any? && @data['plugin_hooks'].any?
+        Bolt::Logger.warn_once(
+          "plugin-hooks and plugin_hooks set",
+          "Detected configuration for 'plugin-hooks' and 'plugin_hooks'. Bolt will ignore 'plugin_hooks'."
+        )
+
+        @data['plugin-hooks']
+      elsif @data['plugin-hooks'].any?
+        @data['plugin-hooks']
+      else
+        @data['plugin_hooks']
+      end
     end
 
     def trusted_external
@@ -521,13 +610,28 @@ module Bolt
     end
 
     def apply_settings
-      @data['apply_settings']
+      if @data['apply-settings'].any? && @data['apply_settings'].any?
+        Bolt::Logger.warn_once(
+          "apply-settings and apply_settings set",
+          "Detected configuration for 'apply-settings' and 'apply_settings'. Bolt will ignore 'apply_settings'."
+        )
+
+        @data['apply-settings']
+      elsif @data['apply-settings'].any?
+        @data['apply-settings']
+      else
+        @data['apply_settings']
+      end
     end
 
     def transport
       @data['transport']
     end
 
+    def module_install
+      @project.module_install || @data['module-install']
+    end
+
     # Check if there is a case-insensitive match to the path
     def check_path_case(type, paths)
       return if paths.nil?

data/lib/bolt/config/options.rb

@@ -33,77 +33,42 @@ 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
+                }
+              }
             }
           }
         }
       }.freeze
 
-      # The following constants define the various configuration options available to Bolt.
-      # Each constant is a hash where keys are the configuration option and values are the
-      # option's definition. These options are used in multiple locations:
-      #
-      #   - Automatic type validation when loading and setting configuration
-      #   - Generating reference documentation for configuration files
-      #   - Generating JSON schemas for configuration files
-      #
-      # Data includes keys defined by JSON Schema Draft 07 as well as some metadata used
-      # by Bolt to generate documentation. The following keys are used:
-      #
-      #   :description    String      A detailed description of the option and what it does. This
-      #                               field is used in both documentation and the JSON schemas,
-      #                               and should provide as much detail as possible, including
-      #                               links to relevant documentation.
-      #
-      #   :type           Class       The expected type of a value. These should be Ruby classes,
-      #                               as this field is used to perform automatic type validation.
-      #                               If an option can accept more than one type, this should be
-      #                               an array of types. Boolean values should set :type to
-      #                               [TrueClass, FalseClass], as Ruby does not have a single
-      #                               Boolean class.
-      #
-      #   :items          Hash        A definition hash for items in an array. Similar to values
-      #                               for top-level options, items can have a :description, :type,
-      #                               or any other key in this list.
-      #
-      #   :uniqueItems    Boolean     Whether or not an array should contain only unique items.
-      #
-      #   :properties     Hash        A hash where keys are sub-options and values are definitions
-      #                               for the sub-option. Similar to values for top-level options,
-      #                               properties can have a :description, :type, or any other key
-      #                               in this list.
-      #
-      #   :additionalProperties       A variation of the :properties key, where the hash is a
-      #                   Hash        definition for any properties not specified in :properties.
-      #                               This can be used to permit arbitrary sub-options, such as
-      #                               logs for the 'log' option.
-      #
-      #   :required       Array       An array of properties that are required for options that
-      #                               accept Hash values.
-      #
-      #   :minimum        Integer     The minimum integer value for an option.
-      #
-      #   :enum           Array       An array of values that the option recognizes.
-      #
-      #   :pattern        String      A JSON regex pattern that the option's vaue should match.
-      #
-      #   :format         String      Requires that a string value matches a format defined by the
-      #                               JSON Schema draft.
-      #
-      #   :_plugin        Boolean     Whether the option accepts a plugin reference. This is used
-      #                               when generating the JSON schemas to determine whether or not
-      #                               to include a reference to the _plugin definition. If :_plugin
-      #                               is set to true, the script that generates JSON schemas will
-      #                               automatically recurse through the :items and :properties keys
-      #                               and add plugin references if applicable.
-      #
-      #   :_example       Any         An example value for the option. This is used to generate
-      #                               reference documentation for configuration files.
-      #
-      #   :_default       Any         The documented default value for the option. This is only
-      #                               used to generate reference documentation for configuration
-      #                               files and is not used by Bolt to actually set default values.
+      # Definitions used to validate config options.
+      # https://github.com/puppetlabs/bolt/blob/main/schemas/README.md
       OPTIONS = {
         "apply_settings" => {
+          description: "A map of Puppet settings to use when applying Puppet code using the `apply` "\
+                       "plan function or the `bolt apply` command.",
+          type: Hash,
+          properties: {
+            "show_diff" => {
+              description: "Whether to log and report a contextual diff.",
+              type: [TrueClass, FalseClass],
+              _example: true,
+              _default: false
+            }
+          },
+          _plugin: false,
+          _deprecation: "This option will be removed in Bolt 3.0. Use `apply-settings` instead."
+        },
+        "apply-settings" => {
           description: "A map of Puppet settings to use when applying Puppet code using the `apply` "\
                        "plan function or the `bolt apply` command.",
           type: Hash,
@@ -169,9 +134,26 @@ module Bolt
                        "files](inventory_file_v2.md).",
           type: String,
           _plugin: false,
+          _deprecation: "This option will be removed in Bolt 3.0. Use the `--inventoryfile` command-line option "\
+                        "to use a non-default inventory file or move the file contents to `inventory.yaml` in the "\
+                        "project directory.",
           _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 "\
@@ -183,12 +165,13 @@ module Bolt
           properties: {
             "console" => {
               description: "Configuration for logs output to the console.",
-              type: Hash,
+              type: [String, Hash],
+              enum: ['disable'],
               properties: {
                 "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"
                 }
               }
@@ -207,7 +190,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"
               }
             }
@@ -227,6 +210,41 @@ module Bolt
           _example: ["~/.puppetlabs/bolt/modules", "~/.puppetlabs/bolt/site-modules"],
           _default: ["project/modules", "project/site-modules", "project/site"]
         },
+        "module-install" => {
+          description: "Options that configure where Bolt downloads modules from. This option is only used when "\
+                       "installing modules using the `bolt module add|install` commands and "\
+                       "`Add|Install-BoltModule` cmdlets.",
+          type: Hash,
+          properties: {
+            "forge" => {
+              description: "A subsection that can have its own `proxy` setting to set an HTTP proxy for Forge "\
+                           "operations only, and a `baseurl` setting to specify a different Forge host.",
+              type: Hash,
+              properties: {
+                "baseurl" => {
+                  description: "The URL to the Forge host.",
+                  type: String,
+                  format: "uri",
+                  _example: "https://forge.example.com"
+                },
+                "proxy" => {
+                  description: "The HTTP proxy to use for Forge operations.",
+                  type: String,
+                  format: "uri",
+                  _example: "https://my-forge-proxy.com:8080"
+                }
+              },
+              _example: { "baseurl" => "https://forge.example.com", "proxy" => "https://my-forge-proxy.com:8080" }
+            },
+            "proxy" => {
+              description: "The HTTP proxy to use for Git and Forge operations.",
+              type: String,
+              format: "uri",
+              _example: "https://my-proxy.com:8080"
+            }
+          },
+          _plugin: false
+        },
         "modules" => {
           description: "A list of module dependencies for the project. Each dependency is a map of data specifying "\
                        "the module to install. To install the project's module dependencies, run the `bolt module "\
@@ -276,8 +294,8 @@ module Bolt
         },
         "name" => {
           description: "The name of the Bolt project. When this option is configured, the project is considered a "\
-                       "[Bolt project](experimental_features.md#bolt-projects), allowing Bolt to load content from "\
-                       "the project directory as though it were a module.",
+                       "[Bolt project](projects.md), allowing Bolt to load content from the project directory "\
+                       "as though it were a module.",
           type: String,
           _plugin: false,
           _example: "myproject"
@@ -294,6 +312,16 @@ module Bolt
           _example: ["myproject", "myproject::foo", "myproject::bar", "myproject::deploy::*"]
         },
         "plugin_hooks" => {
+          description: "A map of [plugin hooks](writing_plugins.md#hooks) and which plugins a hook should use. "\
+                       "The only configurable plugin hook is `puppet_library`, which can use two possible plugins: "\
+                       "[`puppet_agent`](https://github.com/puppetlabs/puppetlabs-puppet_agent#puppet_agentinstall) "\
+                       "and [`task`](using_plugins.md#task).",
+          type: Hash,
+          _plugin: true,
+          _example: { "puppet_library" => { "plugin" => "puppet_agent", "version" => "6.15.0", "_run_as" => "root" } },
+          _deprecation: "This option will be removed in Bolt 3.0. Use `plugin-hooks` instead."
+        },
+        "plugin-hooks" => {
           description: "A map of [plugin hooks](writing_plugins.md#hooks) and which plugins a hook should use. "\
                        "The only configurable plugin hook is `puppet_library`, which can use two possible plugins: "\
                        "[`puppet_agent`](https://github.com/puppetlabs/puppetlabs-puppet_agent#puppet_agentinstall) "\
@@ -307,7 +335,11 @@ module Bolt
                        "its value is a map of configuration data. Configurable options are specified by the plugin. "\
                        "Read more about configuring plugins in [Using plugins](using_plugins.md#configuring-plugins).",
           type: Hash,
-          _plugin: true,
+          additionalProperties: {
+            type: Hash,
+            _plugin: true
+          },
+          _plugin: false,
           _example: { "pkcs7" => { "keysize" => 1024 } }
         },
         "puppetdb" => {
@@ -318,49 +350,57 @@ module Bolt
             "cacert" => {
               description: "The path to the ca certificate for PuppetDB.",
               type: String,
-              _example: "/etc/puppetlabs/puppet/ssl/certs/ca.pem"
+              _example: "/etc/puppetlabs/puppet/ssl/certs/ca.pem",
+              _plugin: true
             },
             "cert" => {
               description: "The path to the client certificate file to use for authentication.",
               type: String,
-              _example: "/etc/puppetlabs/puppet/ssl/certs/my-host.example.com.pem"
+              _example: "/etc/puppetlabs/puppet/ssl/certs/my-host.example.com.pem",
+              _plugin: true
             },
             "connect_timeout" => {
               description: "How long to wait in seconds when establishing connections with PuppetDB.",
               type: Integer,
               minimum: 1,
               _default: 60,
-              _example: 120
+              _example: 120,
+              _plugin: true
             },
             "key" => {
               description: "The private key for the certificate.",
               type: String,
-              _example: "/etc/puppetlabs/puppet/ssl/private_keys/my-host.example.com.pem"
+              _example: "/etc/puppetlabs/puppet/ssl/private_keys/my-host.example.com.pem",
+              _plugin: true
             },
             "read_timeout" => {
               description: "How long to wait in seconds for a response from PuppetDB.",
               type: Integer,
               minimum: 1,
               _default: 60,
-              _example: 120
+              _example: 120,
+              _plugin: true
             },
             "server_urls" => {
               description: "An array containing the PuppetDB host to connect to. Include the protocol `https` "\
                            "and the port, which is usually `8081`. For example, "\
                            "`https://my-puppetdb-server.com:8081`.",
               type: Array,
-              _example: ["https://puppet.example.com:8081"]
+              _example: ["https://puppet.example.com:8081"],
+              _plugin: true
             },
             "token" => {
               description: "The path to the PE RBAC Token.",
               type: String,
-              _example: "~/.puppetlabs/token"
+              _example: "~/.puppetlabs/token",
+              _plugin: true
             }
           },
           _plugin: true
         },
         "puppetfile" => {
-          description: "A map containing options for the `bolt puppetfile install` command.",
+          description: "A map containing options for the `bolt puppetfile install` command and "\
+                       "`Install-BoltPuppetfile` cmdlet.",
           type: Hash,
           properties: {
             "forge" => {
@@ -375,19 +415,19 @@ module Bolt
                   _example: "https://forge.example.com"
                 },
                 "proxy" => {
-                  description: "The HTTP proxy to use for Git and Forge operations.",
+                  description: "The HTTP proxy to use for Forge operations.",
                   type: String,
                   format: "uri",
-                  _example: "https://forgeapi.example.com"
+                  _example: "https://my-forge-proxy.com:8080"
                 }
               },
-              _example: { "baseurl" => "https://forge.example.com", "proxy" => "https://forgeapi.example.com" }
+              _example: { "baseurl" => "https://forge.example.com", "proxy" => "https://my-forge-proxy.com:8080" }
             },
             "proxy" => {
               description: "The HTTP proxy to use for Git and Forge operations.",
               type: String,
               format: "uri",
-              _example: "https://forgeapi.example.com"
+              _example: "https://my-proxy.com:8080"
             }
           },
           _plugin: false
@@ -401,6 +441,14 @@ module Bolt
           _example: false,
           _default: true
         },
+        "spinner" => {
+          description: "Whether to print a spinner to the console for long-running Bolt operations.",
+          type: [TrueClass, FalseClass],
+          _plugin: false,
+          _example: false,
+          _default: true
+        },
+
         "tasks" => {
           description: "A list of task names and glob patterns to filter the project's tasks by. This option is used "\
                        "to limit the visibility of tasks for users of the project. For example, project authors "\
@@ -435,7 +483,7 @@ module Bolt
                        "specified in the URI.",
           type: String,
           enum: TRANSPORT_CONFIG.keys,
-          _plugin: false,
+          _plugin: true,
           _example: "winrm",
           _default: "ssh"
         },
@@ -461,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" }
         },
@@ -480,6 +529,7 @@ module Bolt
 
       # Options that are available in a bolt.yaml file
       BOLT_OPTIONS = %w[
+        apply-settings
         apply_settings
         color
         compile-concurrency
@@ -489,11 +539,13 @@ module Bolt
         inventoryfile
         log
         modulepath
+        plugin-hooks
         plugin_hooks
         plugins
         puppetdb
         puppetfile
         save-rerun
+        spinner
         trusted-external-command
       ].freeze
 
@@ -505,15 +557,20 @@ module Bolt
         format
         inventory-config
         log
+        module-install
+        plugin-cache
+        plugin-hooks
         plugin_hooks
         plugins
         puppetdb
         puppetfile
         save-rerun
+        spinner
       ].freeze
 
       # Options that are available in a bolt-project.yaml file
       BOLT_PROJECT_OPTIONS = %w[
+        apply-settings
         apply_settings
         color
         compile-concurrency
@@ -523,14 +580,18 @@ module Bolt
         inventoryfile
         log
         modulepath
+        module-install
         modules
         name
         plans
+        plugin-cache
+        plugin-hooks
         plugin_hooks
         plugins
         puppetdb
         puppetfile
         save-rerun
+        spinner
         tasks
         trusted-external-command
       ].freeze