bolt 3.17.0 → 3.21.0

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
@@ -439,6 +439,10 @@ module Bolt
       @data['plugin-hooks']
     end
 
+    def policies
+      @data['policies']
+    end
+
     def trusted_external
       @data['trusted-external-command']
     end

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

data/lib/bolt/inventory/inventory.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/inventory/group'
-require 'bolt/inventory/target'
+require_relative '../../bolt/inventory/group'
+require_relative '../../bolt/inventory/target'
 
 module Bolt
   class Inventory
@@ -71,16 +71,10 @@ module Bolt
           @config
         else
           @config_resolved = true
-          @config.transform_values! { |t| t.resolved? ? t : t.resolve(@plugins) }
+          @config.each_value { |t| t.resolve(@plugins) unless t.resolved? }
         end
       end
 
-      # Validates the inventory.
-      #
-      def validate
-        groups.validate
-      end
-
       def group_names_for(target_name)
         group_data_for(target_name).fetch('groups', [])
       end

data/lib/bolt/inventory/options.rb

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

data/lib/bolt/inventory/target.rb

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

data/lib/bolt/inventory.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'set'
-require 'bolt/config'
-require 'bolt/inventory/group'
-require 'bolt/inventory/inventory'
-require 'bolt/inventory/options'
-require 'bolt/target'
-require 'bolt/util'
-require 'bolt/plugin'
-require 'bolt/validator'
+require_relative '../bolt/config'
+require_relative 'inventory/group'
+require_relative 'inventory/inventory'
+require_relative 'inventory/options'
+require_relative '../bolt/target'
+require_relative '../bolt/util'
+require_relative '../bolt/plugin'
+require_relative '../bolt/validator'
 require 'yaml'
 
 module Bolt

data/lib/bolt/module_installer/installer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/r10k_log_proxy'
-require 'bolt/error'
+require_relative '../../bolt/r10k_log_proxy'
+require_relative '../../bolt/error'
 
 # This class is used to install modules from a Puppetfile to a module directory.
 #

data/lib/bolt/module_installer/puppetfile/forge_module.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'semantic_puppet'
-require 'bolt/module_installer/puppetfile/module'
+require_relative '../../../bolt/module_installer/puppetfile/module'
 
 # This class represents a resolved Forge module.
 #

data/lib/bolt/module_installer/puppetfile/git_module.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/module_installer/puppetfile/module'
+require_relative '../../../bolt/module_installer/puppetfile/module'
 
 # This class represents a resolved Git module.
 #

data/lib/bolt/module_installer/puppetfile/module.rb

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

data/lib/bolt/module_installer/puppetfile.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/puppetfile/forge_module'
-require 'bolt/module_installer/puppetfile/git_module'
+require_relative '../../bolt/error'
+require_relative 'puppetfile/forge_module'
+require_relative 'puppetfile/git_module'
 
 # This class manages the logical contents of a Puppetfile. It includes methods
 # for parsing and generating a Puppetfile.

data/lib/bolt/module_installer/resolver.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/puppetfile'
-require 'bolt/module_installer/specs'
+require_relative '../../bolt/error'
+require_relative '../../bolt/module_installer/puppetfile'
+require_relative '../../bolt/module_installer/specs'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/module_installer/specs/forge_spec.rb

@@ -3,7 +3,7 @@
 require 'semantic_puppet'
 require 'set'
 
-require 'bolt/error'
+require_relative '../../../bolt/error'
 
 # This class represents a Forge module specification.
 #

data/lib/bolt/module_installer/specs/git_spec.rb

@@ -3,7 +3,7 @@
 require 'json'
 require 'set'
 
-require 'bolt/error'
+require_relative '../../../bolt/error'
 
 # This class represents a Git module specification.
 #

data/lib/bolt/module_installer/specs.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/module_installer/specs/forge_spec'
-require 'bolt/module_installer/specs/git_spec'
+require_relative '../../bolt/error'
+require_relative 'specs/forge_spec'
+require_relative 'specs/git_spec'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/module_installer.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/logger'
-require 'bolt/module_installer/installer'
-require 'bolt/module_installer/puppetfile'
-require 'bolt/module_installer/resolver'
-require 'bolt/module_installer/specs'
+require_relative '../bolt/error'
+require_relative '../bolt/logger'
+require_relative 'module_installer/installer'
+require_relative 'module_installer/puppetfile'
+require_relative 'module_installer/resolver'
+require_relative 'module_installer/specs'
 
 module Bolt
   class ModuleInstaller

data/lib/bolt/node/errors.rb

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

data/lib/bolt/node/output.rb

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

data/lib/bolt/outputter/human.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/container_result'
-require 'bolt/pal'
+require_relative '../../bolt/container_result'
+require_relative '../../bolt/pal'
 
 module Bolt
   class Outputter
@@ -658,6 +658,49 @@ module Bolt
         OUTPUT
       end
 
+      def print_new_policy(name:, path:)
+        if Bolt::Util.powershell?
+          apply_command = "Invoke-BoltPolicy -Name #{name} -Targets <TARGETS>"
+          show_command  = 'Get-BoltPolicy'
+        else
+          apply_command = "bolt policy apply #{name} --targets <TARGETS>"
+          show_command  = 'bolt policy show'
+        end
+
+        print_message(<<~OUTPUT)
+          Created policy '#{name}' at '#{path}'
+          
+          Apply this policy with:
+              #{apply_command}
+          Show available policies with:
+              #{show_command}
+        OUTPUT
+      end
+
+      # Print policies and the modulepath they are loaded from.
+      #
+      # @param policies [Array] The list of available policies.
+      # @param modulepath [Array] The project's modulepath.
+      #
+      def print_policy_list(policies:, modulepath:)
+        info = +''
+
+        info << colorize(:cyan, "Policies\n")
+
+        if policies.any?
+          policies.sort.each { |policy| info << indent(2, "#{policy}\n") }
+        else
+          info << indent(2, "No available policies\n")
+        end
+
+        info << "\n"
+
+        info << colorize(:cyan, "Modulepath\n")
+        info << indent(2, modulepath.join(File::PATH_SEPARATOR).to_s)
+
+        @stream.puts info.chomp
+      end
+
       # Print target names and where they came from.
       #
       # @param adhoc [Hash] Adhoc targets provided on the command line.

data/lib/bolt/outputter/json.rb

@@ -87,6 +87,10 @@ module Bolt
         @stream.puts plan.to_json
       end
 
+      def print_policy_list(**kwargs)
+        print_table(**kwargs)
+      end
+
       def print_plans(**kwargs)
         print_table(**kwargs)
       end
@@ -95,6 +99,10 @@ module Bolt
         print_table(**kwargs)
       end
 
+      def print_new_policy(**kwargs)
+        print_table(**kwargs)
+      end
+
       def print_apply_result(apply_result)
         @stream.puts apply_result.to_json
       end

data/lib/bolt/outputter/logger.rb

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

data/lib/bolt/outputter/rainbow.rb

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

data/lib/bolt/outputter.rb

@@ -51,7 +51,7 @@ module Bolt
   end
 end
 
-require 'bolt/outputter/human'
-require 'bolt/outputter/json'
-require 'bolt/outputter/logger'
-require 'bolt/outputter/rainbow'
+require_relative 'outputter/human'
+require_relative 'outputter/json'
+require_relative 'outputter/logger'
+require_relative 'outputter/rainbow'

data/lib/bolt/pal/logging.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/util/puppet_log_level'
+require_relative '../../bolt/util/puppet_log_level'
 
 Puppet::Util::Log.newdesttype :logging do
   match "Logging::Logger"

data/lib/bolt/pal/yaml_plan/evaluator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan'
+require_relative '../../../bolt/pal/yaml_plan'
 
 module Bolt
   class PAL

data/lib/bolt/pal/yaml_plan/loader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan'
-require 'bolt/pal/yaml_plan/evaluator'
+require_relative '../../../bolt/pal/yaml_plan'
+require_relative '../../../bolt/pal/yaml_plan/evaluator'
 require 'psych'
 
 module Bolt

data/lib/bolt/pal/yaml_plan/step.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'bolt/util'
+require_relative '../../../bolt/util'
 
 module Bolt
   class PAL
@@ -211,13 +211,13 @@ module Bolt
   end
 end
 
-require 'bolt/pal/yaml_plan/step/command'
-require 'bolt/pal/yaml_plan/step/eval'
-require 'bolt/pal/yaml_plan/step/plan'
-require 'bolt/pal/yaml_plan/step/resources'
-require 'bolt/pal/yaml_plan/step/script'
-require 'bolt/pal/yaml_plan/step/task'
-require 'bolt/pal/yaml_plan/step/upload'
-require 'bolt/pal/yaml_plan/step/download'
-require 'bolt/pal/yaml_plan/step/message'
-require 'bolt/pal/yaml_plan/step/verbose'
+require_relative 'step/command'
+require_relative 'step/eval'
+require_relative 'step/plan'
+require_relative 'step/resources'
+require_relative 'step/script'
+require_relative 'step/task'
+require_relative 'step/upload'
+require_relative 'step/download'
+require_relative 'step/message'
+require_relative 'step/verbose'

data/lib/bolt/pal/yaml_plan/transpiler.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/pal/yaml_plan/loader'
-require 'bolt/util'
+require_relative '../../../bolt/error'
+require_relative '../../../bolt/pal/yaml_plan/loader'
+require_relative '../../../bolt/util'
 
 module Bolt
   class PAL

data/lib/bolt/pal/yaml_plan.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bolt/pal/yaml_plan/parameter'
-require 'bolt/pal/yaml_plan/step'
+require_relative 'yaml_plan/parameter'
+require_relative 'yaml_plan/step'
 
 module Bolt
   class PAL

data/lib/bolt/pal.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'bolt/applicator'
-require 'bolt/executor'
-require 'bolt/error'
-require 'bolt/plan_result'
-require 'bolt/util'
-require 'bolt/config/modulepath'
+require_relative '../bolt/applicator'
+require_relative '../bolt/executor'
+require_relative '../bolt/error'
+require_relative '../bolt/plan_result'
+require_relative '../bolt/util'
+require_relative '../bolt/config/modulepath'
 require 'etc'
 
 module Bolt
@@ -101,10 +101,10 @@ module Bolt
         raise Bolt::Error.new("Puppet must be installed to execute tasks", "bolt/puppet-missing")
       end
 
-      require 'bolt/pal/logging'
-      require 'bolt/pal/issues'
-      require 'bolt/pal/yaml_plan/loader'
-      require 'bolt/pal/yaml_plan/transpiler'
+      require_relative 'pal/logging'
+      require_relative 'pal/issues'
+      require_relative 'pal/yaml_plan/loader'
+      require_relative 'pal/yaml_plan/transpiler'
 
       # Now that puppet is loaded we can include puppet mixins in data types
       Bolt::ResultSet.include_iterable
@@ -238,6 +238,20 @@ module Bolt
       Puppet.override(opts, &block)
     end
 
+    def in_catalog_compiler
+      with_puppet_settings do
+        Puppet.override(bolt_project: @project) do
+          Puppet::Pal.in_tmp_environment('bolt', modulepath: full_modulepath) do |pal|
+            pal.with_catalog_compiler do |compiler|
+              yield compiler
+            end
+          end
+        end
+      rescue Puppet::Error => e
+        raise PALError.from_error(e)
+      end
+    end
+
     def in_plan_compiler(executor, inventory, pdb_client, applicator = nil)
       with_bolt_executor(executor, inventory, pdb_client, applicator) do
         # TODO: remove this call and see if anything breaks when
@@ -736,7 +750,7 @@ module Bolt
         #
         # Every future except for the main plan needs to have a plan id in
         # order to be tracked for the `wait()` function with no arguments.
-        future = executor.create_future(name: plan_name, plan_id: 1) do |_scope|
+        future = executor.create_future(name: plan_name, plan_id: 0) do |_scope|
           r = compiler.call_function('run_plan', plan_name, params.merge('_bolt_api_call' => true))
           Bolt::PlanResult.from_pcore(r, 'success')
         rescue Bolt::Error => e

data/lib/bolt/plan_creator.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'bolt/error'
-require 'bolt/logger'
-require 'bolt/module'
-require 'bolt/util'
+require_relative '../bolt/error'
+require_relative '../bolt/logger'
+require_relative '../bolt/module'
+require_relative '../bolt/util'
 
 module Bolt
   module PlanCreator

data/lib/bolt/plan_result.rb

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