bolt 3.21.0 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161a4fa9b8f36d32bd32964eeab21d3df8588e900f18999ee3ea9f0d56d56aec
-  data.tar.gz: bd8e0f955123e73058904f8e22335a516f1f41dcb5e8bdf4e7ad9bc0c01fe212
+  metadata.gz: f5ed54ef60335c8ef24f0e5c76b3dbb669d2e4c83a36744d8d2efe090c2b72b0
+  data.tar.gz: 703e8adaa6f23ae4ac180370f4905844cb573b37c5449066e110167095fe15e3
 SHA512:
-  metadata.gz: 7b27fc4df0159d56610a5c2ebadd0a78234bc4e88815b2705f1000400f786079bddbcff37544024a81bc221afc48c60cfd884d2cee7f18018df1644dc7370548
-  data.tar.gz: 42c757fd3f406760d7b8d01809568270e92fb1ff57771ac07d392e26dd04be2f340a845906b7ea039e095e72e66bf37d56762b4e067db12eedb6773ffd47f492
+  metadata.gz: 2dfb2cf0b51cf238193d4e7b86933010d05a4985bc4df010c80dbcb9f8117d6dbb4359e81bacde3d567f61aae3b986d1d2e8c0c76a466c26a298bdc41c925bbf
+  data.tar.gz: fad359e9877901bebf721f2945425c62815bccfd5564125c45a545f3e45907d7fcb81a7d670c8cc54585596e173a4ebc960db5601495d69cebc0b5f449b368e1

data/lib/bolt/config/options.rb

@@ -461,6 +461,13 @@ module Bolt
           },
           _plugin: true
         },
+        "rerunfile" => {
+          description: "The path to the project's rerun file. The rerun file is used to store information "\
+                       "about targets from the most recent run. Expands relative to the project directory.",
+          type: String,
+          _example: "/Users/bolt/project/rerun.json",
+          _plugin: true
+        },
         "save-rerun" => {
           description: "Whether to update `.rerun.json` in the Bolt project directory. If "\
                        "your target names include passwords, set this value to `false` to avoid "\
@@ -630,6 +637,7 @@ module Bolt
         plugins
         policies
         puppetdb
+        rerunfile
         save-rerun
         spinner
         stream

data/lib/bolt/module.rb

@@ -42,6 +42,12 @@ module Bolt
     end
 
     def plugin?
+      if File.exist?(File.join(path, 'bolt-plugin.json'))
+        msg = "Found bolt-plugin.json in module #{name} at #{path}. Bolt looks for " \
+          "bolt_plugin.json to determine if the module contains plugins. " \
+          "Rename the file for Bolt to recognize it."
+        Bolt::Logger.warn_once('plugin_file_name', msg)
+      end
       File.exist?(plugin_data_file)
     end
   end

data/lib/bolt/plugin/env_var.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
+require 'json'
 module Bolt
   class Plugin
     class EnvVar
+      class InvalidPluginData < Bolt::Plugin::PluginError
+        def initialize(msg, plugin)
+          msg = "Invalid Plugin Data for #{plugin}: #{msg}"
+          super(msg, 'bolt/invalid-plugin-data')
+        end
+      end
+
       def initialize(*_args); end
 
       def name
@@ -31,7 +39,15 @@ module Bolt
       end
 
       def resolve_reference(opts)
-        ENV[opts['var']] || opts['default']
+        reference = ENV[opts['var']]
+        if opts['json'] && reference
+          begin
+            reference = JSON.parse(reference)
+          rescue JSON::ParserError => e
+            raise InvalidPluginData.new(e.message, name)
+          end
+        end
+        reference || opts['default']
       end
     end
   end

data/lib/bolt/plugin/puppetdb.rb

@@ -42,6 +42,13 @@ module Bolt
 
       def fact_path(raw_fact)
         fact_path = raw_fact.split(".")
+        fact_path = fact_path.map do |segment|
+          # Turn it into an integer if we can
+          Integer(segment)
+        rescue ArgumentError
+          # Otherwise return the value
+          segment
+        end
         if fact_path[0] == 'facts'
           fact_path.drop(1)
         elsif fact_path == ['certname']

data/lib/bolt/project.rb

@@ -128,6 +128,10 @@ module Bolt
 
       @data = data.slice(*Bolt::Config::PROJECT_OPTIONS)
 
+      if @data['rerunfile']
+        @rerunfile = File.expand_path(@data['rerunfile'], @path)
+      end
+
       validate if project_file?
     end
 

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

@@ -44,11 +44,12 @@ module Bolt
         end
 
         def ssh_opts
+          # NOTE: not all commands we might use here support various `-o` options,
+          # always provide a way to run without them.
           cmd = []
           # BatchMode is SSH's noninteractive option: if key authentication
           # fails it will error out instead of falling back to password prompt
-          batch_mode = @target.transport_config['batch-mode'] ? 'yes' : 'no'
-          cmd += %W[-o BatchMode=#{batch_mode}]
+          cmd += %w[-o BatchMode=yes] if @target.transport_config['batch-mode']
 
           cmd += %W[-o Port=#{@target.port}] if @target.port
 
@@ -68,6 +69,8 @@ module Bolt
           ssh_cmd = Array(ssh_conf)
           ssh_cmd += ssh_opts
           ssh_cmd << userhost
+          # Add option separator before command for wrappers around SSH
+          ssh_cmd << '--'
           ssh_cmd << command
         end
 

data/lib/bolt/util.rb

@@ -344,7 +344,7 @@ module Bolt
 
         if !stat.readable?
           raise Bolt::FileError.new("The #{type} '#{path}' is unreadable", path)
-        elsif !stat.file? && (!allow_dir || !stat.directory?)
+        elsif !allow_dir && stat.directory?
           expected = allow_dir ? 'file or directory' : 'file'
           raise Bolt::FileError.new("The #{type} '#{path}' is not a #{expected}", path)
         elsif stat.directory?

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '3.21.0'
+  VERSION = '3.22.0'
 end

data/lib/bolt_server/transport_app.rb

@@ -326,6 +326,7 @@ module BoltServer
         cli << "--basemodulepath" << basemodulepath
         Puppet.settings.send(:clear_everything_for_tests)
         Puppet.initialize_settings(cli)
+        Puppet[:versioned_environment_dirs] = true
         yield
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.22.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -673,7 +673,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM