openbolt 5.6.0 → 9.0.0

data/lib/bolt/analytics.rb

@@ -82,16 +82,8 @@ module Bolt
       if File.exist?(filename)
         Bolt::Util.read_optional_yaml_hash(filename, 'analytics')
       else
-        # Remove || true if we fix this for Vox analytics
-        unless ENV['BOLT_DISABLE_ANALYTICS'] || true
-          msg = <<~ANALYTICS
-            Bolt collects data about how you use it. You can opt out of providing this data.
-            To learn how to disable data collection, or see what data Bolt collects and why,
-            see http://pup.pt/bolt-analytics
-          ANALYTICS
-          Bolt::Logger.warn_once('analytics_opt_out', msg)
-        end
-
+        # Analytics are disabled in this fork, so there is nothing to opt out of.
+        # If analytics are revived for Vox, restore an opt-out notice here.
         {}
       end
     end

data/lib/bolt/bolt_option_parser.rb

@@ -216,21 +216,21 @@ module Bolt
           command           Run a command remotely
           file              Copy files between the controller and targets
           group             Show the list of groups in the inventory
-          guide             View guides for Bolt concepts and features
+          guide             View guides for OpenBolt concepts and features
           inventory         Show the list of targets an action would run on
-          module            Manage Bolt project modules
+          module            Manage OpenBolt project modules
           lookup            Look up a value with Hiera
-          plan              Convert, create, show, and run Bolt plans
+          plan              Convert, create, show, and run plans
           plugin            Show available plugins
           policy            Apply, create, and show policies
-          project           Create and migrate Bolt projects
+          project           Create and migrate OpenBolt projects
           script            Upload a local script and run it remotely
           secret            Create encryption keys and encrypt and decrypt values
-          task              Show and run Bolt tasks
+          task              Show and run tasks
 
       #{colorize(:cyan, 'Guides')}
-          For a list of guides on Bolt's concepts and features, run 'bolt guide'.
-          Find Bolt's documentation at https://bolt.guide.
+          For a list of guides on OpenBolt's concepts and features, run 'bolt guide'.
+          Find OpenBolt's documentation at https://docs.openvoxproject.org/openbolt/latest/.
     HELP
 
     APPLY_HELP = <<~HELP
@@ -245,7 +245,7 @@ module Bolt
           Apply Puppet manifest code on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-apply.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/applying_manifest_blocks.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt apply manifest.pp -t target
@@ -263,7 +263,7 @@ module Bolt
           Run a command on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-commands.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Actions')}
           run         Run a command on the specified targets.
@@ -281,7 +281,7 @@ module Bolt
           Run a command on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-commands.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt command run 'uptime' -t target1,target2
@@ -298,7 +298,7 @@ module Bolt
           Copy files and directories between the controller and targets.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-commands.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Actions')}
           download      Download a file or directory to the controller
@@ -322,7 +322,7 @@ module Bolt
           subdirectory of the project directory.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-commands.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt file download /etc/ssh_config ssh_config -t all
@@ -340,7 +340,7 @@ module Bolt
           Upload a local file or directory.
 
       #{colorize(:cyan, 'Documentation')}
-          For documentation see http://pup.pt/bolt-commands.
+          For documentation see https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt file upload /tmp/source /etc/profile.d/login.sh -t target1
@@ -385,7 +385,7 @@ module Bolt
           bolt guide [topic] [options]
 
       #{colorize(:cyan, 'Description')}
-          View guides for Bolt's concepts and features.
+          View guides for OpenBolt's concepts and features.
 
           Omitting a topic will display a list of available guides,
           while providing a topic will display the relevant guide.
@@ -445,7 +445,7 @@ module Bolt
           Look up a value with Hiera.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about using Hiera with Bolt at https://pup.pt/bolt-hiera.
+          Learn more about using Hiera with OpenBolt at https://docs.openvoxproject.org/openbolt/latest/hiera.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt lookup password --targets servers
@@ -460,16 +460,16 @@ module Bolt
           bolt module <action> [options]
 
       #{colorize(:cyan, 'Description')}
-          Manage Bolt project modules.
+          Manage OpenBolt project modules.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt modules run 'bolt guide module'.
+          To learn more about modules, run 'bolt guide module'.
 
       #{colorize(:cyan, 'Actions')}
           add                   Add a module to the project
           generate-types        Generate type references to register in plans
           install               Install the project's modules
-          show                  List modules available to the Bolt project
+          show                  List modules available to the OpenBolt project
     HELP
 
     MODULE_ADD_HELP = <<~HELP
@@ -483,11 +483,11 @@ module Bolt
           Add a module to the project.
 
           Module declarations are loaded from the project's configuration
-          file. Bolt will automatically resolve all module dependencies,
+          file. OpenBolt will automatically resolve all module dependencies,
           generate a Puppetfile, and install the modules.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt modules, run 'bolt guide module'.
+          To learn more about modules, run 'bolt guide module'.
     HELP
 
     MODULE_GENERATETYPES_HELP = <<~HELP
@@ -499,10 +499,10 @@ module Bolt
 
       #{colorize(:cyan, 'Description')}
           Generate type references to register in plans. To learn more about
-          Bolt modules, run 'bolt guide module'.
+          modules, run 'bolt guide module'.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt modules, run 'bolt guide module'.
+          To learn more about modules, run 'bolt guide module'.
     HELP
 
     MODULE_INSTALL_HELP = <<~HELP
@@ -516,11 +516,11 @@ module Bolt
           Install the project's modules.
 
           Module declarations are loaded from the project's configuration
-          file. Bolt will automatically resolve all module dependencies,
+          file. OpenBolt will automatically resolve all module dependencies,
           generate a Puppetfile, and install the modules.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt modules, run 'bolt guide module'.
+          To learn more about modules, run 'bolt guide module'.
     HELP
 
     MODULE_SHOW_HELP = <<~HELP
@@ -531,13 +531,13 @@ module Bolt
           bolt module show [module name] [options]
 
       #{colorize(:cyan, 'Description')}
-          List modules available to the Bolt project.
+          List modules available to the OpenBolt project.
 
           Providing the name of a module will display detailed documentation for
           the module.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt modules, run 'bolt guide module'.
+          To learn more about modules, run 'bolt guide module'.
     HELP
 
     PLAN_HELP = <<~HELP
@@ -548,13 +548,13 @@ module Bolt
           bolt plan <action> [options]
 
       #{colorize(:cyan, 'Description')}
-          Convert, create, show, and run Bolt plans.
+          Convert, create, show, and run plans.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plans at https://pup.pt/bolt-plans.
+          Learn more about plans at https://docs.openvoxproject.org/openbolt/latest/plans.html.
 
       #{colorize(:cyan, 'Actions')}
-          convert       Convert a YAML plan to a Bolt plan
+          convert       Convert a YAML plan to a Puppet language plan
           new           Create a new plan in the current project
           run           Run a plan on the specified targets
           show          Show available plans and plan documentation
@@ -576,7 +576,7 @@ module Bolt
           functionality. Note that the converted plan is not written to a file.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plans at https://pup.pt/bolt-plans.
+          Learn more about plans at https://docs.openvoxproject.org/openbolt/latest/plans.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt plan convert myproject::myplan
@@ -594,7 +594,7 @@ module Bolt
           Create a new plan in the current project.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plans at https://pup.pt/bolt-plans.
+          Learn more about plans at https://docs.openvoxproject.org/openbolt/latest/plans.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt plan new myproject::myplan
@@ -611,7 +611,7 @@ module Bolt
           Run a plan on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plans at https://pup.pt/bolt-plans.
+          Learn more about plans at https://docs.openvoxproject.org/openbolt/latest/plans.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt plan run canary --targets target1,target2 command=hostname
@@ -628,13 +628,13 @@ module Bolt
           Show available plans and plan documentation.
 
           Omitting the name of a plan will display a list of plans available
-          in the Bolt project.
+          in the OpenBolt project.
 
           Providing the name of a plan will display detailed documentation for
           the plan, including a list of available parameters.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plans at https://pup.pt/bolt-plans.
+          Learn more about plans at https://docs.openvoxproject.org/openbolt/latest/plans.html.
 
       #{colorize(:cyan, 'Examples')}
           Display a list of available plans
@@ -654,7 +654,7 @@ module Bolt
           Show available plugins.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plugins at https://pup.pt/bolt-plugins.
+          Learn more about plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
 
       #{colorize(:cyan, 'Actions')}
           show          Show available plugins
@@ -671,7 +671,7 @@ module Bolt
           Show available plugins.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt plugins at https://pup.pt/bolt-plugins.
+          Learn more about plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
     HELP
 
     POLICY_HELP = <<~HELP
@@ -731,14 +731,14 @@ module Bolt
           bolt project <action> [options]
 
       #{colorize(:cyan, 'Description')}
-          Create and migrate Bolt projects
+          Create and migrate OpenBolt projects
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt projects, run 'bolt guide project'.
+          To learn more about OpenBolt projects, run 'bolt guide project'.
 
       #{colorize(:cyan, 'Actions')}
-          init              Create a new Bolt project
-          migrate           Migrate a Bolt project to the latest version
+          init              Create a new OpenBolt project
+          migrate           Migrate an OpenBolt project to the latest version
     HELP
 
     PROJECT_INIT_HELP = <<~HELP
@@ -749,19 +749,19 @@ module Bolt
           bolt project init [name] [options]
 
       #{colorize(:cyan, 'Description')}
-          Create a new Bolt project in the current working directory.
+          Create a new OpenBolt project in the current working directory.
 
-          Specify a name for the Bolt project. Defaults to the basename of the current working directory.
+          Specify a name for the OpenBolt project. Defaults to the basename of the current working directory.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt projects, run 'bolt guide project'.
+          To learn more about OpenBolt projects, run 'bolt guide project'.
 
       #{colorize(:cyan, 'Examples')}
-          Create a new Bolt project using the directory as the project name.
+          Create a new OpenBolt project using the directory as the project name.
             bolt project init
-          Create a new Bolt project with a specified name.
+          Create a new OpenBolt project with a specified name.
             bolt project init myproject
-          Create a new Bolt project with existing modules.
+          Create a new OpenBolt project with existing modules.
             bolt project init --modules puppetlabs-apt,puppetlabs-ntp
     HELP
 
@@ -773,11 +773,11 @@ module Bolt
           bolt project migrate [options]
 
       #{colorize(:cyan, 'Description')}
-          Migrate a Bolt project to use current best practices and the latest version of
+          Migrate an OpenBolt project to use current best practices and the latest version of
           configuration files.
 
       #{colorize(:cyan, 'Documentation')}
-          To learn more about Bolt projects, run 'bolt guide project'.
+          To learn more about OpenBolt projects, run 'bolt guide project'.
     HELP
 
     SCRIPT_HELP = <<~HELP
@@ -791,7 +791,7 @@ module Bolt
           Run a script on the specified targets.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about running scripts at https://pup.pt/bolt-commands.
+          Learn more about running scripts at https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Actions')}
           run         Run a script on the specified targets.
@@ -813,7 +813,7 @@ module Bolt
           be quoted.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about running scripts at https://pup.pt/bolt-commands.
+          Learn more about running scripts at https://docs.openvoxproject.org/openbolt/latest/running_bolt_commands.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt script run myscript.sh 'echo hello' --targets target1,target2
@@ -830,7 +830,7 @@ module Bolt
           Create encryption keys and encrypt and decrypt values.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about secrets plugins at http://pup.pt/bolt-plugins.
+          Learn more about secrets plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
 
       #{colorize(:cyan, 'Actions')}
           createkeys           Create new encryption keys
@@ -849,7 +849,7 @@ module Bolt
           Create new encryption keys.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about secrets plugins at http://pup.pt/bolt-plugins.
+          Learn more about secrets plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
     HELP
 
     SECRET_DECRYPT_HELP = <<~HELP
@@ -863,7 +863,7 @@ module Bolt
           Decrypt a value.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about secrets plugins at http://pup.pt/bolt-plugins.
+          Learn more about secrets plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
     HELP
 
     SECRET_ENCRYPT_HELP = <<~HELP
@@ -877,7 +877,7 @@ module Bolt
           Encrypt a value.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about secrets plugins at http://pup.pt/bolt-plugins.
+          Learn more about secrets plugins at https://docs.openvoxproject.org/openbolt/latest/using_plugins.html.
     HELP
 
     TASK_HELP = <<~HELP
@@ -888,13 +888,13 @@ module Bolt
           bolt task <action> [options]
 
       #{colorize(:cyan, 'Description')}
-          Show and run Bolt tasks.
+          Show and run tasks.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt tasks at http://pup.pt/bolt-tasks.
+          Learn more about tasks at https://docs.openvoxproject.org/openbolt/latest/tasks.html.
 
       #{colorize(:cyan, 'Actions')}
-          run          Run a Bolt task
+          run          Run a task
           show         Show available tasks and task documentation
     HELP
 
@@ -912,7 +912,7 @@ module Bolt
           Parameters take the form parameter=value.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt tasks at http://pup.pt/bolt-tasks.
+          Learn more about tasks at https://docs.openvoxproject.org/openbolt/latest/tasks.html.
 
       #{colorize(:cyan, 'Examples')}
           bolt task run package --targets target1,target2 action=status name=bash
@@ -929,13 +929,13 @@ module Bolt
           Show available tasks and task documentation.
 
           Omitting the name of a task will display a list of tasks available
-          in the Bolt project.
+          in the OpenBolt project.
 
           Providing the name of a task will display detailed documentation for
           the task, including a list of available parameters.
 
       #{colorize(:cyan, 'Documentation')}
-          Learn more about Bolt tasks at http://pup.pt/bolt-tasks.
+          Learn more about tasks at https://docs.openvoxproject.org/openbolt/latest/tasks.html.
 
       #{colorize(:cyan, 'Examples')}
           Display a list of available tasks
@@ -962,7 +962,7 @@ module Bolt
              "Available filters are 'all', 'failure', and 'success'.") do |rerun|
         @options[:rerun] = rerun
       end
-      define('--noop', 'See what changes Bolt will make without actually executing the changes.') do |_|
+      define('--noop', 'See what changes OpenBolt will make without actually executing the changes.') do |_|
         @options[:noop] = true
       end
       define('--params PARAMETERS',
@@ -1034,7 +1034,7 @@ module Bolt
         @options[:cleanup] = cleanup
       end
       define('-m', '--modulepath MODULES',
-             "List of directories containing modules, separated by '#{File::PATH_SEPARATOR}'",
+             "List of directories containing modules, separated by '#{File::PATH_SEPARATOR}'.",
              'Directories are case-sensitive.') do |modulepath|
         # When specified from the CLI, modulepath entries are relative to pwd
         @options[:modulepath] = modulepath.split(File::PATH_SEPARATOR).map do |moduledir|
@@ -1042,7 +1042,7 @@ module Bolt
         end
       end
       define('--project PATH',
-             'Path to load the Bolt project from (default: autodiscovered from current dir).') do |path|
+             'Path to load the OpenBolt project from (default: autodiscovered from current dir).') do |path|
         @options[:project] = path
       end
       define('--hiera-config PATH',
@@ -1161,7 +1161,7 @@ module Bolt
       separator "\n#{self.class.colorize(:cyan, 'Module options')}"
       define('--[no-]resolve',
              'Use --no-resolve to install modules listed in the Puppetfile without resolving modules configured',
-             'in Bolt project configuration.') do |resolve|
+             'in OpenBolt project configuration.') do |resolve|
         @options[:resolve] = resolve
       end
 
@@ -1183,7 +1183,7 @@ module Bolt
         if File.exist?(path) || Pathname.new(path).absolute? ||
            !%w[scripts files].include?(path.split(File::SEPARATOR)[1])
           raise Bolt::CLIError, "The script must be a detailed Puppet file reference, " \
-            "for example 'mymodule/scripts/myscript.sh'. See http://pup.pt/bolt-scripts for " \
+            "for example 'mymodule/scripts/myscript.sh'. See https://docs.openvoxproject.org/openbolt/latest/bolt_running_scripts.html for " \
             "more information on detailed Puppet file references."
         end
 
@@ -1210,7 +1210,7 @@ module Bolt
       end
       define('--stream',
              'Stream output from scripts and commands to the console.',
-             'Run with --no-verbose to prevent Bolt from displaying output',
+             'Run with --no-verbose to prevent OpenBolt from displaying output',
              'a second time after the action is completed.') do |_|
         @options[:stream] = true
       end

data/lib/bolt/cli.rb

@@ -675,7 +675,8 @@ module Bolt
     end
 
     # Process the target list by turning a PuppetDB query or rerun mode into a
-    # list of target names.
+    # list of target names. Try to parse each options[:targets] entry as JSON
+    # Array/Hash, return the value as-is if failed.
     #
     # @param plugins [Bolt::Plugin] The Plugin instance.
     # @param rerun [Bolt::Rerun] The Rerun instance.
@@ -688,7 +689,25 @@ module Bolt
       elsif options[:rerun]
         rerun.get_targets(options[:rerun])
       elsif options[:targets]
-        options[:targets]
+        options[:targets].map do |target|
+          parsed = JSON.parse(target)
+          case parsed
+          when Array
+            parsed
+          when Hash
+            items = parsed['items']
+            if items.is_a?(Array)
+              items.map { |item| item['target'] }
+            else
+              raise Bolt::Error.new("Expected a JSON array or an object with an 'items' array, got #{parsed.class}",
+                                    'bolt/invalid-targets')
+            end
+          else
+            target
+          end
+        rescue JSON::ParserError
+          target
+        end
       end
     end
 

data/lib/bolt/config/options.rb

@@ -185,7 +185,7 @@ module Bolt
         },
         "disable-warnings" => {
           description: "An array of IDs of warnings to suppress. Warnings with a matching ID will not be logged " \
-                       "by Bolt. If you are upgrading Bolt to a new major version, you should re-enable all warnings " \
+                       "by OpenBolt. If you are upgrading OpenBolt to a new major version, you should re-enable all warnings " \
                        "until you have finished upgrading.",
           type: Array,
           items: {
@@ -203,7 +203,7 @@ module Bolt
           _default: "human"
         },
         "future" => {
-          description: "Enable new Bolt features that may include breaking changes.",
+          description: "Enable new OpenBolt features that may include breaking changes.",
           type: Hash,
           properties: {
             "file_paths" => {
@@ -211,7 +211,7 @@ module Bolt
               type: [TrueClass, FalseClass],
               _example: true,
               _default: false,
-              _deprecation: "Bolt no longer honors this option and enables loading scripts from the scripts " \
+              _deprecation: "OpenBolt no longer honors this option and enables loading scripts from the scripts " \
                             "directory by default."
             },
             "script_interpreter" => {
@@ -258,9 +258,9 @@ module Bolt
           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 " \
                        "`~/.puppetlabs/bolt/debug.log`. Individual log files must be valid filepaths. If the log " \
-                       "file does not exist, then Bolt will create it before logging information. Set the value to " \
+                       "file does not exist, then OpenBolt will create it before logging information. Set the value to " \
                        "`disable` to remove a log file defined at an earlier level of the config hierarchy. By " \
-                       "default, Bolt logs to a bolt-debug.log file in the Bolt project directory.",
+                       "default, OpenBolt logs to a bolt-debug.log file in the OpenBolt project directory.",
           type: Hash,
           properties: {
             "console" => {
@@ -300,7 +300,7 @@ module Bolt
                       "~/logs/debug.log" => { "append" => false, "level" => "debug" } }
         },
         "modulepath" => {
-          description: "An array of directories that Bolt loads content such as plans and tasks from. Read more " \
+          description: "An array of directories that OpenBolt loads content such as plans and tasks from. Read more " \
                        "about modules in [Module structure](module_structure.md).",
           type: [Array, String],
           items: {
@@ -311,7 +311,7 @@ module Bolt
           _default: ["project/modules"]
         },
         "module-install" => {
-          description: "Options that configure where Bolt downloads modules from. This option is only used when " \
+          description: "Options that configure where OpenBolt 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,
@@ -359,7 +359,7 @@ module Bolt
           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 " \
                        "install` command. For more information about specifying modules, see [the " \
-                       "documentation](https://pup.pt/bolt-module-specs).",
+                       "documentation](bolt_installing_modules.md#manually-specify-modules-in-a-bolt-project).",
           type: Array,
           items: {
             type: [Hash, String],
@@ -417,8 +417,8 @@ module Bolt
           ]
         },
         "name" => {
-          description: "The name of the Bolt project. When this option is configured, the project is considered a " \
-                       "[Bolt project](projects.md), allowing Bolt to load content from the project directory " \
+          description: "The name of the OpenBolt project. When this option is configured, the project is considered an " \
+                       "[OpenBolt project](projects.md), allowing OpenBolt to load content from the project directory " \
                        "as though it were a module.",
           type: String,
           _plugin: false,
@@ -427,7 +427,7 @@ module Bolt
         "plans" => {
           description: "A list of plan names and glob patterns to filter the project's plans by. This option is used " \
                        "to limit the visibility of plans for users of the project. For example, project authors " \
-                       "might want to limit the visibility of plans that are bundled with Bolt or plans that should " \
+                       "might want to limit the visibility of plans that are bundled with OpenBolt or plans that should " \
                        "only be run as part of another plan. When this option is not configured, all plans are " \
                        "visible. This option does not prevent users from running plans that are not part of this " \
                        "list.",
@@ -467,7 +467,7 @@ module Bolt
           _example: ["myproject::apache", "myproject::postgres"]
         },
         "puppetdb" => {
-          description: "A map containing options for [configuring the Bolt PuppetDB " \
+          description: "A map containing options for [configuring the OpenBolt PuppetDB " \
                        "client](bolt_connect_puppetdb.md).",
           type: Hash,
           properties: PUPPETDB_OPTIONS,
@@ -476,7 +476,7 @@ module Bolt
         "puppetdb-instances" => {
           description: "A map of named PuppetDB instances and their configuration, where keys are the name " \
                        "of a PuppetDB instance and values are maps of configuration options. For more " \
-                       "information, see [Connecting Bolt to PuppetDB](bolt_connect_puppetdb.md).",
+                       "information, see [Connecting OpenBolt to OpenVoxDB](bolt_connect_puppetdb.md).",
           type: Hash,
           additionalProperties: {
             type: Hash,
@@ -492,7 +492,7 @@ module Bolt
           _plugin: true
         },
         "save-rerun" => {
-          description: "Whether to update `.rerun.json` in the Bolt project directory. If " \
+          description: "Whether to update `.rerun.json` in the OpenBolt project directory. If " \
                        "your target names include passwords, set this value to `false` to avoid " \
                        "writing passwords to disk.",
           type: [TrueClass, FalseClass],
@@ -501,7 +501,7 @@ module Bolt
           _default: true
         },
         "spinner" => {
-          description: "Whether to print a spinner to the console for long-running Bolt operations.",
+          description: "Whether to print a spinner to the console for long-running OpenBolt operations.",
           type: [TrueClass, FalseClass],
           _plugin: false,
           _example: false,
@@ -518,7 +518,7 @@ module Bolt
         "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 " \
-                       "might want to limit the visibility of tasks that are bundled with Bolt or plans that should " \
+                       "might want to limit the visibility of tasks that are bundled with OpenBolt or plans that should " \
                        "only be run as part of a larger workflow. When this option is not configured, all tasks " \
                        "are visible. This option does not prevent users from running tasks that are not part of " \
                        "this list.",
@@ -530,8 +530,8 @@ module Bolt
           _example: ["myproject", "myproject::foo", "myproject::bar", "myproject::deploy_*"]
         },
         "trusted-external-command" => {
-          description: "The path to an executable on the Bolt controller that can produce external trusted facts. " \
-                       "**External trusted facts are experimental in both Puppet and Bolt and this API might " \
+          description: "The path to an executable on the OpenBolt controller that can produce external trusted facts. " \
+                       "**External trusted facts are experimental in both Puppet and OpenBolt and this API might " \
                        "change or be removed.**",
           type: String,
           _plugin: false,