puppet 8.5.0 → 8.6.0

data/lib/puppet/http/proxy.rb

@@ -6,7 +6,7 @@ require_relative '../../puppet/ssl/openssl_loader'
 module Puppet::HTTP::Proxy
   def self.proxy(uri)
     if http_proxy_host && !no_proxy?(uri)
-      Net::HTTP.new(uri.host, uri.port, self.http_proxy_host, self.http_proxy_port, self.http_proxy_user, self.http_proxy_password)
+      Net::HTTP.new(uri.host, uri.port, http_proxy_host, http_proxy_port, http_proxy_user, http_proxy_password)
     else
       http = Net::HTTP.new(uri.host, uri.port, nil, nil, nil, nil)
       # Net::HTTP defaults the proxy port even though we said not to
@@ -24,7 +24,7 @@ module Puppet::HTTP::Proxy
     rescue URI::InvalidURIError
       return nil
     end
-    return nil
+    nil
   end
 
   # The documentation around the format of the no_proxy variable seems
@@ -56,11 +56,11 @@ module Puppet::HTTP::Proxy
       # If this no_proxy entry specifies a port, we want to match it against
       # the destination port.  Otherwise just match hosts.
       if port
-        no_proxy_regex  = %r(#{host}:#{port}$)
+        no_proxy_regex  = /#{host}:#{port}$/
         dest_string     = "#{dest.host}:#{dest.port}"
       else
-        no_proxy_regex  = %r(#{host}$)
-        dest_string     = "#{dest.host}"
+        no_proxy_regex  = /#{host}$/
+        dest_string     = dest.host.to_s
       end
 
       if no_proxy_regex.match(dest_string)
@@ -68,11 +68,11 @@ module Puppet::HTTP::Proxy
       end
     end
 
-    return false
+    false
   end
 
   def self.http_proxy_host
-    env = self.http_proxy_env
+    env = http_proxy_env
 
     if env and env.host
       return env.host
@@ -82,21 +82,21 @@ module Puppet::HTTP::Proxy
       return nil
     end
 
-    return Puppet.settings[:http_proxy_host]
+    Puppet.settings[:http_proxy_host]
   end
 
   def self.http_proxy_port
-    env = self.http_proxy_env
+    env = http_proxy_env
 
     if env and env.port
       return env.port
     end
 
-    return Puppet.settings[:http_proxy_port]
+    Puppet.settings[:http_proxy_port]
   end
 
   def self.http_proxy_user
-    env = self.http_proxy_env
+    env = http_proxy_env
 
     if env and env.user
       return env.user
@@ -106,11 +106,11 @@ module Puppet::HTTP::Proxy
       return nil
     end
 
-    return Puppet.settings[:http_proxy_user]
+    Puppet.settings[:http_proxy_user]
   end
 
   def self.http_proxy_password
-    env = self.http_proxy_env
+    env = http_proxy_env
 
     if env and env.password
       return env.password
@@ -120,7 +120,7 @@ module Puppet::HTTP::Proxy
       return nil
     end
 
-    return Puppet.settings[:http_proxy_password]
+    Puppet.settings[:http_proxy_password]
   end
 
   def self.no_proxy
@@ -134,6 +134,6 @@ module Puppet::HTTP::Proxy
       return nil
     end
 
-    return Puppet.settings[:no_proxy]
+    Puppet.settings[:no_proxy]
   end
 end

data/lib/puppet/http/redirector.rb

@@ -43,7 +43,7 @@ class Puppet::HTTP::Redirector
   #
   # @api private
   def redirect_to(request, response, redirects)
-    raise Puppet::HTTP::TooManyRedirects.new(request.uri) if redirects >= @redirect_limit
+    raise Puppet::HTTP::TooManyRedirects, request.uri if redirects >= @redirect_limit
 
     location = parse_location(response)
     url = request.uri.merge(location)
@@ -56,6 +56,10 @@ class Puppet::HTTP::Redirector
         next if header.casecmp('Authorization').zero? && request.uri.host.casecmp(location.host) != 0
         next if header.casecmp('Cookie').zero? && request.uri.host.casecmp(location.host) != 0
       end
+      # Allow Net::HTTP to set its own Accept-Encoding header to avoid errors with HTTP compression.
+      # See https://github.com/puppetlabs/puppet/issues/9143
+      next if header.casecmp('Accept-Encoding').zero?
+
       new_request[header] = value
     end
 
@@ -74,7 +78,7 @@ class Puppet::HTTP::Redirector
 
   def parse_location(response)
     location = response['location']
-    raise Puppet::HTTP::ProtocolError.new(_("Location response header is missing")) unless location
+    raise Puppet::HTTP::ProtocolError, _("Location response header is missing") unless location
 
     URI.parse(location)
   rescue URI::InvalidURIError => e

data/lib/puppet/http/resolver.rb

@@ -42,9 +42,9 @@ class Puppet::HTTP::Resolver
   # @api public
   def check_connection?(session, service, ssl_context: nil)
     service.connect(ssl_context: ssl_context)
-    return true
+    true
   rescue Puppet::HTTP::ConnectionError => e
     Puppet.log_exception(e, "Connection to #{service.url} failed, trying next route: #{e.message}")
-    return false
+    false
   end
 end

data/lib/puppet/http/retry_after_handler.rb

@@ -48,7 +48,7 @@ class Puppet::HTTP::RetryAfterHandler
   #
   # @api private
   def retry_after_interval(request, response, retries)
-    raise Puppet::HTTP::TooManyRetryAfters.new(request.uri) if retries >= @retry_limit
+    raise Puppet::HTTP::TooManyRetryAfters, request.uri if retries >= @retry_limit
 
     retry_after = response['Retry-After']
     return nil unless retry_after
@@ -72,7 +72,7 @@ class Puppet::HTTP::RetryAfterHandler
       seconds = (tm.to_time - DateTime.now.to_time).to_i
       [seconds, 0].max
     rescue ArgumentError
-      raise Puppet::HTTP::ProtocolError.new(_("Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date") % { retry_after: retry_after })
+      raise Puppet::HTTP::ProtocolError, _("Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date") % { retry_after: retry_after }
     end
   end
 end

data/lib/puppet/http/service/ca.rb

@@ -124,7 +124,7 @@ class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
       options: { ssl_context: ssl_context }
     )
 
-    raise ArgumentError.new(_('SSL context must contain a client certificate.')) unless ssl_context.client_cert
+    raise ArgumentError, _('SSL context must contain a client certificate.') unless ssl_context.client_cert
 
     process_response(response)
 

data/lib/puppet/http/service/compiler.rb

@@ -118,7 +118,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       body,
       headers: headers,
       # for legacy reasons we always send environment as a query parameter too
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     if (compiler = response['X-Puppet-Compiler-Name'])
@@ -163,9 +163,9 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   #
   def post_catalog4(certname, persistence:, environment:, facts: nil, trusted_facts: nil, transaction_uuid: nil, job_id: nil, options: nil)
     unless persistence.is_a?(Hash) && (missing = [:facts, :catalog] - persistence.keys.map(&:to_sym)).empty?
-      raise ArgumentError.new("The 'persistence' hash is missing the keys: #{missing.join(', ')}")
+      raise ArgumentError, "The 'persistence' hash is missing the keys: #{missing.join(', ')}"
     end
-    raise ArgumentError.new("Facts must be a Hash not a #{facts.class}") unless facts.nil? || facts.is_a?(Hash)
+    raise ArgumentError, "Facts must be a Hash not a #{facts.class}" unless facts.nil? || facts.is_a?(Hash)
 
     body = {
       certname: certname,
@@ -248,7 +248,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       with_base_url("/facts/#{name}"),
       serialize(formatter, facts),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     process_response(response)

data/lib/puppet/http/service/file_server.rb

@@ -11,7 +11,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   API = '/puppet/v3'
 
   # @return [RegEx] RegEx used to determine if a path contains a leading slash
-  PATH_REGEX = /^\//
+  PATH_REGEX = %r{^/}
 
   # Use `Puppet::HTTP::Session.route_to(:fileserver)` to create or get an instance of this class.
   #

data/lib/puppet/http/service/report.rb

@@ -47,7 +47,7 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
       with_base_url("/report/#{name}"),
       serialize(formatter, report),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     # override parent's process_response handling
@@ -56,7 +56,7 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
     if response.success?
       response
     else
-      raise Puppet::HTTP::ResponseError.new(response)
+      raise Puppet::HTTP::ResponseError, response
     end
   end
 end

data/lib/puppet/http/service.rb

@@ -129,30 +129,26 @@ class Puppet::HTTP::Service
 
   def formatter_for_response(response)
     header = response['Content-Type']
-    raise Puppet::HTTP::ProtocolError.new(_("No content type in http response; cannot parse")) unless header
+    raise Puppet::HTTP::ProtocolError, _("No content type in http response; cannot parse") unless header
 
     header.gsub!(/\s*;.*$/, '') # strip any charset
 
     formatter = Puppet::Network::FormatHandler.mime(header)
-    raise Puppet::HTTP::ProtocolError.new("Content-Type is unsupported") if EXCLUDED_FORMATS.include?(formatter.name)
+    raise Puppet::HTTP::ProtocolError, "Content-Type is unsupported" if EXCLUDED_FORMATS.include?(formatter.name)
 
     formatter
   end
 
   def serialize(formatter, object)
-    begin
-      formatter.render(object)
-    rescue => err
-      raise Puppet::HTTP::SerializationError.new("Failed to serialize #{object.class} to #{formatter.name}: #{err.message}", err)
-    end
+    formatter.render(object)
+  rescue => err
+    raise Puppet::HTTP::SerializationError.new("Failed to serialize #{object.class} to #{formatter.name}: #{err.message}", err)
   end
 
   def serialize_multiple(formatter, object)
-    begin
-      formatter.render_multiple(object)
-    rescue => err
-      raise Puppet::HTTP::SerializationError.new("Failed to serialize multiple #{object.class} to #{formatter.name}: #{err.message}", err)
-    end
+    formatter.render_multiple(object)
+  rescue => err
+    raise Puppet::HTTP::SerializationError.new("Failed to serialize multiple #{object.class} to #{formatter.name}: #{err.message}", err)
   end
 
   def deserialize(response, model)
@@ -176,6 +172,6 @@ class Puppet::HTTP::Service
   def process_response(response)
     @session.process_response(response)
 
-    raise Puppet::HTTP::ResponseError.new(response) unless response.success?
+    raise Puppet::HTTP::ResponseError, response unless response.success?
   end
 end

data/lib/puppet/http/session.rb

@@ -52,7 +52,7 @@ class Puppet::HTTP::Session
     raise ArgumentError, "Unknown service #{name}" unless Puppet::HTTP::Service.valid_name?(name)
 
     # short circuit if explicit URL host & port given
-    if url && url.host != nil && !url.host.empty?
+    if url && !url.host.nil? && !url.host.empty?
       service = Puppet::HTTP::Service.create_service(@client, self, name, url.host, url.port)
       service.connect(ssl_context: ssl_context)
       return service

data/lib/puppet/http/site.rb

@@ -10,7 +10,7 @@ class Puppet::HTTP::Site
   attr_reader :scheme, :host, :port
 
   def self.from_uri(uri)
-    self.new(uri.scheme, uri.host, uri.port)
+    new(uri.scheme, uri.host, uri.port)
   end
 
   def initialize(scheme, host, port)

data/lib/puppet/indirector/catalog/compiler.rb

@@ -51,7 +51,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   def find(request)
     facts = extract_facts_from_request(request)
 
-    save_facts_from_request(facts, request) if !facts.nil?
+    save_facts_from_request(facts, request) unless facts.nil?
 
     node = node_from_request(facts, request)
     node.trusted_data = Puppet.lookup(:trusted_information) { Puppet::Context::TrustedInformation.local(node) }.to_h
@@ -89,7 +89,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
   # filter-out a catalog to remove exported resources
   def filter(catalog)
-    return catalog.filter { |r| r.virtual? } if catalog.respond_to?(:filter)
+    return catalog.filter(&:virtual?) if catalog.respond_to?(:filter)
 
     catalog
   end
@@ -120,9 +120,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     when 'pson'
       # We unescape here because the corresponding code in Puppet::Configurer::FactHandler encodes with Puppet::Util.uri_query_encode
       # PSON is deprecated, but continue to accept from older agents
-      return Puppet::Node::Facts.convert_from('pson', CGI.unescape(facts))
+      Puppet::Node::Facts.convert_from('pson', CGI.unescape(facts))
     when 'application/json'
-      return Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
+      Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
     else
       raise ArgumentError, _("Unsupported facts format")
     end
@@ -139,9 +139,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # If no match is found, return nil.
   def common_checksum_type(agent_checksum_type)
     if agent_checksum_type
-      agent_checksum_types = agent_checksum_type.split('.').map { |type| type.to_sym }
+      agent_checksum_types = agent_checksum_type.split('.').map(&:to_sym)
       checksum_type = agent_checksum_types.drop_while do |type|
-        not known_checksum_types.include? type
+        !known_checksum_types.include? type
       end.first
     end
     checksum_type
@@ -156,24 +156,23 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     source_as_uri = URI.parse(Puppet::Util.uri_encode(source))
     server = source_as_uri.host
     port = ":#{source_as_uri.port}" if source_as_uri.port
-    return "puppet://#{server}#{port}/#{path}"
+    "puppet://#{server}#{port}/#{path}"
   end
 
   # Helper method to decide if a file resource's metadata can be inlined.
   # Also used to profile/log reasons for not inlining.
   def inlineable?(resource, sources)
-    case
-    when resource[:ensure] == 'absent'
+    if resource[:ensure] == 'absent'
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-      return Puppet::Util::Profiler.profile(_("Not inlining absent resource"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :absent]) { false }
-    when sources.empty?
+      Puppet::Util::Profiler.profile(_("Not inlining absent resource"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :absent]) { false }
+    elsif sources.empty?
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-      return Puppet::Util::Profiler.profile(_("Not inlining resource without sources"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :no_sources]) { false }
-    when (not (sources.all? { |source| source =~ /^puppet:/ }))
+      Puppet::Util::Profiler.profile(_("Not inlining resource without sources"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :no_sources]) { false }
+    elsif !(sources.all? { |source| source =~ /^puppet:/ })
       # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-      return Puppet::Util::Profiler.profile(_("Not inlining unsupported source scheme"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :unsupported_scheme]) { false }
+      Puppet::Util::Profiler.profile(_("Not inlining unsupported source scheme"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :unsupported_scheme]) { false }
     else
-      return true
+      true
     end
   end
 
@@ -185,8 +184,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
     location = Puppet::Module::FILETYPES['files']
 
-    !!(source_as_uri.path =~ /^\/modules\// &&
-       metadata.full_path =~ /#{environment_path}\/[^\/]+\/[^\/]+\/#{location}\/.+/)
+    !!(source_as_uri.path =~ %r{^/modules/} &&
+       metadata.full_path =~ %r{#{environment_path}/[^/]+/[^/]+/#{location}/.+})
   end
 
   # Helper method to log file resources that could not be inlined because they
@@ -237,32 +236,32 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
           source = Puppet::Type.type(:file).attrclass(:source).normalize(source)
 
           list_of_data = Puppet::FileServing::Metadata.indirection.search(source, options)
-          if list_of_data
-            basedir_meta = list_of_data.find { |meta| meta.relative_path == '.' }
-            devfail "FileServing::Metadata search should always return the root search path" if basedir_meta.nil?
-
-            if !inlineable_metadata?(basedir_meta, source, environment_path)
-              # If any source is not in the environment path, skip inlining this resource.
-              log_file_outside_environment
-              sources_in_environment = false
-              break
-            end
+          next unless list_of_data
 
-            base_content_uri = get_content_uri(basedir_meta, source, environment_path)
-            list_of_data.each do |metadata|
-              if metadata.relative_path == '.'
-                metadata.content_uri = base_content_uri
-              else
-                metadata.content_uri = "#{base_content_uri}/#{metadata.relative_path}"
-              end
-            end
+          basedir_meta = list_of_data.find { |meta| meta.relative_path == '.' }
+          devfail "FileServing::Metadata search should always return the root search path" if basedir_meta.nil?
+
+          unless inlineable_metadata?(basedir_meta, source, environment_path)
+            # If any source is not in the environment path, skip inlining this resource.
+            log_file_outside_environment
+            sources_in_environment = false
+            break
+          end
 
-            source_to_metadatas[source] = list_of_data
-            # Optimize for returning less data if sourceselect is first
-            if resource[:sourceselect] == 'first' || resource[:sourceselect].nil?
-              break
+          base_content_uri = get_content_uri(basedir_meta, source, environment_path)
+          list_of_data.each do |metadata|
+            if metadata.relative_path == '.'
+              metadata.content_uri = base_content_uri
+            else
+              metadata.content_uri = "#{base_content_uri}/#{metadata.relative_path}"
             end
           end
+
+          source_to_metadatas[source] = list_of_data
+          # Optimize for returning less data if sourceselect is first
+          if resource[:sourceselect] == 'first' || resource[:sourceselect].nil?
+            break
+          end
         end
 
         if sources_in_environment && !source_to_metadatas.empty?
@@ -282,11 +281,11 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
           source = Puppet::Type.type(:file).attrclass(:source).normalize(source)
 
           data = Puppet::FileServing::Metadata.indirection.find(source, options)
-          if data
-            metadata = data
-            metadata.source = source
-            break
-          end
+          next unless data
+
+          metadata = data
+          metadata.source = source
+          break
         end
 
         raise _("Could not get metadata for %{resource}") % { resource: resource[:source] } unless metadata
@@ -443,7 +442,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       "serverip" => "networking.ip",
       "serverip6" => "networking.ip6" }.each do |var, fact|
       value = Puppet.runtime[:facter].value(fact)
-      if !value.nil?
+      unless value.nil?
         @server_facts[var] = value
       end
     end

data/lib/puppet/indirector/catalog/rest.rb

@@ -16,12 +16,14 @@ class Puppet::Resource::Catalog::Rest < Puppet::Indirector::REST
     session = Puppet.lookup(:http_session)
     api = session.route_to(:puppet)
 
-    ip_address = begin
-      " (#{Resolv.getaddress(api.url.host)})"
-    rescue Resolv::ResolvError
-      nil
+    unless Puppet.settings[:skip_logging_catalog_request_destination]
+      ip_address = begin
+        " (#{Resolv.getaddress(api.url.host)})"
+      rescue Resolv::ResolvError
+        nil
+      end
+      Puppet.notice("Requesting catalog from #{api.url.host}:#{api.url.port}#{ip_address}")
     end
-    Puppet.notice("Requesting catalog from #{api.url.host}:#{api.url.port}#{ip_address}")
 
     _, catalog = api.post_catalog(
       request.key,

data/lib/puppet/indirector/catalog/store_configs.rb

@@ -4,5 +4,5 @@ require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/resource/catalog'
 
 class Puppet::Resource::Catalog::StoreConfigs < Puppet::Indirector::StoreConfigs
-  desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
+  desc 'Part of the "storeconfigs" feature. Should not be directly set by end users.'
 end

data/lib/puppet/indirector/exec.rb

@@ -25,9 +25,9 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
 
     if output =~ /\A\s*\Z/ # all whitespace
       Puppet.debug { "Empty response for #{name} from #{self.name} terminus" }
-      return nil
+      nil
     else
-      return output
+      output
     end
   end
 

data/lib/puppet/indirector/face.rb

@@ -32,11 +32,11 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   def self.indirections
-    Puppet::Indirector::Indirection.instances.collect { |t| t.to_s }.sort
+    Puppet::Indirector::Indirection.instances.collect(&:to_s).sort
   end
 
   def self.terminus_classes(indirection)
-    Puppet::Indirector::Terminus.terminus_classes(indirection.to_sym).collect { |t| t.to_s }.sort
+    Puppet::Indirector::Terminus.terminus_classes(indirection.to_sym).collect(&:to_s).sort
   end
 
   def call_indirection_method(method, key, options)
@@ -53,7 +53,7 @@ class Puppet::Indirector::Face < Puppet::Face
       raise RuntimeError, message, detail.backtrace
     end
 
-    return result
+    result
   end
 
   action :destroy do
@@ -134,11 +134,9 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   def set_terminus(from)
-    begin
-      indirection.terminus_class = from
-    rescue => detail
-      msg = _("Could not set '%{indirection}' terminus to '%{from}' (%{detail}); valid terminus types are %{types}") % { indirection: indirection.name, from: from, detail: detail, types: self.class.terminus_classes(indirection.name).join(", ") }
-      raise detail, msg, detail.backtrace
-    end
+    indirection.terminus_class = from
+  rescue => detail
+    msg = _("Could not set '%{indirection}' terminus to '%{from}' (%{detail}); valid terminus types are %{types}") % { indirection: indirection.name, from: from, detail: detail, types: self.class.terminus_classes(indirection.name).join(", ") }
+    raise detail, msg, detail.backtrace
   end
 end

data/lib/puppet/indirector/fact_search.rb

@@ -9,7 +9,7 @@ module Puppet::Indirector::FactSearch
 
       return false unless node_matches_option?(type, name, operator, value, facts)
     end
-    return true
+    true
   end
 
   def node_matches_option?(type, name, operator, value, facts)

data/lib/puppet/indirector/facts/facter.rb

@@ -57,7 +57,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
   def self.setup_search_paths(request)
     # Add any per-module fact directories to facter's search path
     dirs = request.environment.modulepath.collect do |dir|
-      ['lib', 'plugins'].map do |subdirectory|
+      %w[lib plugins].map do |subdirectory|
         Dir.glob("#{dir}/*/#{subdirectory}/facter")
       end
     end.flatten + Puppet[:factpath].split(File::PATH_SEPARATOR)
@@ -85,11 +85,11 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     # Add any per-module external fact directories to facter's external search path
     dirs = []
     request.environment.modules.each do |m|
-      if m.has_external_facts?
-        dir = m.plugin_fact_directory
-        Puppet.debug { "Loading external facts from #{dir}" }
-        dirs << dir
-      end
+      next unless m.has_external_facts?
+
+      dir = m.plugin_fact_directory
+      Puppet.debug { "Loading external facts from #{dir}" }
+      dirs << dir
     end
 
     # Add system external fact directory if it exists

data/lib/puppet/indirector/facts/json.rb

@@ -24,6 +24,6 @@ class Puppet::Node::Facts::Json < Puppet::Indirector::JSON
   private
 
   def json_dir_path
-    self.path("*")
+    path("*")
   end
 end

data/lib/puppet/indirector/facts/store_configs.rb

@@ -4,7 +4,7 @@ require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/store_configs'
 
 class Puppet::Node::Facts::StoreConfigs < Puppet::Indirector::StoreConfigs
-  desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
+  desc 'Part of the "storeconfigs" feature. Should not be directly set by end users.'
 
   def allow_remote_requests?
     false