bolt 3.29.0 → 3.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b5a8936e9789e8d1a722b5cc76cedf594a8f09709352b95ed6e423f0d7ddc6e
-  data.tar.gz: ef052d1f831ba328d6949a1f33ec617f933f2f28e862d23264ed1dfd9b43b0a6
+  metadata.gz: 80dd0d96ead6ae1cddc50bfd8381ea7cdce56a521afa475108589066dcd75f39
+  data.tar.gz: bee19d728cf36384d22e1c69eff95e05c58bc08b9186c6542ca3bc07effcb8d6
 SHA512:
-  metadata.gz: f1eeec5f42a0f82a751d5eaa834a42e66d26080a0250e680d4c6328e7fb3a2048f13093d65dc6a7d55220963d8178cbaee7744643f17dd82af44d92b3187c3a6
-  data.tar.gz: 6cd501114d6efc60a26df945e528b03a610018c287a9e03b722f15da5a37680655df1dc953702922e0c306376adcb9e536b30f6aedb1b24a4efe9e97fc3da504
+  metadata.gz: a3a05e9ee13b0e24f951268f0d27d5e6ba5d26df4f21f96f0f1f2c6fe37df5db83bab32114d5ebc2cfebe806ee0fde992c1e8a69d254f960ce7e1a79f31300fb
+  data.tar.gz: 5b3a8b35ddde08c7c89c1b97421b987e37cfdc973cb08a5ae1dcc36cbbefd6c4b3d81db058406d490958fc0718b8cec23d9536b68f2e5af023990e0f43506b78

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

@@ -6,7 +6,7 @@ Puppet::Functions.create_function(:'ctrl::do_until') do
   # @param block The code block to repeat.
   # @option options [Numeric] limit The number of times to repeat the block.
   # @option options [Numeric] interval The number of seconds to wait before repeating the block.
-  # @return [nil]
+  # @return The value of the code block's last iteration
   # @example Run a task until it succeeds
   #   ctrl::do_until() || {
   #     run_task('test', $target, '_catch_errors' => true).ok()

data/lib/bolt/applicator.rb

@@ -284,6 +284,9 @@ module Bolt
                   'catalog' => Puppet::Pops::Types::PSensitiveType::Sensitive.new(catalog),
                   'plugins' => Puppet::Pops::Types::PSensitiveType::Sensitive.new(plugins),
                   'apply_settings' => @apply_settings,
+                  # This should just be boltlib and modules dirs shipped with bolt packages
+                  # The apply_catalog task uses them to load core types if they exist
+                  'bolt_builtin_content' => @modulepath - @plugin_dirs,
                   '_task' => catalog_apply_task.name,
                   '_noop' => options[:noop]
                 }

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

@@ -11,7 +11,9 @@ module Bolt
           cleanup
           interpreters
           remote
+          shell-command
           tmpdir
+          tty
         ].concat(RUN_AS_OPTIONS).sort.freeze
 
         DEFAULTS = {

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

@@ -332,7 +332,7 @@ module Bolt
           },
           "shell-command" => {
             type: String,
-            description: "A shell command to wrap any Docker exec commands in, such as `bash -lc`.",
+            description: "A shell command to wrap any exec commands in, such as `bash -lc`.",
             _plugin: true,
             _example: "bash -lc"
           },

data/lib/bolt/inventory/inventory.rb

@@ -14,6 +14,10 @@ module Bolt
       EXTENDED_TARGET_REGEX = /[[:space:],]+(?=[^\]}]*(?:[\[{]|$))/.freeze
       TARGET_REGEX          = /[[:space:],]+/.freeze
 
+      # Pattern which looks for indicators that glob-based target name matching
+      # should be used.
+      GLOB_MATCH_REGEX      = /[*?\[\]{}]/.freeze
+
       class WildcardError < Bolt::Error
         def initialize(target)
           super("Found 0 targets matching wildcard pattern #{target}", 'bolt.inventory/wildcard-error')
@@ -119,19 +123,36 @@ module Bolt
         if ext_glob
           File.fnmatch(wildcard, target_name, File::FNM_CASEFOLD | File::FNM_EXTGLOB)
         else
-          regexp = Regexp.new("^#{Regexp.escape(wildcard).gsub('\*', '.*?')}$", Regexp::IGNORECASE)
-          target_name =~ regexp
+          File.fnmatch(wildcard, target_name, File::FNM_CASEFOLD)
         end
       end
 
       # If target is a group name, expand it to the members of that group.
       # Else match against groups and targets in inventory by name or alias.
-      # If a wildcard string, error if no matches are found.
+      # Attempt exact matches for groups, targets, and aliases first for speed.
+      # If no exact match and the string contains wildcard characters, then check
+      # and see if the target string might be a URI, if it parses as a URI with
+      # a scheme then return as-is, otherwise look for a wildcard match and
+      # error if no matches are found.
       # Else fall back to [target] if no matches are found.
       def resolve_name(target, ext_glob: false)
         if (group = group_lookup[target])
           group.all_targets.to_a
-        else
+        elsif @targets.key?(target)
+          [target]
+        elsif (real_target = groups.target_aliases[target])
+          [real_target]
+        elsif GLOB_MATCH_REGEX.match?(target)
+          # URIs and glob wildcards have some overlapping characters. If the target
+          # being resolved parses as a valid target URI and has a scheme defined then
+          # return it as-is and do not try to do further wildcard matching:
+          uri = begin
+            Bolt::Inventory::Target.parse_uri(target)
+          rescue Bolt::ParseError
+            nil
+          end
+          return [target] if uri&.scheme
+
           targets = []
 
           # Find groups that match the glob
@@ -148,12 +169,11 @@ module Bolt
                            .select { |tgt_alias, _| match_wildcard?(target, tgt_alias, ext_glob: ext_glob) }
                            .values
 
-          if targets.empty?
-            raise(WildcardError, target) if target.include?('*')
-            [target]
-          else
-            targets.uniq
-          end
+          raise(WildcardError, target) if targets.empty?
+
+          targets.uniq
+        else # rubocop:disable Lint/DuplicateBranch
+          [target]
         end
       end
       private :resolve_name

data/lib/bolt/inventory/target.rb

@@ -34,7 +34,7 @@ module Bolt
           @name = @uri
           @safe_name = @uri_obj.omit(:password).to_str.sub(%r{^//}, '')
         end
-
+        # handle special localhost target
         if @name == 'localhost'
           default = { 'config' => { 'transport' => 'local' } }
           target_data = Bolt::Util.deep_merge(default, target_data)
@@ -53,6 +53,8 @@ module Bolt
         @inventory = inventory
 
         validate
+        # after setting config, apply local defaults when using bundled ruby
+        set_local_defaults if transport_config['bundled-ruby']
       end
 
       def set_local_defaults

data/lib/bolt/target.rb

@@ -80,10 +80,6 @@ module Bolt
       inventory_target.resources
     end
 
-    def set_local_defaults
-      inventory_target.set_local_defaults
-    end
-
     # rubocop:disable Naming/AccessorMethodName
     def set_resource(resource)
       inventory_target.set_resource(resource)

data/lib/bolt/transport/local.rb

@@ -11,10 +11,6 @@ module Bolt
       end
 
       def with_connection(target)
-        if target.transport_config['bundled-ruby']
-          target.set_local_defaults
-        end
-
         yield Connection.new(target)
       end
     end

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

@@ -57,12 +57,24 @@ module Bolt
         end
 
         def execute(command)
-          lxc_command = %w[lxc exec]
+          lxc_command = %W[lxc exec #{container_id}]
+          lxc_command += ['--mode', target.options['tty'].to_s.empty? ? 'non-interactive' : 'interactive']
           lxc_command += @env_vars if @env_vars
-          lxc_command += %W[#{container_id} -- sh -c #{Shellwords.shellescape(command)}]
+          lxc_command << '--'
+
+          if target.options['shell-command'].to_s.empty?
+            lxc_command += Shellwords.split(command)
+          else
+            lxc_command += Shellwords.split(target.options['shell-command'])
+            lxc_command << command
+          end
 
           @logger.trace { "Executing: #{lxc_command.join(' ')}" }
-          Open3.popen3(lxc_command.join(' '))
+
+          Open3.popen3(*lxc_command)
+        rescue StandardError
+          @logger.trace { "Command aborted" }
+          raise
         end
 
         private def execute_local_command(command)

data/lib/bolt/version.rb

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

data/libexec/apply_catalog.rb

@@ -52,6 +52,19 @@ begin
     $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
   end
 
+  # In the case we are applying on a bolt runner and using bundled-ruby over local transport
+  # we will want to load code shipped with bolt. This is last on the load path and therefore
+  # explicitly packaged plugins should take precedence
+  args['bolt_builtin_content'].each do |builtin_dir|
+    next unless Dir.exist?(builtin_dir)
+    Dir.foreach(builtin_dir) do |dir|
+      unless ['.', '..'].include? dir
+        full_path = File.join(builtin_dir, dir, 'lib')
+        $LOAD_PATH << full_path unless $LOAD_PATH.include?(full_path)
+      end
+    end
+  end
+
   if (conn_info = args['_target'])
     unless (type = conn_info['remote-transport'])
       puts "Cannot execute a catalog for a remote target without knowing it's the remote-transport type."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.29.0
+  version: 3.30.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -366,58 +366,82 @@ dependencies:
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Execute commands remotely over SSH and WinRM
 email:
 - puppet@puppet.com