bolt 3.23.0 → 3.25.0

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
@@ -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

@@ -88,7 +88,7 @@ module Bolt
 
         facts.uniq!
         # Returns {'mycertname' => [{'path' => ['nested', 'fact'], 'value' => val'}], ... }
-        fact_values = @puppetdb_client.fact_values(targets, facts)
+        fact_values = @puppetdb_client.fact_values(targets, facts, opts['instance'])
 
         targets.map do |certname|
           target_data = fact_values[certname]

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.0'
+  VERSION = '3.25.0'
 end

data/lib/bolt_server/file_cache.rb

@@ -8,6 +8,7 @@ require 'digest'
 require 'fileutils'
 require 'net/http'
 require 'logging'
+require 'timeout'
 
 require 'bolt/error'
 
@@ -38,8 +39,7 @@ module BoltServer
 
       if do_purge
         @purge = Concurrent::TimerTask.new(execution_interval: purge_interval,
-                                           timeout_interval: purge_timeout,
-                                           run_now: true) { expire(purge_ttl) }
+                                           run_now: true) { expire(purge_ttl, purge_timeout) }
         @purge.execute
       end
     end
@@ -171,13 +171,15 @@ module BoltServer
       serial_execute { download_file(file_path, sha, file_data['uri']) }
     end
 
-    def expire(purge_ttl)
+    def expire(purge_ttl, purge_timeout)
       expired_time = Time.now - purge_ttl
-      @cache_dir_mutex.with_write_lock do
-        Dir.glob(File.join(@cache_dir, '*')).select { |f| File.directory?(f) }.each do |dir|
-          if (mtime = File.mtime(dir)) < expired_time && dir != tmppath
-            @logger.debug("Removing #{dir}, last used at #{mtime}")
-            FileUtils.remove_dir(dir)
+      Timeout.timeout(purge_timeout) do
+        @cache_dir_mutex.with_write_lock do
+          Dir.glob(File.join(@cache_dir, '*')).select { |f| File.directory?(f) }.each do |dir|
+            if (mtime = File.mtime(dir)) < expired_time && dir != tmppath
+              @logger.debug("Removing #{dir}, last used at #{mtime}")
+              FileUtils.remove_dir(dir)
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.23.0
+  version: 3.25.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-07-27 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