bolt 3.22.0 → 3.23.1

data/lib/bolt/plugin/puppetdb.rb

@@ -12,13 +12,16 @@ module Bolt
       end
 
       TEMPLATE_OPTS = %w[alias config facts features name uri vars].freeze
-      PLUGIN_OPTS = %w[_plugin _cache query target_mapping].freeze
+      PLUGIN_OPTS = %w[_plugin _cache query target_mapping instance].freeze
 
       attr_reader :puppetdb_client
 
       def initialize(config:, context:)
-        pdb_config = Bolt::PuppetDB::Config.load_config(config, context.boltdir)
-        @puppetdb_client = Bolt::PuppetDB::Client.new(pdb_config)
+        @puppetdb_client = Bolt::PuppetDB::Client.new(default:   config.delete('default'),
+                                                      instances: config.delete('instances') || {},
+                                                      config:    config,
+                                                      project:   context.boltdir)
+
         @logger = Bolt::Logger.logger(self)
       end
 
@@ -59,7 +62,7 @@ module Bolt
       end
 
       def resolve_reference(opts)
-        targets = @puppetdb_client.query_certnames(opts['query'])
+        targets = @puppetdb_client.query_certnames(opts['query'], opts['instance'])
         facts = []
 
         template = opts.delete('target_mapping') || {}
@@ -85,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/plugin.rb

@@ -151,7 +151,8 @@ module Bolt
         msg = "Configuration for the PuppetDB plugin must be in the 'puppetdb' config section, not 'plugins'"
         raise Bolt::Error.new(msg, 'bolt/plugin-error')
       end
-      @unresolved_plugin_configs['puppetdb'] = config.puppetdb if config.puppetdb
+      @unresolved_plugin_configs['puppetdb'] = config.puppetdb.merge('default'   => config.default_puppetdb,
+                                                                     'instances' => config.puppetdb_instances)
     end
 
     # Returns a map of configured plugin hooks. Any unresolved plugin references

data/lib/bolt/puppetdb/client.rb

@@ -2,34 +2,90 @@
 
 require 'json'
 require 'logging'
+require_relative '../../bolt/puppetdb/instance'
 
 module Bolt
   module PuppetDB
     class Client
-      attr_reader :config
-
-      def initialize(config)
-        @config = config
-        @bad_urls = []
-        @current_url = nil
+      # @param config [Hash] A map of default PuppetDB configuration.
+      # @param instances [Hash] A map of configuration for named PuppetDB instances.
+      # @param default [String] The name of PuppetDB instance to use as the default.
+      # @param project [String] The path to the Bolt project.
+      #
+      def initialize(config:, instances: {}, default: nil, project: nil)
         @logger = Bolt::Logger.logger(self)
+
+        @instances = instances.transform_values do |instance_config|
+          Bolt::PuppetDB::Instance.new(config: instance_config, project: project)
+        end
+
+        @default_instance = if default
+                              validate_instance(default)
+                              @instances[default]
+                            else
+                              Bolt::PuppetDB::Instance.new(config: config, project: project, load_defaults: true)
+                            end
+      end
+
+      # Checks whether a given named instance is configured, erroring if not.
+      #
+      # @param name [String] The name of the PuppetDB instance.
+      #
+      private def validate_instance(name)
+        unless @instances[name]
+          raise Bolt::PuppetDBError, "PuppetDB instance '#{name}' has not been configured, unable to connect"
+        end
+      end
+
+      # Yields the PuppetDB instance to connect to.
+      #
+      # @param name [String] The name of the PuppetDB instance.
+      # @yield [Bolt::PuppetDB::Instance]
+      #
+      private def with_instance(name = nil)
+        yield instance(name)
       end
 
-      def query_certnames(query)
+      # Selects the PuppetDB instance to connect to. If an instance is not specified,
+      # the default instance is used.
+      #
+      # @param name [String] The name of the PuppetDB instance.
+      # @return [Bolt::PuppetDB::Instance]
+      #
+      def instance(name = nil)
+        if name
+          validate_instance(name)
+          @instances[name]
+        else
+          @default_instance
+        end
+      end
+
+      # Queries certnames from the PuppetDB instance.
+      #
+      # @param query [String] The PDB query.
+      # @param instance [String] The name of the PuppetDB instance.
+      #
+      def query_certnames(query, instance = nil)
         return [] unless query
 
         @logger.debug("Querying certnames")
-        results = make_query(query)
+        results = make_query(query, nil, instance)
 
         if results&.first && !results.first&.key?('certname')
           fields = results.first&.keys
           raise Bolt::PuppetDBError, "Query results did not contain a 'certname' field: got #{fields.join(', ')}"
         end
+
         results&.map { |result| result['certname'] }&.uniq
       end
 
-      # This method expects an array of certnames to get facts for
-      def facts_for_node(certnames)
+      # Retrieve facts from PuppetDB for a list of nodes.
+      #
+      # @param certnames [Array] The list of certnames to retrieve facts for.
+      # @param instance [String] The name of the PuppetDB instance.
+      #
+      def facts_for_node(certnames, instance = nil)
         return {} if certnames.empty? || certnames.nil?
 
         certnames.uniq!
@@ -37,14 +93,20 @@ module Bolt
         name_query.insert(0, "or")
 
         @logger.debug("Querying certnames")
-        result = make_query(name_query, 'inventory')
+        result = make_query(name_query, 'inventory', instance)
 
         result&.each_with_object({}) do |node, coll|
           coll[node['certname']] = node['facts']
         end
       end
 
-      def fact_values(certnames = [], facts = [])
+      # Retrive fact values for a list of nodes.
+      #
+      # @param certnames [Array] The list of certnames to retrieve fact values for.
+      # @param facts [Array] The list of facts to retrive.
+      # @param instance [String] The name of the PuppetDB instance.
+      #
+      def fact_values(certnames = [], facts = [], instance = nil)
         return {} if certnames.empty? || facts.empty?
 
         certnames.uniq!
@@ -57,135 +119,34 @@ module Bolt
         query = ['and', name_query, facts_query]
 
         @logger.debug("Querying certnames")
-        result = make_query(query, 'fact-contents')
+        result = make_query(query, 'fact-contents', instance)
         result.map! { |h| h.delete_if { |k, _v| %w[environment name].include?(k) } }
         result.group_by { |c| c['certname'] }
       end
 
-      def make_query(query, path = nil)
-        body = JSON.generate(query: query)
-        url = "#{uri}/pdb/query/v4"
-        url += "/#{path}" if path
-
-        begin
-          @logger.debug("Sending PuppetDB query to #{url}")
-          response = http_client.post(url, body: body, header: headers)
-        rescue StandardError => e
-          raise Bolt::PuppetDBFailoverError, "Failed to query PuppetDB: #{e}"
-        end
-
-        @logger.debug("Got response code #{response.code} from PuppetDB")
-        if response.code != 200
-          msg = "Failed to query PuppetDB: #{response.body}"
-          if response.code == 400
-            raise Bolt::PuppetDBError, msg
-          else
-            raise Bolt::PuppetDBFailoverError, msg
-          end
-        end
-
-        begin
-          JSON.parse(response.body)
-        rescue JSON::ParserError
-          raise Bolt::PuppetDBError, "Unable to parse response as JSON: #{response.body}"
-        end
-      rescue Bolt::PuppetDBFailoverError => e
-        @logger.error("Request to puppetdb at #{@current_url} failed with #{e}.")
-        reject_url
-        make_query(query, path)
-      end
-
-      # Sends a command to PuppetDB using version 1 of the commands API.
-      # https://puppet.com/docs/puppetdb/latest/api/command/v1/commands.html
+      # Sends a command to PuppetDB using the commands API.
       #
       # @param command [String] The command to invoke.
       # @param version [Integer] The version of the command to invoke.
       # @param payload [Hash] The payload to send with the command.
-      # @return A UUID identifying the submitted command.
-      #
-      def send_command(command, version, payload)
-        command = command.dup.force_encoding('utf-8')
-        body    = JSON.generate(payload)
-
-        # PDB requires the following query parameters to the POST request.
-        # Error early if there's no certname, as PDB does not return a
-        # message indicating it's required.
-        unless payload['certname']
-          raise Bolt::Error.new(
-            "Payload must include 'certname', unable to invoke command.",
-            'bolt/pdb-command'
-          )
-        end
-
-        url = uri.tap do |u|
-          u.path         = 'pdb/cmd/v1'
-          u.query_values = { 'command'  => command,
-                             'version'  => version,
-                             'certname' => payload['certname'] }
-        end
-
-        # Send the command to PDB
-        begin
-          @logger.debug("Sending PuppetDB command '#{command}' to #{url}")
-          response = http_client.post(url.to_s, body: body, header: headers)
-        rescue StandardError => e
-          raise Bolt::PuppetDBFailoverError, "Failed to invoke PuppetDB command: #{e}"
-        end
-
-        @logger.debug("Got response code #{response.code} from PuppetDB")
-        if response.code != 200
-          raise Bolt::PuppetDBError, "Failed to invoke PuppetDB command: #{response.body}"
-        end
-
-        # Return the UUID string from the response body
-        begin
-          JSON.parse(response.body).fetch('uuid', nil)
-        rescue JSON::ParserError
-          raise Bolt::PuppetDBError, "Unable to parse response as JSON: #{response.body}"
+      # @param instance [String] The name of the PuppetDB instance.
+      #
+      def send_command(command, version, payload, instance = nil)
+        with_instance(instance) do |pdb|
+          pdb.send_command(command, version, payload)
         end
-      rescue Bolt::PuppetDBFailoverError => e
-        @logger.error("Request to puppetdb at #{@current_url} failed with #{e}.")
-        reject_url
-        send_command(command, version, payload)
-      end
-
-      def http_client
-        return @http if @http
-        # lazy-load expensive gem code
-        require 'httpclient'
-        @logger.trace("Creating HTTP Client")
-        @http = HTTPClient.new
-        @http.ssl_config.set_client_cert_file(@config.cert, @config.key) if @config.cert
-        @http.ssl_config.add_trust_ca(@config.cacert)
-        @http.connect_timeout = @config.connect_timeout if @config.connect_timeout
-        @http.receive_timeout = @config.read_timeout if @config.read_timeout
-
-        @http
-      end
-
-      def reject_url
-        @bad_urls << @current_url if @current_url
-        @current_url = nil
       end
 
-      def uri
-        require 'addressable/uri'
-
-        @current_url ||= (@config.server_urls - @bad_urls).first
-        unless @current_url
-          msg = "Failed to connect to all PuppetDB server_urls: #{@config.server_urls.to_a.join(', ')}."
-          raise Bolt::PuppetDBError, msg
+      # Sends a query to PuppetDB.
+      #
+      # @param query [String] The query to send to PuppetDB.
+      # @param path [String] The API path to append to the query URL.
+      # @param instance [String] The name of the PuppetDB instance.
+      #
+      def make_query(query, path = nil, instance = nil)
+        with_instance(instance) do |pdb|
+          pdb.make_query(query, path)
         end
-
-        uri = Addressable::URI.parse(@current_url)
-        uri.port ||= 8081
-        uri
-      end
-
-      def headers
-        headers = { 'Content-Type' => 'application/json' }
-        headers['X-Authentication'] = @config.token if @config.token
-        headers
       end
     end
   end

data/lib/bolt/puppetdb/config.rb

@@ -17,11 +17,30 @@ module Bolt
 
       end
 
+      def initialize(config:, project: nil, load_defaults: false)
+        @settings = if load_defaults
+                      self.class.default_config.merge(config)
+                    else
+                      config
+                    end
+
+        expand_paths(project)
+      end
+
+      # Returns the path to the puppetdb.conf file on Windows.
+      #
+      # @return [String]
+      #
       def self.default_windows_config
         File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs/client-tools/puppetdb.conf'))
       end
 
-      def self.load_config(options, project_path = nil)
+      # Loads default configuration from the puppetdb.conf file on system. If
+      # the file is not present, defaults to an empty hash.
+      #
+      # @return [Hash]
+      #
+      def self.default_config
         config = {}
         global_path = Bolt::Util.windows? ? default_windows_config : DEFAULT_CONFIG[:global]
 
@@ -37,13 +56,7 @@ module Bolt
           Bolt::Logger.logger(self).error("Could not load puppetdb.conf from #{filepath}: #{e.message}")
         end
 
-        config = config.fetch('puppetdb', {})
-        new(config.merge(options), project_path)
-      end
-
-      def initialize(settings, project_path = nil)
-        @settings = settings
-        expand_paths(project_path)
+        config.fetch('puppetdb', {})
       end
 
       def token

data/lib/bolt/puppetdb/instance.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'logging'
+require_relative '../../bolt/puppetdb/config'
+
+module Bolt
+  module PuppetDB
+    class Instance
+      attr_reader :config
+
+      def initialize(config:, project: nil, load_defaults: false)
+        @config      = Bolt::PuppetDB::Config.new(config: config, project: project, load_defaults: load_defaults)
+        @bad_urls    = []
+        @current_url = nil
+        @logger      = Bolt::Logger.logger(self)
+      end
+
+      def make_query(query, path = nil)
+        body = JSON.generate(query: query)
+        url = "#{uri}/pdb/query/v4"
+        url += "/#{path}" if path
+
+        begin
+          @logger.debug("Sending PuppetDB query to #{url}")
+          response = http_client.post(url, body: body, header: headers)
+        rescue StandardError => e
+          raise Bolt::PuppetDBFailoverError, "Failed to query PuppetDB: #{e}"
+        end
+
+        @logger.debug("Got response code #{response.code} from PuppetDB")
+        if response.code != 200
+          msg = "Failed to query PuppetDB: #{response.body}"
+          if response.code == 400
+            raise Bolt::PuppetDBError, msg
+          else
+            raise Bolt::PuppetDBFailoverError, msg
+          end
+        end
+
+        begin
+          JSON.parse(response.body)
+        rescue JSON::ParserError
+          raise Bolt::PuppetDBError, "Unable to parse response as JSON: #{response.body}"
+        end
+      rescue Bolt::PuppetDBFailoverError => e
+        @logger.error("Request to puppetdb at #{@current_url} failed with #{e}.")
+        reject_url
+        make_query(query, path)
+      end
+
+      # Sends a command to PuppetDB using version 1 of the commands API.
+      # https://puppet.com/docs/puppetdb/latest/api/command/v1/commands.html
+      #
+      # @param command [String] The command to invoke.
+      # @param version [Integer] The version of the command to invoke.
+      # @param payload [Hash] The payload to send with the command.
+      # @return A UUID identifying the submitted command.
+      #
+      def send_command(command, version, payload)
+        command = command.dup.force_encoding('utf-8')
+        body    = JSON.generate(payload)
+
+        # PDB requires the following query parameters to the POST request.
+        # Error early if there's no certname, as PDB does not return a
+        # message indicating it's required.
+        unless payload['certname']
+          raise Bolt::Error.new(
+            "Payload must include 'certname', unable to invoke command.",
+            'bolt/pdb-command'
+          )
+        end
+
+        url = uri.tap do |u|
+          u.path         = 'pdb/cmd/v1'
+          u.query_values = { 'command'  => command,
+                             'version'  => version,
+                             'certname' => payload['certname'] }
+        end
+
+        # Send the command to PDB
+        begin
+          @logger.debug("Sending PuppetDB command '#{command}' to #{url}")
+          response = http_client.post(url.to_s, body: body, header: headers)
+        rescue StandardError => e
+          raise Bolt::PuppetDBFailoverError, "Failed to invoke PuppetDB command: #{e}"
+        end
+
+        @logger.debug("Got response code #{response.code} from PuppetDB")
+        if response.code != 200
+          raise Bolt::PuppetDBError, "Failed to invoke PuppetDB command: #{response.body}"
+        end
+
+        # Return the UUID string from the response body
+        begin
+          JSON.parse(response.body).fetch('uuid', nil)
+        rescue JSON::ParserError
+          raise Bolt::PuppetDBError, "Unable to parse response as JSON: #{response.body}"
+        end
+      rescue Bolt::PuppetDBFailoverError => e
+        @logger.error("Request to puppetdb at #{@current_url} failed with #{e}.")
+        reject_url
+        send_command(command, version, payload)
+      end
+
+      def http_client
+        return @http if @http
+        # lazy-load expensive gem code
+        require 'httpclient'
+        @logger.trace("Creating HTTP Client")
+        @http = HTTPClient.new
+        @http.ssl_config.set_client_cert_file(@config.cert, @config.key) if @config.cert
+        @http.ssl_config.add_trust_ca(@config.cacert)
+        @http.connect_timeout = @config.connect_timeout if @config.connect_timeout
+        @http.receive_timeout = @config.read_timeout if @config.read_timeout
+
+        @http
+      end
+
+      def reject_url
+        @bad_urls << @current_url if @current_url
+        @current_url = nil
+      end
+
+      def uri
+        require 'addressable/uri'
+
+        @current_url ||= (@config.server_urls - @bad_urls).first
+        unless @current_url
+          msg = "Failed to connect to all PuppetDB server_urls: #{@config.server_urls.to_a.join(', ')}."
+          raise Bolt::PuppetDBError, msg
+        end
+
+        uri = Addressable::URI.parse(@current_url)
+        uri.port ||= 8081
+        uri
+      end
+
+      def headers
+        headers = { 'Content-Type' => 'application/json' }
+        headers['X-Authentication'] = @config.token if @config.token
+        headers
+      end
+    end
+  end
+end

data/lib/bolt/result.rb

@@ -128,7 +128,7 @@ module Bolt
 
     def _pcore_init_from_hash(init_hash)
       opts = init_hash.reject { |k, _v| k == 'target' }
-      initialize(init_hash['target'], opts.transform_keys(&:to_sym))
+      initialize(init_hash['target'], **opts.transform_keys(&:to_sym))
     end
 
     def _pcore_init_hash

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '3.22.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

data/lib/bolt_spec/plans/action_stubs/download_stub.rb

@@ -41,7 +41,7 @@ module BoltSpec
         @invocation[:options]
       end
 
-      def result_for(_target, _data)
+      def result_for(_target, **_data)
         raise 'Download result cannot be changed'
       end
 

data/lib/bolt_spec/plans/action_stubs/plan_stub.rb

@@ -30,7 +30,7 @@ module BoltSpec
       end
 
       # Allow any data.
-      def result_for(_target, data)
+      def result_for(_target, **data)
         Bolt::PlanResult.new(Bolt::Util.walk_keys(data, &:to_s), 'success')
       end
 

data/lib/bolt_spec/plans/action_stubs/task_stub.rb

@@ -37,7 +37,7 @@ module BoltSpec
       end
 
       # Allow any data.
-      def result_for(target, data)
+      def result_for(target, **data)
         Bolt::Result.new(target, value: Bolt::Util.walk_keys(data, &:to_s))
       end
 

data/lib/bolt_spec/plans/action_stubs/upload_stub.rb

@@ -40,7 +40,7 @@ module BoltSpec
         @invocation[:options]
       end
 
-      def result_for(_target, _data)
+      def result_for(_target, **_data)
         raise 'Upload result cannot be changed'
       end
 

data/lib/bolt_spec/plans/action_stubs.rb

@@ -93,7 +93,7 @@ module BoltSpec
         when Bolt::Error
           Bolt::Result.from_exception(target, @data[:default])
         when Hash
-          result_for(target, Bolt::Util.walk_keys(@data[:default], &:to_sym))
+          result_for(target, **Bolt::Util.walk_keys(@data[:default], &:to_sym))
         else
           raise 'Default result must be a Hash'
         end
@@ -156,7 +156,7 @@ module BoltSpec
           # set the inventory from the BoltSpec::Plans, otherwise if we try to convert
           # this target to a string, it will fail to string conversion because the
           # inventory is nil
-          hsh[target] = result_for(Bolt::Target.new(target, @inventory), Bolt::Util.walk_keys(result, &:to_sym))
+          hsh[target] = result_for(Bolt::Target.new(target, @inventory), **Bolt::Util.walk_keys(result, &:to_sym))
         end
         raise "Cannot set return values and return block." if @return_block
         @data_set = true

data/lib/bolt_spec/plans/mock_executor.rb

@@ -210,7 +210,7 @@ module BoltSpec
         @allow_apply = true
       end
 
-      def wait_until_available(targets, _options)
+      def wait_until_available(targets, **_options)
         Bolt::ResultSet.new(targets.map { |target| Bolt::Result.new(target) })
       end
 

data/lib/bolt_spec/plans.rb

@@ -103,6 +103,16 @@ module BoltSpec
 
     # Provided as a class so expectations can be placed on it.
     class MockPuppetDBClient
+      def initialize(config)
+        @instance = MockPuppetDBInstance.new(config)
+      end
+
+      def instance(_instance)
+        @instance
+      end
+    end
+
+    class MockPuppetDBInstance
       attr_reader :config
 
       def initialize(config)
@@ -111,7 +121,7 @@ module BoltSpec
     end
 
     def puppetdb_client
-      @puppetdb_client ||= MockPuppetDBClient.new(Bolt::PuppetDB::Config.new({}))
+      @puppetdb_client ||= MockPuppetDBClient.new({})
     end
 
     def run_plan(name, params)