openbolt 5.0.0.pre.rc2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9b77a5be10b6dcc44e1491445b297ffd578c0ef1a368a847e3471118229f05
-  data.tar.gz: 75f3130fc79b142ae815b8916419f710d08d31e28991dc6db2f6792c6339ed9d
+  metadata.gz: 16adee6f2ee63ca8307251e4c21172c2b5757abb858fde6b785a4ad95ae682dd
+  data.tar.gz: 1d27c4966b88c572fa32e7ad576e575c2f8df15c42fb154740d001648b8d33c9
 SHA512:
-  metadata.gz: 42190294ee5244d97a17c897eef3b8b70ca26dbb312b094cc929df40d599a2da43b64a860c1bf10a7febacfd9f91cbd117e75c441cd486edc8f96ff827f2942d
-  data.tar.gz: d252b018107034ac86a26ec1fa4037536a341b07a67a589b005ea1a0a18245958ef540291f911f1227fd8a5755c5c69aa5312cadf28edb9f3e10d3ebb2ccde14
+  metadata.gz: 51f3c418134ed410ae9b853ca94dda21101e0f1e53466f6b3152ee39cbc0d743250eab910e5791ebc0014a53b18a84bfa48e8606d5755fc606b103735cd43609
+  data.tar.gz: 5e4bf2586950d1268c7c69ca4d14b0be64b12c2db6f5279622773f185c6fb8674d02a24486c1ea1148e2bbce32655c3de318e19cf011c179fbbae31259a8964a

data/Puppetfile

@@ -5,15 +5,22 @@ forge 'https://forge.puppetlabs.com'
 moduledir File.join(File.dirname(__FILE__), 'modules')
 
 # Core modules used by 'apply'
-mod 'puppetlabs-service', '3.0.0'
-mod 'puppetlabs-puppet_agent', '4.21.0'
-mod 'puppetlabs-facts', '1.6.0'
+mod 'puppetlabs-service', '3.1.0'
+mod 'puppetlabs-puppet_agent', '4.25.0'
+mod 'puppetlabs-facts', '1.7.0'
+
+# puppetlabs-puppet_agent deps
+mod 'puppetlabs-inifile', '6.2.0'
+mod 'puppetlabs-apt', '10.0.1'
+mod 'puppetlabs-stdlib', '9.7.0'
+mod 'puppetlabs-powershell', '6.0.2'
+mod 'puppetlabs-pwshlib', '1.2.3'
 
 # Core types and providers for Puppet 6
 mod 'puppetlabs-augeas_core', '1.5.0'
 mod 'puppetlabs-host_core', '1.3.0'
-mod 'puppetlabs-scheduled_task', '4.0.0'
-mod 'puppetlabs-sshkeys_core', '2.5.0'
+mod 'puppetlabs-scheduled_task', '4.0.3'
+mod 'puppetlabs-sshkeys_core', '2.5.1'
 mod 'puppetlabs-zfs_core', '1.6.1'
 mod 'puppetlabs-cron_core', '1.3.0'
 mod 'puppetlabs-mount_core', '1.3.0'
@@ -22,17 +29,16 @@ mod 'puppetlabs-yumrepo_core', '2.1.0'
 mod 'puppetlabs-zone_core', '1.2.0'
 
 # Useful additional modules
-mod 'puppetlabs-package', '3.0.1'
-mod 'puppetlabs-puppet_conf', '2.0.0'
-mod 'puppetlabs-reboot', '5.0.0'
-mod 'puppetlabs-stdlib', '9.6.0'
+mod 'puppetlabs-package', '3.1.0'
+mod 'puppetlabs-puppet_conf', '2.1.0'
+mod 'puppetlabs-reboot', '5.1.0'
 
 # Task helpers
 mod 'puppetlabs-powershell_task_helper', '0.1.0'
 mod 'puppetlabs-ruby_task_helper', '0.6.1'
-mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
-mod 'puppetlabs-python_task_helper', '0.5.0'
-mod 'puppetlabs-bash_task_helper', '2.1.1'
+mod 'puppetlabs-ruby_plugin_helper', '0.3.0'
+mod 'puppetlabs-python_task_helper', '0.6.0'
+mod 'puppetlabs-bash_task_helper', '2.2.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'

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

@@ -71,8 +71,8 @@ Puppet::Functions.create_function(:apply_prep) do
   #
   private def agent?(target)
     inventory.features(target).include?('puppet-agent') ||
-    executor.transport(target.transport).provided_features.include?('puppet-agent') ||
-    target.remote?
+      executor.transport(target.transport).provided_features.include?('puppet-agent') ||
+      target.remote?
   end
 
   # Generate the plugin tarball.
@@ -84,6 +84,7 @@ Puppet::Functions.create_function(:apply_prep) do
 
     tarball = applicator.build_plugin_tarball do |mod|
       next unless required_modules.empty? || required_modules.include?(mod.name)
+
       search_dirs = []
       search_dirs << mod.plugins if mod.plugins?
       search_dirs << mod.pluginfacts if mod.pluginfacts?
@@ -111,6 +112,7 @@ Puppet::Functions.create_function(:apply_prep) do
 
       hook_results.each do |result|
         next unless result.ok?
+
         inventory.set_feature(result.target, 'puppet-agent')
       end
 
@@ -143,7 +145,7 @@ Puppet::Functions.create_function(:apply_prep) do
       if unsupported_puppet?(result['clientversion'])
         Bolt::Logger.deprecate(
           "unsupported_puppet",
-          "Detected unsupported Puppet agent version #{result['clientversion']} on target "\
+          "Detected unsupported Puppet agent version #{result['clientversion']} on target " \
           "#{result.target}. Bolt supports Puppet agent 6.0.0 and higher."
         )
       end

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

@@ -124,6 +124,7 @@ Puppet::Functions.create_function(:download_file, Puppet::Functions::InternalFun
       if !r.ok && !options[:catch_errors]
         raise Bolt::RunFailure.new(r, 'download_file', source)
       end
+
       r
     end
   end

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

@@ -34,6 +34,7 @@ Puppet::Functions.create_function(:get_resources) do
     task = Bolt::Task.from_task_signature(tasksig)
     results = executor.run_task(targets, task, args)
     raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
+
     results
   end
 
@@ -80,6 +81,7 @@ Puppet::Functions.create_function(:get_resources) do
         }
         results = executor.run_task(targets, task, arguments)
         raise Bolt::RunFailure.new(results, 'run_task', task.name) unless results.ok?
+
         results
       end
     end

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

@@ -86,7 +86,7 @@ Puppet::Functions.create_function(:puppetdb_command) do
     # Error if the PDB client does not implement :send_command
     unless puppetdb_client.respond_to?(:send_command)
       raise Bolt::Error.new(
-        "PuppetDB client #{puppetdb_client.class} does not implement :send_command, "\
+        "PuppetDB client #{puppetdb_client.class} does not implement :send_command, " \
         "unable to invoke command.",
         'bolt/pdb-command'
       )

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

@@ -127,7 +127,7 @@ Puppet::Functions.create_function(:run_container) do
       end
 
       if (bad_vs = volumes.reject { |k, v| k.is_a?(String) && v.is_a?(String) }).any?
-        msg = "Option 'volumes' only accepts strings for keys and values. "\
+        msg = "Option 'volumes' only accepts strings for keys and values. " \
           "Received: #{bad_vs.map(&:inspect).join(', ')}"
         raise Bolt::ValidationError, msg
       end
@@ -153,7 +153,7 @@ Puppet::Functions.create_function(:run_container) do
       end
 
       if (bad_ps = ports.reject { |k, v| k.is_a?(Integer) && v.is_a?(Integer) }).any?
-        msg = "Option 'ports' only accepts integers for keys and values. "\
+        msg = "Option 'ports' only accepts integers for keys and values. " \
           "Received: #{bad_ps.map(&:inspect).join(', ')}"
         raise Bolt::ValidationError, msg
       end

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

@@ -139,6 +139,7 @@ Puppet::Functions.create_function(:run_script, Puppet::Functions::InternalFuncti
       if !r.ok && !options[:catch_errors]
         raise Bolt::RunFailure.new(r, 'run_script', script)
       end
+
       r
     end
   end

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

@@ -134,8 +134,8 @@ Puppet::Functions.create_function(:set_resources) do
 
       unless resource.target == target
         file, line = Puppet::Pops::PuppetStack.top_of_stack
-        raise Bolt::ValidationError, "Cannot set resource #{resource.reference} for target "\
-                                     "#{resource.target} on target #{target}. "\
+        raise Bolt::ValidationError, "Cannot set resource #{resource.reference} for target " \
+                                     "#{resource.target} on target #{target}. " \
                                      "#{Puppet::Util::Errors.error_location(file, line)}"
       end
 

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

@@ -95,6 +95,7 @@ Puppet::Functions.create_function(:upload_file, Puppet::Functions::InternalFunct
       if !r.ok && !options[:catch_errors]
         raise Bolt::RunFailure.new(r, 'upload_file', source)
       end
+
       r
     end
   end

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

@@ -111,7 +111,7 @@ Puppet::Functions.create_function(:wait, Puppet::Functions::InternalFunction) do
     valid, unknown = options.partition { |k, _v| %w[_catch_errors].include?(k) }.map(&:to_h)
     if unknown.any?
       file, line = Puppet::Pops::PuppetStack.top_of_stack
-      msg = "The wait() function call in #{file}#L#{line} received unknown options "\
+      msg = "The wait() function call in #{file}#L#{line} received unknown options " \
         "#{unknown.keys}. Removing unknown options and continuing..."
       Bolt::Logger.warn("plan_function_options", msg)
     end

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

@@ -54,6 +54,7 @@ Puppet::Functions.create_function(:wait_until_available) do
     if !r.ok && !options['_catch_errors']
       raise Bolt::RunFailure.new(r, 'wait_until_available')
     end
+
     r
   end
 end

data/bolt-modules/ctrl/lib/puppet/functions/ctrl/do_until.rb

@@ -35,6 +35,7 @@ Puppet::Functions.create_function(:'ctrl::do_until') do
     until (x = yield)
       i += 1
       break if limit != 0 && i >= limit
+
       Kernel.sleep(interval) if interval
     end
     x

data/lib/bolt/analytics.rb

@@ -59,7 +59,7 @@ module Bolt
 
       if File.exist?(path)
         if File.exist?(old_path)
-          message = "Detected analytics configuration files at '#{old_path}' and '#{path}'. Loading "\
+          message = "Detected analytics configuration files at '#{old_path}' and '#{path}'. Loading " \
                     "analytics configuration from '#{path}'."
           Bolt::Logger.warn_once('duplicate_analytics', message)
         end

data/lib/bolt/application.rb

@@ -57,10 +57,10 @@ module Bolt
       if defined?(ast.body) &&
          (ast.body.is_a?(Puppet::Pops::Model::HostClassDefinition) ||
          ast.body.is_a?(Puppet::Pops::Model::ResourceTypeDefinition))
-        message = "Manifest only contains definitions and will result in no changes on the targets. "\
-                  "Definitions must be declared for their resources to be applied. You can read more "\
-                  "about defining and declaring classes and types in the Puppet documentation at "\
-                  "https://puppet.com/docs/puppet/latest/lang_classes.html and "\
+        message = "Manifest only contains definitions and will result in no changes on the targets. " \
+                  "Definitions must be declared for their resources to be applied. You can read more " \
+                  "about defining and declaring classes and types in the Puppet documentation at " \
+                  "https://puppet.com/docs/puppet/latest/lang_classes.html and " \
                   "https://puppet.com/docs/puppet/latest/lang_defined_types.html"
         Bolt::Logger.warn("empty_manifest", message)
       end
@@ -281,7 +281,7 @@ module Bolt
 
       if config.project.modules.empty? && resolve
         outputter.print_message(
-          "Project configuration file #{config.project.project_file} does not "\
+          "Project configuration file #{config.project.project_file} does not " \
           "specify any module dependencies. Nothing to do."
         )
         return true
@@ -375,15 +375,7 @@ module Bolt
         end
       end
 
-      sensitive_params = params.keys.select { |param| plan_params.dig(param, 'sensitive') }
-
-      plan_context = { plan_name: plan, params: params, sensitive: sensitive_params }
-
-      executor.start_plan(plan_context)
-      result = pal.run_plan(plan, params, executor, inventory, plugins.puppetdb_client)
-      executor.finish_plan(result)
-
-      result
+      pal.run_plan(plan, params, executor, inventory, plugins.puppetdb_client)
     rescue Bolt::Error => e
       Bolt::PlanResult.new(e, 'failure')
     end
@@ -439,8 +431,8 @@ module Bolt
 
         # CODEREVIEW: Phrasing
         raise Bolt::Error.new(
-          "The following policies are not available to the project: '#{unavailable_policies.join("', '")}'. "\
-          "You must list policies in a project's 'policies' setting before Bolt can apply them to targets. "\
+          "The following policies are not available to the project: '#{unavailable_policies.join("', '")}'. " \
+          "You must list policies in a project's 'policies' setting before Bolt can apply them to targets. " \
           "For a list of policies available to the project, run '#{command}'.",
           'bolt/unavailable-policy-error'
         )
@@ -460,7 +452,7 @@ module Bolt
       # CODEREVIEW: Phrasing
       if unloadable_policies.any?
         raise Bolt::Error.new(
-          "The following policies cannot be loaded: '#{unloadable_policies.join("', '")}'. "\
+          "The following policies cannot be loaded: '#{unloadable_policies.join("', '")}'. " \
           "Policies must be a Puppet class saved to a project's or module's manifests directory.",
           'bolt/unloadable-policy-error'
         )
@@ -509,7 +501,7 @@ module Bolt
       # Error if name is not namespaced to project
       unless prefix == @config.project.name
         raise Bolt::ValidationError,
-              "Policy name '#{name}' must begin with project name '#{@config.project.name}'. Did "\
+              "Policy name '#{name}' must begin with project name '#{@config.project.name}'. Did " \
               "you mean '#{@config.project.name}::#{name}'?"
       end
 
@@ -578,9 +570,9 @@ module Bolt
         command = Bolt::Util.powershell? ? 'New-BoltPolicy -Name <NAME>' : 'bolt policy new <NAME>'
 
         raise Bolt::Error.new(
-          "Project configuration file #{@config.project.project_file} does not "\
-          "specify any policies. You can add policies to the project by including "\
-          "a 'policies' key or creating a new policy using the '#{command}' "\
+          "Project configuration file #{@config.project.project_file} does not " \
+          "specify any policies. You can add policies to the project by including " \
+          "a 'policies' key or creating a new policy using the '#{command}' " \
           "command.",
           'bolt/no-policies-error'
         )
@@ -719,7 +711,7 @@ module Bolt
       unless project.project_file?
         command = Bolt::Util.powershell? ? 'New-BoltProject' : 'bolt project init'
 
-        msg = "Could not find project configuration file #{project.project_file}, unable "\
+        msg = "Could not find project configuration file #{project.project_file}, unable " \
               "to install modules. To create a Bolt project, run '#{command}'."
 
         raise Bolt::Error.new(msg, 'bolt/missing-project-config-error')
@@ -733,6 +725,7 @@ module Bolt
     #
     private def filter_content(content, filter)
       return content unless content && filter
+
       content.select { |name,| name.include?(filter) }
     end
 
@@ -745,6 +738,7 @@ module Bolt
     #
     private def find_file(path)
       return path if 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)
@@ -766,6 +760,7 @@ module Bolt
 
       files.each_with_object({}) do |file, guides|
         next if file !~ /\.(yaml|yml)\z/
+
         topic = File.basename(file, ".*")
         guides[topic] = File.join(root_path, file)
       end

data/lib/bolt/applicator.rb

@@ -174,6 +174,7 @@ module Bolt
         elsif data['version'] != 5
           raise Bolt::ParseError, "Hiera v5 is required, found v#{data['version'] || 3} in #{hiera_config}"
         end
+
         hiera_config
       end
     end
@@ -181,6 +182,7 @@ module Bolt
     def apply(args, apply_body, scope)
       raise(ArgumentError, 'apply requires a TargetSpec') if args.empty?
       raise(ArgumentError, 'apply requires at least one statement in the apply block') if apply_body.nil?
+
       type0 = Puppet.lookup(:pal_script_compiler).type('TargetSpec')
       Puppet::Pal.assert_type(type0, args[0], 'apply targets')
 
@@ -241,6 +243,7 @@ module Bolt
       @plugin_tarball = Concurrent::Delay.new do
         build_plugin_tarball do |mod|
           next unless required_modules.nil? || required_modules.include?(mod.name)
+
           search_dirs = []
           search_dirs << mod.plugins if mod.plugins?
           search_dirs << mod.pluginfacts if mod.pluginfacts?
@@ -317,6 +320,7 @@ module Bolt
       if !r.ok && !options[:catch_errors]
         raise Bolt::ApplyFailure, r
       end
+
       r
     end
 

data/lib/bolt/bolt_option_parser.rb

@@ -197,13 +197,13 @@ module Bolt
 
     BANNER = <<~HELP
       #{colorize(:cyan, 'Name')}
-          bolt
+          OpenBolt
 
       #{colorize(:cyan, 'Usage')}
           bolt <subcommand> [action] [options]
 
       #{colorize(:cyan, 'Description')}
-          Bolt is an orchestration tool that automates the manual work it takes to
+          OpenBolt is an orchestration tool that automates the manual work it takes to
           maintain your infrastructure.
 
       #{colorize(:cyan, 'Subcommands')}
@@ -450,7 +450,7 @@ module Bolt
     MODULE_HELP = <<~HELP
       #{colorize(:cyan, 'Name')}
           module
-      
+
       #{colorize(:cyan, 'Usage')}
           bolt module <action> [options]
 
@@ -470,7 +470,7 @@ module Bolt
     MODULE_ADD_HELP = <<~HELP
       #{colorize(:cyan, 'Name')}
           module add
-      
+
       #{colorize(:cyan, 'Usage')}
           bolt module add <module> [options]
 
@@ -503,7 +503,7 @@ module Bolt
     MODULE_INSTALL_HELP = <<~HELP
       #{colorize(:cyan, 'Name')}
           module install
-      
+
       #{colorize(:cyan, 'Usage')}
           bolt module install [options]
 
@@ -581,10 +581,10 @@ module Bolt
     PLAN_NEW_HELP = <<~HELP
       #{colorize(:cyan, 'Name')}
           plan new
-      
+
       #{colorize(:cyan, 'Usage')}
           bolt plan new <plan name> [options]
-      
+
       #{colorize(:cyan, 'Description')}
           Create a new plan in the current project.
 
@@ -1049,6 +1049,7 @@ module Bolt
         if ENV.include?(Bolt::Inventory::ENVIRONMENT_VAR)
           raise Bolt::CLIError, "Cannot pass inventory file when #{Bolt::Inventory::ENVIRONMENT_VAR} is set"
         end
+
         @options[:inventoryfile] = File.expand_path(path)
       end
       define('--[no-]save-rerun', 'Whether to update the rerun file after this command.') do |save|
@@ -1063,6 +1064,7 @@ module Bolt
         unless envvar.include?('=')
           raise Bolt::CLIError, "Environment variables must be specified using 'myenvvar=key' format"
         end
+
         @options[:env_vars] ||= {}
         @options[:env_vars].store(*envvar.split('=', 2))
       end
@@ -1129,7 +1131,7 @@ module Bolt
       separator "\n#{self.class.colorize(:cyan, 'Display options')}"
       define('--filter FILTER', 'Filter tasks and plans by a matching substring.') do |filter|
         unless /^[a-z0-9_:]+$/.match(filter)
-          msg = "Illegal characters in filter string '#{filter}'. Filters can "\
+          msg = "Illegal characters in filter string '#{filter}'. Filters can " \
           "only include lowercase letters, numbers, underscores, and colons."
           raise Bolt::CLIError, msg
         end

data/lib/bolt/cli.rb

@@ -197,7 +197,7 @@ module Bolt
       prev_cmd << " #{@argv[0]}" unless @argv.empty?
 
       message = <<~MSG
-      🎉 Welcome to Bolt #{VERSION}
+      🎉 Welcome to OpenBolt #{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/
@@ -294,8 +294,8 @@ module Bolt
         end
 
         if options[:action] == 'apply' && options[:leftovers].any?
-          raise Bolt::CLIError, "Unknown argument(s) #{options[:leftovers].join(', ')}. "\
-                                "To apply multiple policies, provide a comma-separated list of "\
+          raise Bolt::CLIError, "Unknown argument(s) #{options[:leftovers].join(', ')}. " \
+                                "To apply multiple policies, provide a comma-separated list of " \
                                 "policy names."
         end
 
@@ -310,7 +310,7 @@ module Bolt
 
       if options[:subcommand] == 'module' && options[:action] == 'install' && options[:object]
         command = Bolt::Util.powershell? ? 'Add-BoltModule -Module' : 'bolt module add'
-        raise Bolt::CLIError, "Invalid argument '#{options[:object]}'. To add a new module to "\
+        raise Bolt::CLIError, "Invalid argument '#{options[:object]}'. To add a new module to " \
                               "the project, run '#{command} #{options[:object]}'."
       end
 
@@ -827,6 +827,7 @@ module Bolt
     #
     private def parse_vars(vars)
       return unless vars
+
       Hash[vars.map { |a| a.split('=', 2) }]
     end
 
@@ -880,7 +881,7 @@ module Bolt
     #
     private def validate_ps_version
       if Bolt::Util.powershell?
-        command = "powershell.exe -NoProfile -NonInteractive -NoLogo -ExecutionPolicy "\
+        command = "powershell.exe -NoProfile -NonInteractive -NoLogo -ExecutionPolicy " \
                   "Bypass -Command $PSVersionTable.PSVersion.Major"
         stdout, _stderr, _status = Open3.capture3(command)
 
@@ -935,7 +936,7 @@ module Bolt
     private def with_signal_handling
       handler = Signal.trap :INT do |signo|
         Bolt::Logger.logger(self).info(
-          "Exiting after receiving SIG#{Signal.signame(signo)} signal. "\
+          "Exiting after receiving SIG#{Signal.signame(signo)} signal. " \
           "There might be processes left executing on some targets."
         )
         exit!