bolt 3.23.0 → 3.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b79c90eb580d16111b19753003a7620e530ab9f10a47eb2cc4a5d5f5f1e15e1
-  data.tar.gz: 791076493e0979acd945dd80f6d513eefaaa1170d36f626bf71c1d9a8ff990f3
+  metadata.gz: 67f08b10db67ef79aadf22a542f6564aa502743f53619f41c40aff4761e2e0c0
+  data.tar.gz: 81d8b927c1349299ba568358a2f155d624fb28f7b65ae5985bcfc8b6fe24eb6b
 SHA512:
-  metadata.gz: 881675efbe7148a860a49fb4d74d8c8332af588d27526e29a1df99acbeacee0f802e6f0c71c710506bfdd1e6210a82645eaf1cdb1053d52b760318898142ee93
-  data.tar.gz: 316cb92d945be0a2f3287e6dd7e4cee7505af08b8918f539f9b9ee678f7c9e7704d5dbb83f617eab772dc86f4521c93fab8e01778e5348873c8b39488baf3b43
+  metadata.gz: a3e66f8d5adc727228b09e212de34c7de796c556a0d91153e1599cbf619b30b98c9358ea3683c2e00650375ecac8745fdf7a79977a42d6761967ce98c5c2ac71
+  data.tar.gz: a6dedd218bc2db8e5365906366a1cbeef5e99b02f606c80677081eccc71172fa7f15f3798630847239228feafc861278938044e98b2107429c8e34cea7143f9c

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

@@ -10,6 +10,7 @@ module Bolt
         WINDOWS_OPTIONS = %w[
           bundled-ruby
           cleanup
+          extensions
           interpreters
           tmpdir
         ].freeze

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '3.23.0'
+  VERSION = '3.23.1'
 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.23.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable