bolt 3.23.1 → 3.26.1

data/lib/bolt/outputter/human.rb

@@ -2,6 +2,7 @@
 
 require_relative '../../bolt/container_result'
 require_relative '../../bolt/pal'
+require_relative '../../bolt/util/format'
 
 module Bolt
   class Outputter
@@ -193,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)))
@@ -362,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>"
@@ -890,7 +891,7 @@ module Bolt
       end
 
       def print_message(message)
-        @stream.puts(message)
+        @stream.puts(Bolt::Util::Format.stringify(message))
       end
 
       def print_error(message)

data/lib/bolt/outputter/json.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../bolt/util/format'
+
 module Bolt
   class Outputter
     class JSON < Bolt::Outputter
@@ -190,7 +192,7 @@ module Bolt
       end
 
       def print_message(message)
-        $stderr.puts(message)
+        $stderr.puts(Bolt::Util::Format.stringify(message))
       end
       alias print_error print_message
 

data/lib/bolt/outputter/rainbow.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../bolt/pal'
+require_relative '../../bolt/util/format'
 
 module Bolt
   class Outputter
@@ -110,7 +111,7 @@ module Bolt
       end
 
       def print_message(message)
-        @stream.puts colorize(:rainbow, message)
+        @stream.puts colorize(:rainbow, Bolt::Util::Format.stringify(message))
       end
     end
   end

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/result.rb

@@ -200,16 +200,18 @@ module Bolt
 
     def to_data
       serialized_value = safe_value
+
       if serialized_value.key?('_sensitive') &&
          serialized_value['_sensitive'].is_a?(Puppet::Pops::Types::PSensitiveType::Sensitive)
         serialized_value['_sensitive'] = serialized_value['_sensitive'].to_s
       end
+
       {
         "target" => @target.name,
         "action" => action,
         "object" => object,
         "status" => status,
-        "value" => serialized_value
+        "value"  => serialized_value
       }
     end
 

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

@@ -6,7 +6,7 @@ module Bolt
       class Connection
         attr_reader :logger, :key
 
-        CONTEXT_KEYS = Set.new(%i[plan_name description params]).freeze
+        CONTEXT_KEYS = Set.new(%i[plan_name description params sensitive]).freeze
 
         def self.get_key(opts)
           [
@@ -46,6 +46,7 @@ module Bolt
           if plan_context
             begin
               opts = plan_context.select { |k, _| CONTEXT_KEYS.include? k }
+              opts[:params] = opts[:params].reject { |k, _| plan_context[:sensitive].include?(k) }
               @client.command.plan_start(opts)['name']
             rescue OrchestratorClient::ApiError => e
               if e.code == '404'

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

@@ -53,9 +53,11 @@ module Bolt
             @connection = ::WinRM::Connection.new(options)
             @connection.logger = @transport_logger
 
-            @session = @connection.shell(:powershell)
-            @session.run('$PSVersionTable.PSVersion')
-            @logger.trace { "Opened session" }
+            @connection.shell(:powershell) do |session|
+              session.run('$PSVersionTable.PSVersion')
+            end
+
+            @logger.trace { "Opened connection" }
           end
         rescue Timeout::Error
           # If we're using the default port with SSL, a timeout probably means the
@@ -95,9 +97,8 @@ module Bolt
         end
 
         def disconnect
-          @session&.close
           @client&.disconnect!
-          @logger.trace { "Closed session" }
+          @logger.trace { "Closed connection" }
         end
 
         def execute(command)
@@ -116,12 +117,18 @@ module Bolt
             # propagate to the main thread via the shell, there's no chance
             # they will be unhandled, so the default stack trace is unneeded.
             Thread.current.report_on_exception = false
-            result = @session.run(command)
-            out_wr << result.stdout
-            err_wr << result.stderr
-            out_wr.close
-            err_wr.close
-            result.exitcode
+
+            # Open a new shell instance for each command executed. PowerShell is
+            # unable to unload any DLLs loaded when running a PowerShell script
+            # or task from the same shell instance they were loaded in, which
+            # prevents Bolt from cleaning up the temp directory successfully.
+            # Using a new PowerShell instance avoids this limitation.
+            @connection.shell(:powershell) do |session|
+              result = session.run(command)
+              out_wr << result.stdout
+              err_wr << result.stderr
+              result.exitcode
+            end
           ensure
             # Close the streams to avoid the caller deadlocking
             out_wr.close

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.23.1
+  version: 3.26.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -163,6 +163,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,6 +173,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-krb
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +222,22 @@ dependencies:
   name: puppetfile-resolver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: puppet-resource_api
   requirement: !ruby/object:Gem::Requirement
@@ -520,6 +532,10 @@ files:
 - lib/bolt/module_installer/specs.rb
 - lib/bolt/module_installer/specs/forge_spec.rb
 - lib/bolt/module_installer/specs/git_spec.rb
+- lib/bolt/module_installer/specs/id/base.rb
+- lib/bolt/module_installer/specs/id/gitclone.rb
+- lib/bolt/module_installer/specs/id/github.rb
+- lib/bolt/module_installer/specs/id/gitlab.rb
 - lib/bolt/node/errors.rb
 - lib/bolt/node/output.rb
 - lib/bolt/outputter.rb