bolt 3.17.0 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05192d9aa9b3da414b55a21bd75fe10238e8044eb49f75f92be7fac1d0576866'
-  data.tar.gz: 49302c6d080fda48080d5281c9480ce35a734caefa5be9f6f141aaea51f99b70
+  metadata.gz: 1da7c437e5ea72a7f457ee51a06dbe434c85099ac2313491fffc63caa19b5acb
+  data.tar.gz: 5c081782bc847bf233e21a40094ffb0878e3bf0bf2da9ffd4ab527f1239d587e
 SHA512:
-  metadata.gz: bd0966b7be3a7bba5a1bb0f040a2e8bd8c22708fa1a79492f04b8448037105ac66e12af74969787d3ab4efa69bfcd393c51168154c548d7d35f6f36fc6648c0c
-  data.tar.gz: e7f2741c6e7a2416ebbc61f7f008e1a550bde1897e906e53a8df0dc837cd4fcb0718c783f301cdbde1703ed95a65530cbad9e727ae5978a6c414988bc0206e23
+  metadata.gz: f1cf5097a426a55de0e69f62cb266b15a91521991ad777d8b21ce81653b828bc279d6111fc0d02fb2f289dc53170db0d13bc99580fcd73fab4ce67ac64751795
+  data.tar.gz: 0fef7a9159cc63e167a9014d25a4a1937194adcbcf35492f5286d1c0c88b9202436b1fe64ea92770895350c795900e3ed701a108bfb1814570386c6411079f00

data/Puppetfile

@@ -5,8 +5,8 @@ forge "http://forge.puppetlabs.com"
 moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
-mod 'puppetlabs-service', '2.0.0'
-mod 'puppetlabs-puppet_agent', '4.8.0'
+mod 'puppetlabs-service', '2.1.0'
+mod 'puppetlabs-puppet_agent', '4.9.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
@@ -22,14 +22,14 @@ mod 'puppetlabs-yumrepo_core', '1.0.7'
 mod 'puppetlabs-zone_core', '1.0.3'
 
 # Useful additional modules
-mod 'puppetlabs-package', '2.0.0'
+mod 'puppetlabs-package', '2.1.0'
 mod 'puppetlabs-powershell_task_helper', '0.1.0'
-mod 'puppetlabs-puppet_conf', '1.1.0'
+mod 'puppetlabs-puppet_conf', '1.2.0'
 mod 'puppetlabs-python_task_helper', '0.5.0'
-mod 'puppetlabs-reboot', '4.0.2'
+mod 'puppetlabs-reboot', '4.1.0'
 mod 'puppetlabs-ruby_task_helper', '0.6.0'
 mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
-mod 'puppetlabs-stdlib', '7.1.0'
+mod 'puppetlabs-stdlib', '8.0.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'

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

@@ -108,11 +108,8 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
     # Send Analytics Report
     executor.report_function_call(self.class.name)
 
-    future = executor&.future || {}
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(script, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(script, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: script

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

@@ -70,11 +70,8 @@ Puppet::Functions.create_function(:upload_file, Puppet::Functions::InternalFunct
     # Send Analytics Report
     executor.report_function_call(self.class.name)
 
-    future = executor&.future || {}
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(source, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(source, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: source

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

@@ -21,11 +21,8 @@ Puppet::Functions.create_function(:'file::exists', Puppet::Functions::InternalFu
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     found ? Puppet::FileSystem.exist?(found) : false
   end
 end

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

@@ -20,11 +20,8 @@ Puppet::Functions.create_function(:'file::read', Puppet::Functions::InternalFunc
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     unless found && Puppet::FileSystem.exist?(found)
       raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
         Puppet::Pops::Issues::NO_SUCH_FILE_OR_DIRECTORY, file: filename

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

@@ -21,11 +21,8 @@ Puppet::Functions.create_function(:'file::readable', Puppet::Functions::Internal
     executor = Puppet.lookup(:bolt_executor) {}
     executor&.report_function_call(self.class.name)
 
-    future = executor&.future || Puppet.lookup(:future) { {} }
-    fallback = future.fetch('file_paths', false)
-
     # Find the file path if it exists, otherwise return nil
-    found = Bolt::Util.find_file_from_scope(filename, scope, fallback)
+    found = Bolt::Util.find_file_from_scope(filename, scope)
     found ? File.readable?(found) : false
   end
 end

data/lib/bolt/analytics.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/util'
-require 'bolt/version'
+require_relative '../bolt/util'
+require_relative '../bolt/version'
 require 'find'
 require 'json'
 require 'logging'

data/lib/bolt/application.rb

@@ -2,8 +2,8 @@
 
 require 'benchmark'
 
-require 'bolt/plan_creator'
-require 'bolt/util'
+require_relative '../bolt/plan_creator'
+require_relative '../bolt/util'
 
 module Bolt
   class Application
@@ -258,7 +258,7 @@ module Bolt
                     config.project.puppetfile,
                     config.project.managed_moduledir,
                     config.project.project_file,
-                    config.module_install)
+                    @plugins.resolve_references(config.module_install))
     end
 
     # Generate Puppet data types from project modules.
@@ -292,7 +292,7 @@ module Bolt
       installer.install(config.project.modules,
                         config.project.puppetfile,
                         config.project.managed_moduledir,
-                        config.module_install,
+                        @plugins.resolve_references(config.module_install),
                         force: force,
                         resolve: resolve)
     end
@@ -333,12 +333,6 @@ module Bolt
     def new_plan(name, puppet: false, plan_script: nil)
       Bolt::PlanCreator.validate_plan_name(config.project, name)
 
-      if plan_script && !config.future&.fetch('file_paths', false)
-        raise Bolt::CLIError,
-              "The --script flag can only be used if future.file_paths is " \
-              "configured in bolt-project.yaml."
-      end
-
       if plan_script
         Bolt::Util.validate_file('script', find_file(plan_script))
       end
@@ -575,11 +569,10 @@ module Bolt
       modulepath = Bolt::Config::Modulepath.new(config.modulepath)
       modules    = Bolt::Module.discover(modulepath.full_modulepath, config.project)
       mod, file  = path.split(File::SEPARATOR, 2)
-      future     = executor.future&.fetch('file_paths', false)
 
       if modules[mod]
         logger.debug("Did not find file at #{File.expand_path(path)}, checking in module '#{mod}'")
-        found = Bolt::Util.find_file_in_module(modules[mod].path, file || "", future)
+        found = Bolt::Util.find_file_in_module(modules[mod].path, file || "")
         path  = found.nil? ? File.join(modules[mod].path, 'files', file) : found
       end
 

data/lib/bolt/applicator.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'base64'
-require 'bolt/apply_result'
-require 'bolt/apply_target'
-require 'bolt/config'
-require 'bolt/error'
-require 'bolt/task'
-require 'bolt/util/puppet_log_level'
+require_relative '../bolt/apply_result'
+require_relative '../bolt/apply_target'
+require_relative '../bolt/config'
+require_relative '../bolt/error'
+require_relative '../bolt/task'
+require_relative '../bolt/util/puppet_log_level'
 require 'find'
 require 'json'
 require 'logging'
@@ -239,6 +239,7 @@ module Bolt
           search_dirs << mod.plugins if mod.plugins?
           search_dirs << mod.pluginfacts if mod.pluginfacts?
           search_dirs << mod.files if mod.files?
+          search_dirs << mod.scripts if mod.scripts?
           type_files = "#{mod.path}/types"
           search_dirs << type_files if File.exist?(type_files)
           search_dirs

data/lib/bolt/apply_inventory.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/project'
-require 'bolt/config'
-require 'bolt/error'
+require_relative '../bolt/project'
+require_relative '../bolt/config'
+require_relative '../bolt/error'
 
 module Bolt
   class ApplyInventory

data/lib/bolt/apply_result.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/error'
-require 'bolt/result'
+require_relative '../bolt/error'
+require_relative '../bolt/result'
 
 module Bolt
   class ApplyResult < Result

data/lib/bolt/catalog.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'bolt/apply_inventory'
-require 'bolt/apply_target'
-require 'bolt/config'
-require 'bolt/error'
-require 'bolt/inventory'
-require 'bolt/pal'
-require 'bolt/puppetdb'
-require 'bolt/util'
+require_relative '../bolt/apply_inventory'
+require_relative '../bolt/apply_target'
+require_relative '../bolt/config'
+require_relative '../bolt/error'
+require_relative '../bolt/inventory'
+require_relative '../bolt/pal'
+require_relative '../bolt/puppetdb'
+require_relative '../bolt/util'
 
 Bolt::PAL.load_puppet
 
-require 'bolt/catalog/logging'
+require_relative 'catalog/logging'
 
 module Bolt
   class Catalog
@@ -65,8 +65,7 @@ module Bolt
       puppet_overrides = {
         bolt_pdb_client: pdb_client,
         bolt_inventory: inv,
-        bolt_project: bolt_project,
-        future: request['future']
+        bolt_project: bolt_project
       }
 
       # Facts will be set by the catalog compiler, so we need to ensure

data/lib/bolt/cli.rb

@@ -9,23 +9,23 @@ require 'json'
 require 'io/console'
 require 'logging'
 require 'optparse'
-require 'bolt/analytics'
-require 'bolt/application'
-require 'bolt/bolt_option_parser'
-require 'bolt/config'
-require 'bolt/error'
-require 'bolt/executor'
-require 'bolt/inventory'
-require 'bolt/logger'
-require 'bolt/module_installer'
-require 'bolt/outputter'
-require 'bolt/pal'
-require 'bolt/plugin'
-require 'bolt/project_manager'
-require 'bolt/puppetdb'
-require 'bolt/rerun'
-require 'bolt/target'
-require 'bolt/version'
+require_relative '../bolt/analytics'
+require_relative '../bolt/application'
+require_relative '../bolt/bolt_option_parser'
+require_relative '../bolt/config'
+require_relative '../bolt/error'
+require_relative '../bolt/executor'
+require_relative '../bolt/inventory'
+require_relative '../bolt/logger'
+require_relative '../bolt/module_installer'
+require_relative '../bolt/outputter'
+require_relative '../bolt/pal'
+require_relative '../bolt/plugin'
+require_relative '../bolt/project_manager'
+require_relative '../bolt/puppetdb'
+require_relative '../bolt/rerun'
+require_relative '../bolt/target'
+require_relative '../bolt/version'
 
 module Bolt
   class CLIExit < StandardError; end
@@ -53,8 +53,7 @@ module Bolt
     TARGETING_OPTIONS = %i[query rerun targets].freeze
 
     SUCCESS = 0
-    ERROR   = 1
-    FAILURE = 2
+    FAILURE = 1
 
     def initialize(argv)
       Bolt::Logger.initialize_logging

data/lib/bolt/config/modulepath.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/config'
+require_relative '../../bolt/config'
 
 module Bolt
   class Config

data/lib/bolt/config/options.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'bolt/config/transport/docker'
-require 'bolt/config/transport/local'
-require 'bolt/config/transport/lxd'
-require 'bolt/config/transport/orch'
-require 'bolt/config/transport/podman'
-require 'bolt/config/transport/remote'
-require 'bolt/config/transport/ssh'
-require 'bolt/config/transport/winrm'
+require_relative '../../bolt/config/transport/docker'
+require_relative '../../bolt/config/transport/local'
+require_relative '../../bolt/config/transport/lxd'
+require_relative '../../bolt/config/transport/orch'
+require_relative '../../bolt/config/transport/podman'
+require_relative '../../bolt/config/transport/remote'
+require_relative '../../bolt/config/transport/ssh'
+require_relative '../../bolt/config/transport/winrm'
 
 module Bolt
   class Config
@@ -147,14 +147,23 @@ module Bolt
           type: Hash,
           properties: {
             "file_paths" => {
-              description: "Load scripts from the `scripts/` directory of a module",
+              description: "Load scripts from the `scripts/` directory of a module.",
+              type: [TrueClass, FalseClass],
+              _example: true,
+              _default: false,
+              _deprecation: "Bolt no longer honors this option and enables loading scripts from the scripts "\
+                            "directory by default."
+            },
+            "script_interpreter" => {
+              description: "Use a target's [`interpreters` configuration](bolt_transports_reference.md#interpreters) "\
+                           "when running a script.",
               type: [TrueClass, FalseClass],
               _example: true,
               _default: false
             }
           },
           _plugin: false,
-          _example: { 'file_paths' => true }
+          _example: { 'script_interpreter' => true }
         },
         "hiera-config" => {
           description: "The path to the Hiera configuration file.",
@@ -248,10 +257,16 @@ module Bolt
           type: Hash,
           properties: {
             "forge" => {
-              description: "A subsection that can have its own `proxy` setting to set an HTTP proxy for Forge "\
-                           "operations only, and a `baseurl` setting to specify a different Forge host.",
+              description: "A subsection for configuring connections to a Forge host.",
               type: Hash,
               properties: {
+                "authorization_token" => {
+                  description: "The token used to authorize requests to the Forge host. Must also specify "\
+                               "`baseurl` when using this option.",
+                  type: String,
+                  _example: "Bearer eyJhbGciOiJIUzI1NiIsInR5c...",
+                  _plugin: true
+                },
                 "baseurl" => {
                   description: "The URL to the Forge host.",
                   type: String,
@@ -265,7 +280,11 @@ module Bolt
                   _example: "https://my-forge-proxy.com:8080"
                 }
               },
-              _example: { "baseurl" => "https://forge.example.com", "proxy" => "https://my-forge-proxy.com:8080" }
+              _example: {
+                "authorization_token" => "Bearer eyJhbGciOiJIUzI1NiIsInR5c...",
+                "baseurl" => "https://forge.example.com",
+                "proxy" => "https://my-forge-proxy.com:8080"
+              }
             },
             "proxy" => {
               description: "The HTTP proxy to use for Git and Forge operations.",

data/lib/bolt/config/transport/base.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/util'
-require 'bolt/validator'
-require 'bolt/config/transport/options'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/util'
+require_relative '../../../bolt/validator'
+require_relative '../../../bolt/config/transport/options'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/docker.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/local.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/lxd.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/orch.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/podman.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/remote.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/ssh.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config/transport/winrm.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/config/transport/base'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/config/transport/base'
 
 module Bolt
   class Config

data/lib/bolt/config.rb

@@ -3,11 +3,11 @@
 require 'etc'
 require 'logging'
 require 'pathname'
-require 'bolt/project'
-require 'bolt/logger'
-require 'bolt/util'
-require 'bolt/config/options'
-require 'bolt/validator'
+require_relative '../bolt/project'
+require_relative '../bolt/logger'
+require_relative '../bolt/util'
+require_relative 'config/options'
+require_relative '../bolt/validator'
 
 module Bolt
   class UnknownTransportError < Bolt::Error

data/lib/bolt/container_result.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'bolt/error'
-require 'bolt/result'
+require_relative '../bolt/error'
+require_relative '../bolt/result'
 
 module Bolt
   class ContainerResult

data/lib/bolt/error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/util'
+require_relative '../bolt/util'
 
 module Bolt
   class Error < RuntimeError

data/lib/bolt/executor.rb

@@ -6,21 +6,21 @@ require 'json'
 require 'logging'
 require 'pathname'
 require 'set'
-require 'bolt/analytics'
-require 'bolt/config'
-require 'bolt/fiber_executor'
-require 'bolt/puppetdb'
-require 'bolt/result'
-require 'bolt/result_set'
+require_relative '../bolt/analytics'
+require_relative '../bolt/config'
+require_relative '../bolt/fiber_executor'
+require_relative '../bolt/puppetdb'
+require_relative '../bolt/result'
+require_relative '../bolt/result_set'
 # Load transports
-require 'bolt/transport/docker'
-require 'bolt/transport/local'
-require 'bolt/transport/lxd'
-require 'bolt/transport/orch'
-require 'bolt/transport/podman'
-require 'bolt/transport/remote'
-require 'bolt/transport/ssh'
-require 'bolt/transport/winrm'
+require_relative '../bolt/transport/docker'
+require_relative '../bolt/transport/local'
+require_relative '../bolt/transport/lxd'
+require_relative '../bolt/transport/orch'
+require_relative '../bolt/transport/podman'
+require_relative '../bolt/transport/remote'
+require_relative '../bolt/transport/ssh'
+require_relative '../bolt/transport/winrm'
 
 module Bolt
   TRANSPORTS = {
@@ -300,6 +300,9 @@ module Bolt
       description = options.fetch(:description, "script #{script}")
       log_action(description, targets) do
         options[:run_as] = run_as if run_as && !options.key?(:run_as)
+        options[:script_interpreter] = (future || {}).fetch('script_interpreter', false)
+
+        @analytics&.event('Future', 'script_interpreter', label: options[:script_interpreter].to_s)
 
         batch_execute(targets) do |transport, batch|
           with_node_logging("Running script #{script} with '#{arguments.to_json}'", batch) do

data/lib/bolt/fiber_executor.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/logger'
-require 'bolt/plan_future'
+require_relative '../bolt/logger'
+require_relative '../bolt/plan_future'
 
 module Bolt
   class FiberExecutor

data/lib/bolt/inventory/group.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'bolt/config/options'
-require 'bolt/inventory/group'
-require 'bolt/inventory/inventory'
-require 'bolt/inventory/target'
+require_relative '../../bolt/config/options'
+require_relative '../../bolt/inventory/group'
+require_relative '../../bolt/inventory/inventory'
+require_relative '../../bolt/inventory/target'
 
 module Bolt
   class Inventory