bolt 2.42.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d520aad8f699a4a52849ac189a6368b799238996a0c4dae22e75f2abfbe43eff
-  data.tar.gz: befcf8835708c4ec4605e560dfd060680a6d680b7614bfd3d4d4baba7fb7cfa5
+  metadata.gz: 7e32573bc97fea7eca64b7c915cb4b462e1325fb5d4dcbe95c48c72aae8c0e14
+  data.tar.gz: abb279c5a363092ca37ddf4eac9de665de9f79aa74c9e0af9697910b336b7b93
 SHA512:
-  metadata.gz: 0f25f959178fe587c518723cdc1dffd7bd420ea1d943ff1dcfda410cffd0ad592d3cd5714f5d4707dc9a4aa6fec0eb3103382a0266bf56f0625c2c06bc325f98
-  data.tar.gz: 7b05c93e0f507429bd5c43d5a0d0ed51f42d8ac1c0621c1c125ac1905a193a09e6802bb898f90650f7b95d8b0a2c5c513adbf93b3626d109936a447dcfaaf3dd
+  metadata.gz: 23bf7042750c180eb618eaafd8af34e014deb5c7ab0dadcce316e92c3aa66e62ae85e89e96f471cc54f17c81eba463f73b776e9aa4581219567ed15876722967
+  data.tar.gz: bcd1eb6192f5ac92959088edfbe7b333dcb9ed63f6da7a36a6274d72cbce32e77f4f01a8427edec78be3dd9caeab2472ec3691d846108367df407187606ba2ae

data/Puppetfile

@@ -5,14 +5,14 @@ forge "http://forge.puppetlabs.com"
 moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
-mod 'puppetlabs-service', '1.4.0'
-mod 'puppetlabs-puppet_agent', '4.3.0'
-mod 'puppetlabs-facts', '1.3.0'
+mod 'puppetlabs-service', '2.0.0'
+mod 'puppetlabs-puppet_agent', '4.4.0'
+mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
-mod 'puppetlabs-augeas_core', '1.1.1'
+mod 'puppetlabs-augeas_core', '1.1.2'
 mod 'puppetlabs-host_core', '1.0.3'
-mod 'puppetlabs-scheduled_task', '2.3.1'
+mod 'puppetlabs-scheduled_task', '3.0.0'
 mod 'puppetlabs-sshkeys_core', '2.2.0'
 mod 'puppetlabs-zfs_core', '1.2.0'
 mod 'puppetlabs-cron_core', '1.0.5'
@@ -22,26 +22,28 @@ mod 'puppetlabs-yumrepo_core', '1.0.7'
 mod 'puppetlabs-zone_core', '1.0.3'
 
 # Useful additional modules
-mod 'puppetlabs-package', '1.4.0'
-mod 'puppetlabs-puppet_conf', '0.8.0'
-mod 'puppetlabs-python_task_helper', '0.4.3'
-mod 'puppetlabs-reboot', '3.1.0'
-mod 'puppetlabs-ruby_task_helper', '0.5.1'
-mod 'puppetlabs-ruby_plugin_helper', '0.1.0'
-mod 'puppetlabs-stdlib', '6.5.0'
+mod 'puppetlabs-package', '2.0.0'
+mod 'puppetlabs-powershell_task_helper', '0.1.0'
+mod 'puppetlabs-puppet_conf', '1.0.0'
+mod 'puppetlabs-python_task_helper', '0.5.0'
+mod 'puppetlabs-reboot', '4.0.0'
+mod 'puppetlabs-ruby_task_helper', '0.6.0'
+mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
+mod 'puppetlabs-stdlib', '7.0.0'
 
 # Plugin modules
-mod 'puppetlabs-aws_inventory', '0.5.2'
-mod 'puppetlabs-azure_inventory', '0.4.1'
-mod 'puppetlabs-gcloud_inventory', '0.1.3'
-mod 'puppetlabs-http_request', '0.2.1'
+mod 'puppetlabs-aws_inventory', '0.6.0'
+mod 'puppetlabs-azure_inventory', '0.5.0'
+mod 'puppetlabs-gcloud_inventory', '0.2.0'
+mod 'puppetlabs-http_request', '0.2.2'
 mod 'puppetlabs-pkcs7', '0.1.1'
-mod 'puppetlabs-secure_env_vars', '0.1.0'
-mod 'puppetlabs-terraform', '0.5.0'
-mod 'puppetlabs-vault', '0.3.0'
+mod 'puppetlabs-secure_env_vars', '0.2.0'
+mod 'puppetlabs-terraform', '0.6.1'
+mod 'puppetlabs-vault', '0.4.0'
 mod 'puppetlabs-yaml', '0.2.0'
 
 # If we don't list these modules explicitly, r10k will purge them
 mod 'canary', local: true
 mod 'aggregate', local: true
 mod 'puppetdb_fact', local: true
+mod 'puppet_connect', local: true

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

@@ -7,7 +7,7 @@ require 'bolt/error'
 # > **Note:** Not available in apply block
 Puppet::Functions.create_function(:add_facts) do
   # @param target A target.
-  # @param facts A hash of fact names to values that may include structured facts.
+  # @param facts A hash of fact names to values that can include structured facts.
   # @return A `Target` object.
   # @example Adding facts to a target
   #   add_facts($target, { 'os' => { 'family' => 'windows', 'name' => 'windows' } })

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bolt/logger'
 require 'bolt/task'
 
 # Installs the `puppet-agent` package on targets if needed, then collects facts,
@@ -131,10 +132,20 @@ Puppet::Functions.create_function(:apply_prep) do
         task = applicator.custom_facts_task
         arguments = { 'plugins' => Puppet::Pops::Types::PSensitiveType::Sensitive.new(plugins) }
         results = executor.run_task(targets, task, arguments)
+
         # TODO: Standardize RunFailure type with error above
         raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
 
         results.each do |result|
+          # Log a warning if the client version is < 6
+          if unsupported_puppet?(result['clientversion'])
+            Bolt::Logger.deprecate(
+              "unsupported_puppet",
+              "Detected unsupported Puppet agent version #{result['clientversion']} on target "\
+              "#{result.target}. Bolt supports Puppet agent 6.0.0 and higher."
+            )
+          end
+
           inventory.add_facts(result.target, result.value)
         end
       end
@@ -143,4 +154,18 @@ Puppet::Functions.create_function(:apply_prep) do
     # Return nothing
     nil
   end
+
+  # Returns true if the client's major version is < 6.
+  #
+  private def unsupported_puppet?(client_version)
+    if client_version.nil?
+      false
+    else
+      begin
+        Integer(client_version.split('.').first) < 6
+      rescue StandardError
+        false
+      end
+    end
+  end
 end

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

@@ -12,14 +12,12 @@ Puppet::Functions.create_function(:parallelize, Puppet::Functions::InternalFunct
   # @param data The array to apply the block to.
   # @return [Array] An array of PlanResult objects. Each input from the input
   #   array returns a corresponding PlanResult object.
-  # @example Execute two tasks on multiple targets. Once the task finishes on one
-  #   target, that target can move to the next step without waiting for the task
-  #   to finish on the second target.
-  # $targets = get_targets(["host1", "host2"])
-  # $result = parallelize ($targets) |$t| {
-  #   run_task('a', $t)
-  #   run_task('b', $t)
-  # }
+  # @example Execute two tasks on two targets.
+  #   $targets = get_targets(["host1", "host2"])
+  #   $result = parallelize ($targets) |$t| {
+  #     run_task('a', $t)
+  #     run_task('b', $t)
+  #   }
   dispatch :parallelize do
     scope_param
     param 'Array[Any]', :data

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

@@ -256,7 +256,7 @@ Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction
     if nodes_param
       if params['nodes']
         raise ArgumentError,
-              "A plan's 'nodes' parameter may be specified as the second positional argument to " \
+              "A plan's 'nodes' parameter can be specified as the second positional argument to " \
               "run_plan(), but in that case 'nodes' must not be specified in the named arguments " \
               "hash."
       end
@@ -265,7 +265,7 @@ Puppet::Functions.create_function(:run_plan, Puppet::Functions::InternalFunction
     elsif targets_param
       if params['targets']
         raise ArgumentError,
-              "A plan's 'targets' parameter may be specified as the second positional argument to " \
+              "A plan's 'targets' parameter can be specified as the second positional argument to " \
               "run_plan(), but in that case 'targets' must not be specified in the named arguments " \
               "hash."
       end

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

@@ -6,19 +6,24 @@
 # > **Note:** Not available in apply block
 Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFunction) do
   # Run a script.
-  # @param script Path to a script to run on target. May be an absolute path or a modulename/filename selector for a
+  # @param script Path to a script to run on target. Can be an absolute path or a modulename/filename selector for a
   #               file in $MODULEROOT/files.
   # @param targets A pattern identifying zero or more targets. See {get_targets} for accepted patterns.
   # @param options A hash of additional options.
   # @option options [Array[String]] arguments An array of arguments to be passed to the script.
+  #   Cannot be used with `pwsh_params`.
+  # @option options [Hash] pwsh_params Map of named parameters to pass to a PowerShell script.
+  #   Cannot be used with `arguments`.
   # @option options [Boolean] _catch_errors Whether to catch raised errors.
   # @option options [String] _run_as User to run as using privilege escalation.
-  # @option options [Hash] _env_vars Map of environment variables to set
+  # @option options [Hash] _env_vars Map of environment variables to set.
   # @return A list of results, one entry per target.
   # @example Run a local script on Linux targets as 'root'
   #   run_script('/var/tmp/myscript', $targets, '_run_as' => 'root')
   # @example Run a module-provided script with arguments
   #   run_script('iis/setup.ps1', $target, 'arguments' => ['/u', 'Administrator'])
+  # @example Pass named parameters to a PowerShell script
+  #   run_script('iis/setup.ps1', $target, 'pwsh_params' => { 'User' => 'Administrator' })
   dispatch :run_script do
     scope_param
     param 'String[1]', :script
@@ -28,15 +33,18 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
   end
 
   # Run a script, logging the provided description.
-  # @param script Path to a script to run on target. May be an absolute path or a modulename/filename selector for a
+  # @param script Path to a script to run on target. Can be an absolute path or a modulename/filename selector for a
   #               file in $MODULEROOT/files.
   # @param targets A pattern identifying zero or more targets. See {get_targets} for accepted patterns.
   # @param description A description to be output when calling this function.
   # @param options A hash of additional options.
   # @option options [Array[String]] arguments An array of arguments to be passed to the script.
+  #   Cannot be used with `pwsh_params`.
+  # @option options [Hash] pwsh_params Map of named parameters to pass to a PowerShell script.
+  #   Cannot be used with `arguments`.
   # @option options [Boolean] _catch_errors Whether to catch raised errors.
   # @option options [String] _run_as User to run as using privilege escalation.
-  # @option options [Hash] _env_vars Map of environment variables to set
+  # @option options [Hash] _env_vars Map of environment variables to set.
   # @return A list of results, one entry per target.
   # @example Run a script
   #   run_script('/var/tmp/myscript', $targets, 'Downloading my application')
@@ -59,9 +67,23 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
         .from_issue_and_stack(Bolt::PAL::Issues::PLAN_OPERATION_NOT_SUPPORTED_WHEN_COMPILING, action: 'run_script')
     end
 
+    if options.key?('arguments') && options.key?('pwsh_params')
+      raise Bolt::ValidationError, "Cannot specify both 'arguments' and 'pwsh_params'"
+    end
+
+    if options.key?('pwsh_params') && !options['pwsh_params'].is_a?(Hash)
+      raise Bolt::ValidationError, "Option 'pwsh_params' must be a hash"
+    end
+
+    if options.key?('arguments') && !options['arguments'].is_a?(Array)
+      raise Bolt::ValidationError, "Option 'arguments' must be an array"
+    end
+
     arguments = options['arguments'] || []
+    pwsh_params = options['pwsh_params']
     options = options.select { |opt| opt.start_with?('_') }.transform_keys { |k| k.sub(/^_/, '').to_sym }
     options[:description] = description if description
+    options[:pwsh_params] = pwsh_params if pwsh_params
 
     executor = Puppet.lookup(:bolt_executor)
     inventory = Puppet.lookup(:bolt_inventory)
@@ -80,7 +102,7 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
         Puppet::Pops::Issues::NOT_A_FILE, file: script
       )
     end
-
+    executor.report_file_source(self.class.name, script)
     # Ensure that given targets are all Target instances)
     targets = inventory.get_targets(targets)
 

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

@@ -76,7 +76,7 @@ Puppet::Functions.create_function(:upload_file, Puppet::Functions::InternalFunct
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: source
       )
     end
-
+    executor.report_file_source(self.class.name, source)
     # Ensure that that given targets are all Target instances
     targets = inventory.get_targets(targets)
     if targets.empty?

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

@@ -2,7 +2,11 @@
 
 require 'bolt/util'
 
-# Wait until all targets accept connections.
+# Wait until all targets accept connections. This function allows a plan execution to wait for a customizable
+# amount of time via the `wait_time` option until a target connection can be reestablished. The plan proceeds
+# to the next step if the connection fails to reconnect in the time specified (default: 120 seconds). A typical
+# use case for this function is if your plan reboots a remote host and the plan needs to wait for the host to reconnect
+# before it continues to the next step.
 #
 # > **Note:** Not available in apply block
 Puppet::Functions.create_function(:wait_until_available) do
@@ -10,8 +14,8 @@ Puppet::Functions.create_function(:wait_until_available) do
   # @param targets A pattern identifying zero or more targets. See {get_targets} for accepted patterns.
   # @param options A hash of additional options.
   # @option options [String] description A description for logging. (default: 'wait until available')
-  # @option options [Numeric] wait_time The time to wait. (default: 120)
-  # @option options [Numeric] retry_interval The interval to wait before retrying. (default: 1)
+  # @option options [Numeric] wait_time The time to wait, in seconds. (default: 120)
+  # @option options [Numeric] retry_interval The interval to wait before retrying, in seconds. (default: 1)
   # @option options [Boolean] _catch_errors Whether to catch raised errors.
   # @return A list of results, one entry per target. Successful results have no value.
   # @example Wait for targets

data/bolt-modules/file/lib/puppet/functions/file/read.rb

@@ -17,7 +17,8 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
 
   def read(scope, filename)
     # Send Analytics Report
-    Puppet.lookup(:bolt_executor) {}&.report_function_call(self.class.name)
+    executor = Puppet.lookup(:bolt_executor) {}
+    executor&.report_function_call(self.class.name)
 
     found = Puppet::Parser::Files.find_file(filename, scope.compiler.environment)
     unless found && Puppet::FileSystem.exist?(found)
@@ -25,7 +26,7 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: filename
       )
     end
-
+    executor&.report_file_source(self.class.name, filename)
     File.read(found)
   end
 end

data/lib/bolt/analytics.rb

@@ -78,7 +78,7 @@ module Bolt
         Bolt::Util.read_optional_yaml_hash(filename, 'analytics')
       else
         unless ENV['BOLT_DISABLE_ANALYTICS']
-          Bolt::Logger.warn_once('analytics_opt_out', <<~ANALYTICS)
+          msg = <<~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 :
@@ -86,7 +86,8 @@ module Bolt
 
             Read more about what data Bolt collects and why here:
               https://puppet.com/docs/bolt/latest/bolt_installing.html#analytics-data-collection
-            ANALYTICS
+          ANALYTICS
+          Bolt::Logger.warn_once('analytics_opt_out', msg)
         end
 
         {}

data/lib/bolt/applicator.rb

@@ -125,7 +125,16 @@ module Bolt
           @logger.send(bolt_level, "#{target.name}: #{message}")
         end
       end
-      raise ApplyError.new(target.name, result['message']) unless stat.success?
+
+      unless stat.success?
+        message = if @apply_settings['trace'] && result['backtrace']
+                    ([result['message']] + result['backtrace']).join("\n  ")
+                  else
+                    result['message']
+                  end
+        raise ApplyError.new(target.name, message)
+      end
+
       result
     end
 
@@ -236,6 +245,7 @@ module Bolt
                           else
                             Bolt::ApplyError.new(batch_target, future.reason.message)
                           end
+
                   result = Bolt::ApplyResult.new(batch_target, error: error.to_h)
                   @executor.publish_event(type: :node_result, result: result)
                   result

data/lib/bolt/apply_result.rb

@@ -54,7 +54,7 @@ module Bolt
       unless missing_keys.empty?
         if result['_output']
           # rubocop:disable Layout/LineLength
-          msg = "Report result contains an '_output' key. Catalog application may have printed extraneous output to stdout: #{result['_output']}"
+          msg = "Report result contains an '_output' key. Catalog application might have printed extraneous output to stdout: #{result['_output']}"
           # rubocop:enable Layout/LineLength
         else
           msg = "Report did not contain all expected keys missing: #{missing_keys.join(', ')}"

data/lib/bolt/bolt_option_parser.rb

@@ -6,15 +6,15 @@ require 'optparse'
 
 module Bolt
   class BoltOptionParser < OptionParser
-    PROJECT_PATHS = %w[project configfile boltdir].freeze
-    OPTIONS = { inventory: %w[targets query rerun description],
+    PROJECT_PATHS = %w[project].freeze
+    OPTIONS = { inventory: %w[targets query rerun],
                 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: 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 clear-cache] }.freeze
+                display: %w[format color verbose trace stream],
+                global: %w[help version log-level clear-cache] }.freeze
 
     ACTION_OPTS = OPTIONS.values.flatten.freeze
 
@@ -114,21 +114,6 @@ module Bolt
           { flags: OPTIONS[:global],
             banner: PROJECT_HELP }
         end
-      when 'puppetfile'
-        case action
-        when 'install'
-          { flags: OPTIONS[:global] + OPTIONS[:global_config_setters] + %w[puppetfile],
-            banner: PUPPETFILE_INSTALL_HELP }
-        when 'show-modules'
-          { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
-            banner: PUPPETFILE_SHOWMODULES_HELP }
-        when 'generate-types'
-          { flags: OPTIONS[:global] + OPTIONS[:global_config_setters],
-            banner: PUPPETFILE_GENERATETYPES_HELP }
-        else
-          { flags: OPTIONS[:global],
-            banner: PUPPETFILE_HELP }
-        end
       when 'script'
         case action
         when 'run'
@@ -192,7 +177,6 @@ module Bolt
           module            Manage Bolt project modules
           plan              Convert, create, show, and run Bolt plans
           project           Create and migrate Bolt projects
-          puppetfile        Install and list modules and generate type references
           script            Upload a local script and run it remotely
           secret            Create encryption keys and encrypt and decrypt values
           task              Show and run Bolt tasks
@@ -470,7 +454,7 @@ module Bolt
       DESCRIPTION
           Convert a YAML plan to a Puppet language plan and print the converted plan to stdout.
 
-          Converting a YAML plan may result in a plan that is syntactically
+          Converting a YAML plan might result in a plan that is syntactically
           correct but has different behavior. Always verify a converted plan's
           functionality. Note that the converted plan is not written to a file.
 
@@ -576,55 +560,6 @@ module Bolt
           Migrate a Bolt project to use current best practices and the latest version of configuration files.
     HELP
 
-    PUPPETFILE_HELP = <<~HELP
-      NAME
-          puppetfile
-
-      USAGE
-          bolt puppetfile <action> [options]
-
-      DESCRIPTION
-          Install and list modules and generate type references
-
-      ACTIONS
-          generate-types        Generate type references to register in plans
-          install               Install modules from a Puppetfile into a project
-          show-modules          List modules available to the Bolt project
-    HELP
-
-    PUPPETFILE_GENERATETYPES_HELP = <<~HELP
-      NAME
-          generate-types
-
-      USAGE
-          bolt puppetfile generate-types [options]
-
-      DESCRIPTION
-          Generate type references to register in plans.
-    HELP
-
-    PUPPETFILE_INSTALL_HELP = <<~HELP
-      NAME
-          install
-
-      USAGE
-          bolt puppetfile install [options]
-
-      DESCRIPTION
-          Install modules from a Puppetfile into a project
-    HELP
-
-    PUPPETFILE_SHOWMODULES_HELP = <<~HELP
-      NAME
-          show-modules
-
-      USAGE
-          bolt puppetfile show-modules [options]
-
-      DESCRIPTION
-          List modules available to the Bolt project.
-    HELP
-
     SCRIPT_HELP = <<~HELP
       NAME
           script
@@ -760,13 +695,10 @@ module Bolt
             bolt task show canary
     HELP
 
-    attr_reader :deprecations
-
     def initialize(options)
       super()
 
       @options = options
-      @deprecations = []
 
       separator "\nINVENTORY OPTIONS"
       define('-t', '--targets TARGETS',
@@ -775,7 +707,7 @@ module Bolt
              "Or read a target list from an input file '@<file>' or stdin '-'.",
              'Example: --targets localhost,target_group,ssh://nix.com:23,winrm://windows.puppet.com',
              'URI format is [protocol://]host[:port]',
-             "SSH is the default protocol; may be #{TRANSPORTS.keys.join(', ')}",
+             "SSH is the default protocol; can be #{TRANSPORTS.keys.join(', ')}",
              'For Windows targets, specify the winrm:// protocol if it has not be configured',
              'For SSH, port defaults to `22`',
              'For WinRM, port defaults to `5985` or `5986` based on the --[no-]ssl setting') do |targets|
@@ -794,13 +726,6 @@ module Bolt
       define('--noop', 'See what changes Bolt will make without actually executing the changes') do |_|
         @options[:noop] = true
       end
-      define('--description 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',
              "Parameters to a task or plan as json, a json file '@<file>', or on stdin '-'") do |params|
         @options[:task_options] = parse_params(params)
@@ -878,27 +803,10 @@ module Bolt
           File.expand_path(moduledir)
         end
       end
-      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',
-             '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',
              'Specify where to load Hiera config from (default: ~/.puppetlabs/bolt/hiera.yaml)') do |path|
         @options[:'hiera-config'] = File.expand_path(path)
@@ -910,17 +818,6 @@ module Bolt
         end
         @options[:inventoryfile] = File.expand_path(path)
       end
-      define('--puppetfile PATH',
-             'Deprecated. Specify a Puppetfile to use when installing modules.',
-             ' (default: ~/.puppetlabs/bolt/Puppetfile)',
-             'Modules are installed in the current project.') do |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
       end
@@ -991,6 +888,9 @@ module Bolt
       define('-v', '--[no-]verbose', 'Display verbose logging') do |value|
         @options[:verbose] = value
       end
+      define('--stream', 'Stream output from scripts and commands to the console') do |_|
+        @options[:stream] = true
+      end
       define('--trace', 'Display error stack traces') do |_|
         @options[:trace] = true
       end
@@ -1013,13 +913,6 @@ module Bolt
         puts Bolt::VERSION
         raise Bolt::CLIExit
       end
-      define('--debug', 'Display debug logging') do |_|
-        @options[:debug] = true
-        # We don't actually set '--log-level debug' here, but once the options are evaluated by
-        # the config class the end result is the same.
-        msg = "Command line option '--debug' is deprecated, set '--log-level debug' instead."
-        @deprecations << { type: 'Using --debug instead of --log-level debug', msg: msg }
-      end
       define('--log-level LEVEL',
              "Set the log level for the console. Available options are",
              "trace, debug, info, warn, error, fatal, any.") do |level|