bolt 3.25.0 → 3.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3e07dae1f3e80d3b4ade7c9d78749f54c592e246b2fd82e6264ab908b8baa1
-  data.tar.gz: 44af49cb408f92496c9795d892bc2e43e04788dd6ead42070a04e258958f00ac
+  metadata.gz: 7fe078a4da4d1447d8214edee250d80c0132b2a8913bd16f24016315a46ff215
+  data.tar.gz: 89e27a1ed523fd9aca8d80ea94c53071bde9f0b1af947768880b8055dc47f27b
 SHA512:
-  metadata.gz: 0d158d8a0d8c72c99a34464ad4de0df9e7b04a83b1509b048c5b650baccbea9a06f99dfd512bfc8bdc91f5065e22148b76814a895766717bfe9f2c34bd81e55f
-  data.tar.gz: eca8af5592551ff9a273ad508831f9a1e07edf0327aa29dcc7078e5fb44743033c92388d79ab22ae2d3c5ea9574984b0c50849544159ab8dd32c2090a0dad939
+  metadata.gz: 8955b0ea1e737618918839b34c9b6049f884c1983e3ebb0f4ee50c4ea85007fade6dabfbf21ae34f201bf0eabb9497bcd5a33fbe3c833ada430ccced628b4477
+  data.tar.gz: 8b1e6f84326c1e5adeb988cdadac80b2bb49b71ed2ce24dc0b0c881970e88aadbede4eaf5f3479b8f2434a9a4a221128e643d145ecffc47b1075d566ef741cd3

data/lib/bolt/inventory/inventory.rb

@@ -125,16 +125,25 @@ module Bolt
       end
 
       # If target is a group name, expand it to the members of that group.
-      # Else match against targets in inventory by name or alias.
+      # Else match against groups and targets in inventory by name or alias.
       # If a wildcard string, 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
+          group.all_targets.to_a
         else
-          # Try to wildcard match targets in inventory
-          # Ignore case because hostnames are generally case-insensitive
-          targets = groups.all_targets.select { |targ| match_wildcard?(target, targ, ext_glob: ext_glob) }
+          targets = []
+
+          # Find groups that match the glob
+          group_lookup.each do |name, grp|
+            next unless match_wildcard?(target, name, ext_glob: ext_glob)
+            targets += grp.all_targets.to_a
+          end
+
+          # Find target names that match the glob
+          targets += groups.all_targets.select { |targ| match_wildcard?(target, targ, ext_glob: ext_glob) }
+
+          # Find target aliases that match the glob
           targets += groups.target_aliases
                            .select { |tgt_alias, _| match_wildcard?(target, tgt_alias, ext_glob: ext_glob) }
                            .values
@@ -143,7 +152,7 @@ module Bolt
             raise(WildcardError, target) if target.include?('*')
             [target]
           else
-            targets
+            targets.uniq
           end
         end
       end

data/lib/bolt/outputter/human.rb

@@ -194,7 +194,7 @@ module Bolt
               end
             end
           when 'lookup'
-            @stream.puts(indent(2, result['value']))
+            @stream.puts(indent(2, Bolt::Util::Format.stringify(result['value'])))
           else
             if result.generic_value.any?
               @stream.puts(indent(2, ::JSON.pretty_generate(result.generic_value)))
@@ -363,7 +363,7 @@ module Bolt
                  end
         usage << (Bolt::Util.powershell? ? ' [-Noop]' : ' [--noop]') if task.supports_noop
         params.each do |name, data|
-          usage << if data['type']&.start_with?('Optional')
+          usage << if data['type']&.start_with?('Optional') || data.key?('default')
                      " [#{name}=<value>]"
                    else
                      " #{name}=<value>"

data/lib/bolt/plugin/puppetdb.rb

@@ -79,8 +79,9 @@ module Bolt
 
         Bolt::Util.walk_vals(template) do |value|
           # This is done in parts instead of in place so that we only need to
-          # make one puppetDB query
-          if value.is_a?(String)
+          # make one puppetDB query. Don't gather certname since we already
+          # have that and it's not a fact.
+          if value.is_a?(String) && value != 'certname'
             facts << fact_path(value)
           end
           value

data/lib/bolt/puppetdb/client.rb

@@ -110,11 +110,11 @@ module Bolt
         return {} if certnames.empty? || facts.empty?
 
         certnames.uniq!
-        name_query = certnames.map { |c| ["=", "certname", c] }
-        name_query.insert(0, "or")
+        name_query = certnames.each_slice(100).map { |slice| ["in", "certname", ["array", slice]] }
+        name_query.unshift("or")
 
         facts_query = facts.map { |f| ["=", "path", f] }
-        facts_query.insert(0, "or")
+        facts_query.unshift("or")
 
         query = ['and', name_query, facts_query]
 

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.25.0
+  version: 3.26.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -256,16 +256,22 @@ dependencies:
   name: puppet-strings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -690,7 +696,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Execute commands remotely over SSH and WinRM