bolt 2.35.0 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05af3f780d500b91be547a73123d24c2da041a8ef60ba14114921358b120800
-  data.tar.gz: e8534835e69d1e5e57a353ff89a7d2667cf6d0894e8a07c1e5812282ed85b2cd
+  metadata.gz: 1881e4097a89e606b9326f93e2e6fd9d934a7db1eb8609e6f9a09ffa322ac7c4
+  data.tar.gz: '02509b1919e57f137bf4e868332be3b73238d22d83251680dc29c7c93ef90a19'
 SHA512:
-  metadata.gz: 97b3faac5a1e423dcebf8e4fa92f55bbc36bd1c9735fc38332db40a2bb0db0e1ddc8e1e815aa29f31f9eb3601972a8d6e07b39d0c5dc6cd2762ea87a91ddec92
-  data.tar.gz: 15963b1bb77ee04a1db4f54996964b32e599e4a0cc422dc77892151b221c1a17df9e6a1c74f160a30e9146402d48819b07b3b9d2ee9c96d7e763bba97389ccc8
+  metadata.gz: 1fc1215430ac99b765c24c87ee210afb03a247a6c0baac9af3b00e34d56cfb58bacb2140dcfafbe197fd655602713463e2697c2df5083c259b66c8d8cd7bc112
+  data.tar.gz: 445a5f77a5beaf8a1a3c4cb2193e973ada23cb4a7a5f3a8caba2ccc47be4fc8a8fdef3ba797e082c0df3b9553c2f2e67c06084f2c2b2684347d2b9a86e45bde0

data/bolt-modules/boltlib/lib/puppet/datatypes/applyresult.rb

@@ -12,6 +12,7 @@ Puppet::DataTypes.create_type('ApplyResult') do
       message => Callable[[], Optional[String]],
       action => Callable[[], String],
       to_data => Callable[[], Hash],
+      value => Callable[[], Hash]
     }
   PUPPET
 

data/lib/bolt/analytics.rb

@@ -2,6 +2,7 @@
 
 require 'bolt/util'
 require 'bolt/version'
+require 'find'
 require 'json'
 require 'logging'
 require 'securerandom'
@@ -23,14 +24,16 @@ module Bolt
       plan_steps: :cd8,
       return_type: :cd9,
       inventory_version: :cd10,
-      boltdir_type: :cd11
+      boltdir_type: :cd11,
+      puppet_plan_count: :cd12,
+      yaml_plan_count: :cd13
     }.freeze
 
     def self.build_client
       logger = Bolt::Logger.logger(self)
       begin
-        config_file = config_path(logger)
-        config = load_config(config_file, logger)
+        config_file = config_path
+        config = load_config(config_file)
       rescue ArgumentError
         config = { 'disabled' => true }
       end
@@ -51,7 +54,7 @@ module Bolt
       NoopClient.new
     end
 
-    def self.config_path(logger)
+    def self.config_path
       path     = File.expand_path(File.join('~', '.puppetlabs', 'etc', 'bolt', 'analytics.yaml'))
       old_path = File.expand_path(File.join('~', '.puppetlabs', 'bolt', 'analytics.yaml'))
 
@@ -59,7 +62,7 @@ module Bolt
         if File.exist?(old_path)
           message = "Detected analytics configuration files at '#{old_path}' and '#{path}'. Loading "\
                     "analytics configuration from '#{path}'."
-          logger.warn(message)
+          Bolt::Logger.warn_once('duplicate_analytics', message)
         end
 
         path
@@ -70,12 +73,12 @@ module Bolt
       end
     end
 
-    def self.load_config(filename, logger)
+    def self.load_config(filename)
       if File.exist?(filename)
         Bolt::Util.read_optional_yaml_hash(filename, 'analytics')
       else
         unless ENV['BOLT_DISABLE_ANALYTICS']
-          logger.warn <<~ANALYTICS
+          Bolt::Logger.warn_once('analytics_opt_out', <<~ANALYTICS)
             Bolt collects data about how you use it. You can opt out of providing this data.
 
             To disable analytics data collection, add this line to ~/.puppetlabs/etc/bolt/analytics.yaml :
@@ -134,11 +137,23 @@ module Bolt
       end
 
       def report_bundled_content(mode, name)
-        if bundled_content[mode.split(' ').first]&.include?(name)
+        if bundled_content[mode.split.first]&.include?(name)
           event('Bundled Content', mode, label: name)
         end
       end
 
+      def plan_counts(plans_path)
+        pp_count, yaml_count = if File.exist?(plans_path)
+                                 %w[pp yaml].map do |extension|
+                                   Find.find(plans_path.to_s).grep(/.*\.#{extension}/).length
+                                 end
+                               else
+                                 [0, 0]
+                               end
+
+        { puppet_plan_count: pp_count, yaml_plan_count: yaml_count }
+      end
+
       def event(category, action, label: nil, value: nil, **kwargs)
         custom_dimensions = Bolt::Util.walk_keys(kwargs) do |k|
           CUSTOM_DIMENSIONS[k] || raise("Unknown analytics key '#{k}'")
@@ -224,6 +239,10 @@ module Bolt
 
       def report_bundled_content(mode, name); end
 
+      def plan_counts(_)
+        {}
+      end
+
       def event(category, action, **_kwargs)
         @logger.trace "Skipping submission of '#{category} #{action}' event because analytics is disabled"
       end

data/lib/bolt/apply_result.rb

@@ -96,9 +96,9 @@ module Bolt
       @target = target
       @value = {}
       @action = 'apply'
-      value['report'] = report if report
-      value['_error'] = error if error
-      value['_output'] = metrics_message if metrics_message
+      @value['report'] = report if report
+      @value['_error'] = error if error
+      @value['_output'] = metrics_message if metrics_message
     end
 
     def event_metrics

data/lib/bolt/bolt_option_parser.rb

@@ -6,11 +6,12 @@ require 'optparse'
 
 module Bolt
   class BoltOptionParser < OptionParser
+    PROJECT_PATHS = %w[project configfile boltdir].freeze
     OPTIONS = { inventory: %w[targets query rerun description],
                 authentication: %w[user password password-prompt private-key host-key-check ssl ssl-verify],
                 escalation: %w[run-as sudo-password sudo-password-prompt sudo-executable],
                 run_context: %w[concurrency inventoryfile save-rerun cleanup],
-                global_config_setters: %w[modulepath project configfile],
+                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
@@ -46,7 +47,8 @@ module Bolt
       when 'inventory'
         case action
         when 'show'
-          { flags: OPTIONS[:inventory] + OPTIONS[:global] + %w[format inventoryfile boltdir configfile detail],
+          { flags: OPTIONS[:inventory] + OPTIONS[:global] +
+            PROJECT_PATHS + %w[format inventoryfile detail],
             banner: INVENTORY_SHOW_HELP }
         else
           { flags: OPTIONS[:global],
@@ -55,7 +57,7 @@ module Bolt
       when 'group'
         case action
         when 'show'
-          { flags: OPTIONS[:global] + %w[format inventoryfile boltdir configfile],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[format inventoryfile],
             banner: GROUP_SHOW_HELP }
         else
           { flags: OPTIONS[:global],
@@ -67,13 +69,13 @@ module Bolt
       when 'module'
         case action
         when 'add'
-          { flags: OPTIONS[:global] + %w[configfile project],
+          { flags: OPTIONS[:global] + PROJECT_PATHS,
             banner: MODULE_ADD_HELP }
         when 'generate-types'
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
             banner: MODULE_GENERATETYPES_HELP }
         when 'install'
-          { flags: OPTIONS[:global] + %w[configfile force project resolve],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[force resolve],
             banner: MODULE_INSTALL_HELP }
         when 'show'
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
@@ -88,7 +90,7 @@ module Bolt
           { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
             banner: PLAN_CONVERT_HELP }
         when 'new'
-          { flags: OPTIONS[:global] + %w[configfile project pp],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[pp],
             banner: PLAN_NEW_HELP }
         when 'run'
           { flags: ACTION_OPTS + %w[params compile-concurrency tmpdir hiera-config],
@@ -106,7 +108,7 @@ module Bolt
           { flags: OPTIONS[:global] + %w[modules],
             banner: PROJECT_INIT_HELP }
         when 'migrate'
-          { flags: OPTIONS[:global] + %w[inventoryfile project configfile],
+          { flags: OPTIONS[:global] + PROJECT_PATHS + %w[inventoryfile],
             banner: PROJECT_MIGRATE_HELP }
         else
           { flags: OPTIONS[:global],
@@ -793,7 +795,10 @@ module Bolt
         @options[:noop] = true
       end
       define('--description DESCRIPTION',
-             'Description to use for the job') do |description|
+             'Deprecated. Description to use for the job') do |description|
+        msg = "Command line option '--description' is deprecated, and will be "\
+          "removed in Bolt 3.0."
+        @deprecations << { type: 'Using --description', msg: msg }
         @options[:description] = description
       end
       define('--params PARAMETERS',
@@ -873,13 +878,25 @@ module Bolt
           File.expand_path(moduledir)
         end
       end
-      define('--project PATH', '--boltdir PATH',
-             'Specify what project to load config from (default: autodiscovered from current working dir)') do |path|
+      define('--boltdir PATH',
+             'Deprecated. Specify what project to load config from (default:',
+             'autodiscovered from current working dir)') do |path|
+        msg = "Command line option '--boltdir' is deprecated, use '--project' instead."
+        @deprecations << { type: 'Using --boltdir', msg: msg }
         @options[:boltdir] = path
       end
+      define('--project PATH',
+             'Path to load the Bolt project from (default: autodiscovered from current dir)') do |path|
+        @options[:project] = path
+      end
       define('--configfile PATH',
-             'Specify where to load config from (default: ~/.puppetlabs/bolt/bolt.yaml).',
-             'Directory containing bolt.yaml will be used as the project directory.') do |path|
+             'Deprecated. Specify where to load config from (default:',
+             '~/.puppetlabs/bolt/bolt.yaml). Directory containing bolt.yaml will be',
+             'used as the project directory.') do |path|
+        msg = "Command line option '--configfile' is deprecated, and " \
+          "will be removed in Bolt 3.0. Use '--project' and provide the "\
+          "directory path instead."
+        @deprecations << { type: 'Using --configfile', msg: msg }
         @options[:configfile] = path
       end
       define('--hiera-config PATH',
@@ -891,12 +908,18 @@ module Bolt
         if ENV.include?(Bolt::Inventory::ENVIRONMENT_VAR)
           raise Bolt::CLIError, "Cannot pass inventory file when #{Bolt::Inventory::ENVIRONMENT_VAR} is set"
         end
-        @options[:inventoryfile] = Pathname.new(File.expand_path(path))
+        @options[:inventoryfile] = File.expand_path(path)
       end
       define('--puppetfile PATH',
-             'Specify a Puppetfile to use when installing modules. (default: ~/.puppetlabs/bolt/Puppetfile)',
+             'Deprecated. Specify a Puppetfile to use when installing modules.',
+             ' (default: ~/.puppetlabs/bolt/Puppetfile)',
              'Modules are installed in the current project.') do |path|
-        @options[:puppetfile_path] = Pathname.new(File.expand_path(path))
+        command = Bolt::Util.powershell? ? 'Update-BoltProject' : 'bolt project migrate'
+        msg = "Command line option '--puppetfile' is deprecated, and will be removed "\
+          "in Bolt 3.0. You can migrate to using the new module management "\
+          "workflow using '#{command}'."
+        @deprecations << { type: 'Using --puppetfile', msg: msg }
+        @options[:puppetfile_path] = File.expand_path(path)
       end
       define('--[no-]save-rerun', 'Whether to update the rerun file after this command.') do |save|
         @options[:'save-rerun'] = save

data/lib/bolt/cli.rb

@@ -21,7 +21,7 @@ require 'bolt/outputter'
 require 'bolt/pal'
 require 'bolt/plan_creator'
 require 'bolt/plugin'
-require 'bolt/project_migrator'
+require 'bolt/project_manager'
 require 'bolt/puppetdb'
 require 'bolt/rerun'
 require 'bolt/secret'
@@ -30,6 +30,7 @@ require 'bolt/version'
 
 module Bolt
   class CLIExit < StandardError; end
+
   class CLI
     COMMANDS = {
       'command'    => %w[run],
@@ -164,8 +165,9 @@ module Bolt
                 elsif options[:configfile]
                   Bolt::Config.from_file(options[:configfile], options)
                 else
-                  project = if options[:boltdir]
-                              dir = Pathname.new(options[:boltdir])
+                  cli_flag = options[:project] || options[:boltdir]
+                  project = if cli_flag
+                              dir = Pathname.new(cli_flag)
                               if (dir + Bolt::Project::BOLTDIR_NAME).directory?
                                 Bolt::Project.create_project(dir + Bolt::Project::BOLTDIR_NAME)
                               else
@@ -293,7 +295,7 @@ module Bolt
               "Unknown argument(s) #{options[:leftovers].join(', ')}"
       end
 
-      if options[:boltdir] && options[:configfile]
+      if options.slice(:boltdir, :configfile, :project).length > 1
         raise Bolt::CLIError, "Only one of '--boltdir', '--project', or '--configfile' may be specified"
       end
 
@@ -340,15 +342,10 @@ module Bolt
     def warn_inventory_overrides_cli(opts)
       inventory_source = if ENV[Bolt::Inventory::ENVIRONMENT_VAR]
                            Bolt::Inventory::ENVIRONMENT_VAR
-                         elsif config.inventoryfile && Bolt::Util.file_stat(config.inventoryfile)
+                         elsif config.inventoryfile
                            config.inventoryfile
-                         else
-                           begin
-                             Bolt::Util.file_stat(config.default_inventoryfile)
-                             config.default_inventoryfile
-                           rescue Errno::ENOENT
-                             nil
-                           end
+                         elsif File.exist?(config.default_inventoryfile)
+                           config.default_inventoryfile
                          end
 
       inventory_cli_opts = %i[authentication escalation transports].each_with_object([]) do |key, acc|
@@ -392,7 +389,7 @@ module Bolt
         output_format: config.format,
         # For continuity
         boltdir_type: config.project.type
-      }
+      }.merge!(analytics.plan_counts(config.project.plans_path))
 
       # Only include target and inventory info for commands that take a targets
       # list. This avoids loading inventory for commands that don't need it.
@@ -456,15 +453,14 @@ module Bolt
       when 'project'
         case options[:action]
         when 'init'
-          code = initialize_project
+          code = Bolt::ProjectManager.new(config, outputter, pal)
+                                     .create(Dir.pwd, options[:object], options[:modules])
         when 'migrate'
-          code = Bolt::ProjectMigrator.new(config, outputter).migrate
+          code = Bolt::ProjectManager.new(config, outputter, pal).migrate
         end
       when 'plan'
         case options[:action]
         when 'new'
-          command = Bolt::Util.powershell? ? 'New-BoltPlan' : 'bolt plan new'
-          @logger.warn("Command '#{command}' is experimental and subject to changes.")
           plan_name = options[:object]
 
           # If this passes validation, it will return the path to the plan to create
@@ -729,76 +725,6 @@ module Bolt
       0
     end
 
-    # Initializes a specified directory as a Bolt project and installs any modules
-    # specified by the user, along with their dependencies
-    def initialize_project
-      # Dir.pwd will return backslashes on Windows, but Pathname always uses
-      # forward slashes to concatenate paths. This results in paths like
-      # C:\User\Administrator/modules, which fail module install. This ensure
-      # forward slashes in the cwd path.
-      dir = File.expand_path(Dir.pwd)
-      name = options[:object] || File.basename(dir)
-      if name !~ Bolt::Module::MODULE_NAME_REGEX
-        if options[:object]
-          raise Bolt::ValidationError, "The provided project name '#{name}' is invalid; "\
-            "project name must begin with a lowercase letter and can include lowercase "\
-            "letters, numbers, and underscores."
-        else
-          command = Bolt::Util.powershell? ? 'New-BoltProject -Name <NAME>' : 'bolt project init <NAME>'
-          raise Bolt::ValidationError, "The current directory name '#{name}' is an invalid "\
-            "project name. Please specify a name using '#{command}'."
-        end
-      end
-
-      project    = Pathname.new(dir)
-      old_config = project + 'bolt.yaml'
-      config     = project + 'bolt-project.yaml'
-      puppetfile = project + 'Puppetfile'
-      moduledir  = project + 'modules'
-
-      # Warn the user if the project directory already exists. We don't error
-      # here since users might not have installed any modules yet. If both
-      # bolt.yaml and bolt-project.yaml exist, this will just warn about
-      # bolt-project.yaml and subsequent Bolt actions will warn about both files
-      # existing.
-      if config.exist?
-        @logger.warn "Found existing project directory at #{project}. Skipping file creation."
-      elsif old_config.exist?
-        @logger.warn "Found existing #{old_config.basename} at #{project}. "\
-                    "#{old_config.basename} is deprecated, please rename to #{config.basename}."
-      end
-
-      # If modules were specified, first check if there is already a Puppetfile
-      # at the project directory, erroring if there is. If there is no
-      # Puppetfile, install the specified modules. The module installer will
-      # resolve dependencies, generate a Puppetfile, and install the modules.
-      if options[:modules]
-        if puppetfile.exist?
-          raise Bolt::CLIError,
-                "Found existing Puppetfile at #{puppetfile}, unable to initialize "\
-                "project with modules."
-        end
-
-        installer = Bolt::ModuleInstaller.new(outputter, pal)
-        installer.install(options[:modules], puppetfile, moduledir)
-      end
-
-      # If either bolt.yaml or bolt-project.yaml exist, the user has already
-      # been warned and we can just finish project creation. Otherwise, create a
-      # bolt-project.yaml with the project name in it.
-      unless config.exist? || old_config.exist?
-        begin
-          content = { 'name' => name }
-          File.write(config.to_path, content.to_yaml)
-          outputter.print_message "Successfully created Bolt project at #{project}"
-        rescue StandardError => e
-          raise Bolt::FileError.new("Could not create bolt-project.yaml at #{project}: #{e.message}", nil)
-        end
-      end
-
-      0
-    end
-
     # Installs modules declared in the project configuration file.
     #
     def install_project_modules(project, force, resolve)

data/lib/bolt/config.rb

@@ -7,6 +7,7 @@ require 'bolt/project'
 require 'bolt/logger'
 require 'bolt/util'
 require 'bolt/config/options'
+require 'bolt/config/validator'
 
 module Bolt
   class UnknownTransportError < Bolt::Error
@@ -32,53 +33,97 @@ 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.
+               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.
+               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?
+    def self.defaults_schema
+      base      = OPTIONS.slice(*BOLT_DEFAULTS_OPTIONS)
+      inventory = INVENTORY_OPTIONS.each_with_object({}) do |(option, definition), acc|
+        acc[option] = TRANSPORT_CONFIG.key?(option) ? definition.merge(TRANSPORT_CONFIG[option].schema) : definition
+      end
+
+      base['inventory-config'][:properties] = inventory
+      base
+    end
 
+    def self.bolt_schema
+      inventory = INVENTORY_OPTIONS.each_with_object({}) do |(option, definition), acc|
+        acc[option] = TRANSPORT_CONFIG.key?(option) ? definition.merge(TRANSPORT_CONFIG[option].schema) : definition
+      end
+
+      OPTIONS.slice(*BOLT_OPTIONS).merge(inventory)
+    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 +139,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 +152,18 @@ module Bolt
         )
       end
 
+      # Validate the config against the schema. This will raise a single error
+      # with all validation errors.
+      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,19 +206,31 @@ 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." }]
 
+      # Validate the config against the schema. This will raise a single error
+      # with all validation errors.
+      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,12 +276,14 @@ module Bolt
       @config_files = []
 
       default_data = {
+        'apply-settings'      => {},
         'apply_settings'      => {},
         'color'               => true,
         'compile-concurrency' => Etc.nprocessors,
         'concurrency'         => default_concurrency,
         'format'              => 'human',
         'log'                 => { 'console' => {} },
+        'plugin-hooks'        => {},
         'plugin_hooks'        => {},
         'plugins'             => {},
         'puppetdb'            => {},
@@ -271,7 +343,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 +352,9 @@ module Bolt
 
       overrides['trace'] = opts['trace'] if opts.key?('trace')
 
+      # Validate the overrides
+      Validator.new.validate(overrides, OPTIONS, 'command line')
+
       overrides
     end
 
@@ -296,7 +371,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 +408,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 puppetfile].each do |opt|
+        @data[opt] = @data[opt].slice(*OPTIONS.dig(opt, :properties).keys)
+      end
     end
 
     private def normalize_log(target)
@@ -397,37 +473,18 @@ 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
@@ -513,7 +570,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,7 +589,18 @@ 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