bolt 2.44.0 → 3.4.0

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
@@ -772,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|
@@ -791,15 +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|
-        Bolt::Logger.deprecate(
-          "description_cli_option",
-          "Command line option '--description' is deprecated, and will be "\
-          "removed in Bolt 3.0."
-        )
-        @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)
@@ -877,31 +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|
-        Bolt::Logger.deprecate(
-          "boltdir_cli_option",
-          "Command line option '--boltdir' is deprecated, use '--project' instead."
-        )
-        @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|
-        Bolt::Logger.deprecate(
-          "configfile_cli_option",
-          "Command line option '--configfile' is deprecated, and " \
-          "will be removed in Bolt 3.0. Use '--project' and provide the "\
-          "directory path instead."
-        )
-        @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)
@@ -913,19 +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'
-        Bolt::Logger.deprecate(
-          "puppetfile_cli_option",
-          "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}'."
-        )
-        @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
@@ -996,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
@@ -1018,15 +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.
-        Bolt::Logger.deprecate(
-          "debug_cli_option",
-          "Command line option '--debug' is deprecated, set '--log-level debug' instead."
-        )
-      end
       define('--log-level LEVEL',
              "Set the log level for the console. Available options are",
              "trace, debug, info, warn, error, fatal, any.") do |level|

data/lib/bolt/cli.rb

@@ -33,19 +33,18 @@ module Bolt
 
   class CLI
     COMMANDS = {
-      'command'    => %w[run],
-      'script'     => %w[run],
-      'task'       => %w[show run],
-      'plan'       => %w[show run convert new],
-      'file'       => %w[download upload],
-      'puppetfile' => %w[install show-modules generate-types],
-      'secret'     => %w[encrypt decrypt createkeys],
-      'inventory'  => %w[show],
-      'group'      => %w[show],
-      'project'    => %w[init migrate],
-      'module'     => %w[add generate-types install show],
-      'apply'      => %w[],
-      'guide'      => %w[]
+      'command' => %w[run],
+      'script' => %w[run],
+      'task' => %w[show run],
+      'plan' => %w[show run convert new],
+      'file' => %w[download upload],
+      'secret' => %w[encrypt decrypt createkeys],
+      'inventory' => %w[show],
+      'group' => %w[show],
+      'project' => %w[init migrate],
+      'module' => %w[add generate-types install show],
+      'apply' => %w[],
+      'guide' => %w[]
     }.freeze
 
     attr_reader :config, :options
@@ -97,6 +96,48 @@ module Bolt
       finalize_setup
     end
 
+    # Prints a welcome message when users first install Bolt and run `bolt`, `bolt help` or `bolt --help`
+    def welcome_message
+      bolt = <<~BOLT
+                   `.::-`
+              `.-:///////-.`
+           `-:////:.  `-:///:-  /ooo.                        .ooo/
+       `.-:///::///:-`   `-//:  ymmm-                        :mmmy  .---.
+      :///:-.   `.:////.  -//:  ymmm-                        :mmmy  +mmm+
+      ://.          ///.  -//:  ymmm--/++/-       `-/++/:`   :mmmy-:smmms::-
+      ://.          ://. .://:  ymmmdmmmmmmdo`  .smmmmmmmmh: :mmmysmmmmmmmms
+      ://.          ://:///:-.  ymmmh/--/hmmmy -mmmd/-.:hmmm+:mmmy.-smmms--.
+      ://:.`      .-////:-`     ymmm-     ymmm:hmmm-    `dmmm/mmmy  +mmm+
+      `-:///:-..:///:-.`        ymmm-     ommm/dmmm`     hmmm+mmmy  +mmm+
+         `.-:////:-`            ymmm+    /mmmm.ommms`   /mmmh:mmmy  +mmmo
+             `-.`               ymmmmmhhmmmmd:  ommmmhydmmmy`:mmmy  -mmmmdhd
+                                oyyy+shddhs/`    .+shddhy+-  -yyyo   .ohddhs
+
+
+      BOLT
+      example_cmd = if Bolt::Util.windows?
+                      "Invoke-BoltCommand -Command 'hostname' -Targets localhost"
+                    else
+                      "bolt command run 'hostname' --target localhost"
+                    end
+      prev_cmd = String.new("bolt")
+      prev_cmd << " #{@argv[0]}" unless @argv.empty?
+
+      message = <<~MSG
+      🎉 Welcome to Bolt #{VERSION}
+      😌 We're here to help bring order to the chaos
+      📖 Find our documentation at https://bolt.guide
+      🙋 Ask a question in #bolt on https://slack.puppet.com/
+      🔩 Contribute at https://github.com/puppetlabs/bolt/
+      💡 Not sure where to start? Try "#{example_cmd}"
+
+      We only print this message once. Run "#{prev_cmd}" again for help text.
+      MSG
+
+      $stdout.print "\033[36m#{bolt}\033[0m"
+      $stdout.print message
+    end
+
     # Parses the command and validates options. All errors that are raised here
     # are not handled by the outputter, as it relies on config being loaded.
     def parse_command
@@ -108,6 +149,16 @@ module Bolt
         # help text
         options[:subcommand] = nil unless COMMANDS.include?(options[:subcommand])
 
+        if Bolt::Util.first_run?
+          FileUtils.mkdir_p(Bolt::Util.first_runs_free.dirname)
+          FileUtils.touch(Bolt::Util.first_runs_free)
+
+          if options[:subcommand].nil? && $stdout.isatty
+            welcome_message
+            raise Bolt::CLIExit
+          end
+        end
+
         # Update the parser for the subcommand (or lack thereof)
         parser.update
         puts parser.help
@@ -155,25 +206,19 @@ module Bolt
     # Loads the project and configuration. All errors that are raised here are not
     # handled by the outputter, as it relies on config being loaded.
     def load_config
-      @config = if ENV['BOLT_PROJECT']
-                  project = Bolt::Project.create_project(ENV['BOLT_PROJECT'], 'environment')
-                  Bolt::Config.from_project(project, options)
-                elsif options[:configfile]
-                  Bolt::Config.from_file(options[:configfile], options)
+      project = if ENV['BOLT_PROJECT']
+                  Bolt::Project.create_project(ENV['BOLT_PROJECT'], 'environment')
+                elsif options[:project]
+                  dir = Pathname.new(options[:project])
+                  if (dir + Bolt::Project::BOLTDIR_NAME).directory?
+                    Bolt::Project.create_project(dir + Bolt::Project::BOLTDIR_NAME)
+                  else
+                    Bolt::Project.create_project(dir)
+                  end
                 else
-                  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
-                                Bolt::Project.create_project(dir)
-                              end
-                            else
-                              Bolt::Project.find_boltdir(Dir.pwd)
-                            end
-                  Bolt::Config.from_project(project, options)
+                  Bolt::Project.find_boltdir(Dir.pwd)
                 end
+      @config = Bolt::Config.from_project(project, options)
     rescue Bolt::Error => e
       fatal_error(e)
       raise e
@@ -182,6 +227,7 @@ module Bolt
     # Completes the setup process by configuring Bolt and log messages
     def finalize_setup
       Bolt::Logger.configure(config.log, config.color, config.disable_warnings)
+      Bolt::Logger.stream = config.stream
       Bolt::Logger.analytics = analytics
       Bolt::Logger.flush_queue
 
@@ -210,9 +256,8 @@ module Bolt
 
         return unless !stdout.empty? && stdout.to_i < 3
 
-        msg = "Detected PowerShell 2 on controller. PowerShell 2 is deprecated and "\
-              "support will be removed in Bolt 3.0."
-        Bolt::Logger.deprecate("powershell_2_controller", msg)
+        msg = "Detected PowerShell 2 on controller. PowerShell 2 is unsupported."
+        Bolt::Logger.deprecation_warning("powershell_2_controller", msg)
       end
     end
 
@@ -220,7 +265,7 @@ module Bolt
       target_opts = options.keys.select { |opt| %i[query rerun targets].include?(opt) }
       target_string = "'--targets', '--rerun', or '--query'"
       if target_opts.length > 1
-        raise Bolt::CLIError, "Only one targeting option #{target_string} may be specified"
+        raise Bolt::CLIError, "Only one targeting option #{target_string} can be specified"
       elsif target_opts.empty? && options[:subcommand] != 'plan'
         raise Bolt::CLIError, "Command requires a targeting option: #{target_string}"
       end
@@ -257,11 +302,14 @@ module Bolt
         end
       end
 
-      if %w[task plan].include?(options[:subcommand]) && options[:action] == 'run'
+      if %w[task plan script].include?(options[:subcommand]) && options[:action] == 'run'
         if options[:object].nil?
           raise Bolt::CLIError, "Must specify a #{options[:subcommand]} to run"
         end
-        # This may mean that we parsed a parameter as the object
+      end
+
+      # This may mean that we parsed a parameter as the object
+      if %w[task plan].include?(options[:subcommand]) && options[:action] == 'run'
         unless options[:object] =~ /\A([a-z][a-z0-9_]*)?(::[a-z][a-z0-9_]*)*\Z/
           raise Bolt::CLIError,
                 "Invalid #{options[:subcommand]} '#{options[:object]}'"
@@ -306,26 +354,18 @@ module Bolt
               "Unknown argument(s) #{options[:leftovers].join(', ')}"
       end
 
-      if options.slice(:boltdir, :configfile, :project).length > 1
-        raise Bolt::CLIError, "Only one of '--boltdir', '--project', or '--configfile' may be specified"
-      end
-
       if options[:noop] &&
          !(options[:subcommand] == 'task' && options[:action] == 'run') && options[:subcommand] != 'apply'
         raise Bolt::CLIError,
-              "Option '--noop' may only be specified when running a task or applying manifest code"
+              "Option '--noop' can only be specified when running a task or applying manifest code"
       end
 
       if options[:env_vars]
         unless %w[command script].include?(options[:subcommand]) && options[:action] == 'run'
           raise Bolt::CLIError,
-                "Option '--env-var' may only be specified when running a command or script"
+                "Option '--env-var' can only be specified when running a command or script"
         end
       end
-
-      if options.key?(:debug) && options.key?(:log)
-        raise Bolt::CLIError, "Only one of '--debug' or '--log-level' may be specified"
-      end
     end
 
     def handle_parser_errors
@@ -370,7 +410,7 @@ module Bolt
       if inventory_source && conflicting_options.any?
         Bolt::Logger.warn(
           "cli_overrides",
-          "CLI arguments #{conflicting_options.to_a} may be overridden by Inventory: #{inventory_source}"
+          "CLI arguments #{conflicting_options.to_a} might be overridden by Inventory: #{inventory_source}"
         )
       end
     end
@@ -388,7 +428,7 @@ module Bolt
       # Initialize inventory and targets. Errors here are better to catch early.
       # options[:target_args] will contain a string/array version of the targetting options this is passed to plans
       # options[:targets] will contain a resolved set of Target objects
-      unless %w[guide module project puppetfile secret].include?(options[:subcommand]) ||
+      unless %w[guide module project secret].include?(options[:subcommand]) ||
              %w[convert new show].include?(options[:action])
         update_targets(options)
       end
@@ -443,15 +483,12 @@ module Bolt
           list_modules
         end
         return 0
-      when 'show-modules'
-        list_modules
-        return 0
       when 'convert'
         pal.convert_plan(options[:object])
         return 0
       end
 
-      message = 'There may be processes left executing on some nodes.'
+      message = 'There might be processes left executing on some nodes.'
 
       if %w[task plan].include?(options[:subcommand]) && options[:task_options] && !options[:params_parsed] && pal
         options[:task_options] = pal.parse_params(options[:subcommand], options[:object], options[:task_options])
@@ -495,17 +532,6 @@ module Bolt
         when 'generate-types'
           code = generate_types
         end
-      when 'puppetfile'
-        case options[:action]
-        when 'generate-types'
-          code = generate_types
-        when 'install'
-          code = install_puppetfile(
-            config.puppetfile_config,
-            config.puppetfile,
-            config.modulepath.first
-          )
-        end
       when 'secret'
         code = Bolt::Secret.execute(plugins, outputter, options)
       when 'apply'
@@ -523,7 +549,6 @@ module Bolt
 
         elapsed_time = Benchmark.realtime do
           executor_opts = {}
-          executor_opts[:description] = options[:description] if options.key?(:description)
           executor_opts[:env_vars] = options[:env_vars] if options.key?(:env_vars)
           executor.subscribe(outputter)
           executor.subscribe(log_outputter)
@@ -532,16 +557,14 @@ module Bolt
             when 'command'
               executor.run_command(targets, options[:object], executor_opts)
             when 'script'
-              script = options[:object]
-              validate_file('script', script)
-              executor.run_script(targets, script, options[:leftovers], executor_opts)
+              script_path = find_file(options[:object])
+              executor.run_script(targets, script_path, options[:leftovers], executor_opts)
             when 'task'
               pal.run_task(options[:object],
                            targets,
                            options[:task_options],
                            executor,
-                           inventory,
-                           options[:description])
+                           inventory)
             when 'file'
               src = options[:object]
               dest = options[:leftovers].first
@@ -642,7 +665,7 @@ module Bolt
         if plan_arguments['nodes'] || plan_arguments['targets']
           key = plan_arguments.include?('nodes') ? 'nodes' : 'targets'
           raise Bolt::CLIError,
-                "A plan's '#{key}' parameter may be specified using the --#{key} option, but in that " \
+                "A plan's '#{key}' parameter can be specified using the --#{key} option, but in that " \
                 "case it must not be specified as a separate #{key}=<value> parameter nor included " \
                 "in the JSON data passed in the --params option"
         end
@@ -664,7 +687,6 @@ module Bolt
 
       plan_context = { plan_name: plan_name,
                        params: plan_arguments }
-      plan_context[:description] = options[:description] if options[:description]
 
       executor = Bolt::Executor.new(config.concurrency, analytics, options[:noop], config.modified_concurrency)
       if %w[human rainbow].include?(options.fetch(:format, 'human'))
@@ -728,12 +750,10 @@ module Bolt
     end
 
     def list_modules
-      assert_puppetfile_or_module_command(config.project.modules)
       outputter.print_module_list(pal.list_modules)
     end
 
     def generate_types
-      assert_puppetfile_or_module_command(config.project.modules)
       # generate_types will surface a nice error with helpful message if it fails
       pal.generate_types(cache: true)
       0
@@ -743,19 +763,19 @@ module Bolt
     #
     def install_project_modules(project, config, force, resolve)
       assert_project_file(project)
-      assert_puppetfile_or_module_command(project.modules)
 
-      unless project.modules
-        outputter.print_message "Project configuration file #{project.project_file} does not "\
-                                "specify any module dependencies. Nothing to do."
+      if project.modules.empty? && resolve != false
+        outputter.print_message(
+          "Project configuration file #{project.project_file} does not "\
+          "specify any module dependencies. Nothing to do."
+        )
         return 0
       end
 
-      modules   = project.modules || []
       installer = Bolt::ModuleInstaller.new(outputter, pal)
 
       ok = outputter.spin do
-        installer.install(modules,
+        installer.install(project.modules,
                           project.puppetfile,
                           project.managed_moduledir,
                           config,
@@ -770,14 +790,12 @@ module Bolt
     #
     def add_project_module(name, project, config)
       assert_project_file(project)
-      assert_puppetfile_or_module_command(project.modules)
 
-      modules   = project.modules || []
       installer = Bolt::ModuleInstaller.new(outputter, pal)
 
       ok = outputter.spin do
         installer.add(name,
-                      modules,
+                      project.modules,
                       project.puppetfile,
                       project.managed_moduledir,
                       project.project_file,
@@ -808,8 +826,6 @@ module Bolt
     # Loads a Puppetfile and installs its modules.
     #
     def install_puppetfile(puppetfile_config, puppetfile, moduledir)
-      assert_puppetfile_or_module_command(config.project.modules)
-
       outputter.print_message("Installing modules from Puppetfile")
       installer = Bolt::ModuleInstaller.new(outputter, pal)
       ok = outputter.spin do
@@ -819,47 +835,6 @@ module Bolt
       ok ? 0 : 1
     end
 
-    # Raises an error if the 'puppetfile install' command is deprecated due to
-    # modules being configured.
-    #
-    def assert_puppetfile_or_module_command(modules)
-      if Bolt::Util.powershell?
-        case options[:action]
-        when 'generate-types'
-          old_command = 'Register-BoltPuppetfileTypes'
-          new_command = 'Register-BoltModuleTypes'
-        when 'install'
-          old_command = 'Install-BoltPuppetfile'
-          new_command = 'Install-BoltModule'
-        when 'show', 'show-modules'
-          old_command = 'Get-BoltPuppetfileModules'
-          new_command = 'Get-BoltModule'
-        end
-      else
-        old_command = "bolt puppetfile #{options[:action]}"
-        new_command = if options[:action] == 'show-modules'
-                        'bolt module show'
-                      else
-                        "bolt module #{options[:action]}"
-                      end
-      end
-
-      if modules && options[:subcommand] == 'puppetfile'
-        raise Bolt::CLIError,
-              "Unable to use command '#{old_command}' when 'modules' is configured in "\
-              "bolt-project.yaml. Use '#{new_command}' instead."
-      elsif modules.nil? && options[:subcommand] == 'puppetfile'
-        msg = "Command '#{old_command}' is deprecated and will be removed in Bolt 3.0. Update your project to use "\
-              "the module management feature. For more information, see https://pup.pt/bolt-module-migrate."
-        Bolt::Logger.deprecate("puppetfile_command", msg)
-      elsif modules.nil? && options[:subcommand] == 'module'
-        msg  = "Unable to use command '#{new_command}' when 'modules' is not configured in "\
-               "bolt-project.yaml. "
-        msg += "Use '#{old_command}' instead." if options[:action] != 'add'
-        raise Bolt::CLIError, msg
-      end
-    end
-
     def pal
       @pal ||= Bolt::PAL.new(Bolt::Config::Modulepath.new(config.modulepath),
                              config.hiera_config,
@@ -920,6 +895,28 @@ module Bolt
       Bolt::Util.validate_file(type, path, allow_dir)
     end
 
+    # Returns the path to a file. If the path is an absolute or relative to
+    # a file, and the file exists, returns the path as-is. Otherwise, checks if
+    # the path is a Puppet file path and looks for the file in a module's files
+    # directory.
+    #
+    def find_file(path)
+      unless File.exist?(path) || Pathname.new(path).absolute?
+        modulepath = Bolt::Config::Modulepath.new(config.modulepath)
+        modules    = Bolt::Module.discover(modulepath.full_modulepath, config.project)
+        mod, file = path.split(File::SEPARATOR, 2)
+
+        if modules[mod]
+          @logger.debug("Did not find file at #{File.expand_path(path)}, checking in module '#{mod}'")
+          path = File.join(modules[mod].path, 'files', file)
+        end
+      end
+
+      Bolt::Util.validate_file('script', path)
+
+      path
+    end
+
     def rerun
       @rerun ||= Bolt::Rerun.new(config.rerunfile, config.save_rerun)
     end
@@ -948,7 +945,7 @@ module Bolt
       # If the bundled content directory is empty, Bolt is likely installed as a gem.
       if ENV['BOLT_GEM'].nil? && incomplete_install?
         msg = <<~MSG.chomp
-          Bolt may be installed as a gem. To use Bolt reliably and with all of its
+          Bolt might be installed as a gem. To use Bolt reliably and with all of its
           dependencies, uninstall the 'bolt' gem and install Bolt as a package:
           https://puppet.com/docs/bolt/latest/bolt_installing.html
 
@@ -979,7 +976,8 @@ module Bolt
     # Gem installs include the aggregate, canary, and puppetdb_fact modules, while
     # package installs include modules listed in the Bolt repo Puppetfile
     def incomplete_install?
-      (Dir.children(Bolt::Config::Modulepath::MODULES_PATH) - %w[aggregate canary puppetdb_fact secure_env_vars]).empty?
+      builtin_module_list = %w[aggregate canary puppetdb_fact secure_env_vars puppet_connect]
+      (Dir.children(Bolt::Config::Modulepath::MODULES_PATH) - builtin_module_list).empty?
     end
 
     # Mimicks the output from Outputter::Human#fatal_error. This should be used to print