openvox 7.37.1 → 8.19.0

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # The Compiler service is used to submit and retrieve data from the
 # puppetserver.
 #
 # @api public
 class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   # @return [String] Default API for the Compiler service
-  API = '/puppet/v3'.freeze
+  API = '/puppet/v3'
 
   # Use `Puppet::HTTP::Session.route_to(:puppet)` to create or get an instance of this class.
   #
@@ -116,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'])
@@ -147,7 +149,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   #    report submission.
   # @param [String] job_id The id of the orchestrator job that triggered this run.
   # @param [Hash] options A hash of options beyond direct input to catalogs. Options:
-  #    - prefer_requested_environment Whether to always override a node's classified 
+  #    - prefer_requested_environment Whether to always override a node's classified
   #      environment with the one supplied in the request. If this is true and no environment
   #      is supplied, fall back to the classified environment, or finally, 'production'.
   #    - capture_logs Whether to return the errors and warnings that occurred during
@@ -161,9 +163,10 @@ 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,
       persistence: persistence,
@@ -192,7 +195,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
     rescue => err
       raise Puppet::HTTP::SerializationError.new("Failed to deserialize catalog from puppetserver response: #{err.message}", err)
     end
-    
+
     logs = response_body['logs'] || []
     [response, catalog, logs]
   end
@@ -245,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)
@@ -305,9 +308,9 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   # @api public
   def put_filebucket_file(path, body:, environment:)
     headers = add_puppet_headers({
-      'Accept' => 'application/octet-stream',
-      'Content-Type' => 'application/octet-stream'
-      })
+                                   'Accept' => 'application/octet-stream',
+                                   'Content-Type' => 'application/octet-stream'
+                                 })
 
     response = @client.put(
       with_base_url("/file_bucket_file/#{path}"),

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 
 # The FileServer service is used to retrieve file metadata and content.
@@ -6,10 +8,10 @@ require_relative '../../../puppet/file_serving/metadata'
 #
 class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   # @return [String] Default API for the FileServer service
-  API = '/puppet/v3'.freeze
+  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.
   #
@@ -98,7 +100,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   #
   # @api public
   #
-  def get_file_metadatas(path: nil, environment:, recurse: :false, recurselimit: nil, max_files: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore)
+  def get_file_metadatas(environment:, path: nil, recurse: :false, recurselimit: nil, max_files: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore) # rubocop:disable Lint/BooleanSymbol
     validate_path(path)
 
     headers = add_puppet_headers('Accept' => get_mime_types(Puppet::FileServing::Metadata).join(', '))

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 # The puppetserver service.
 #
 # @api public
 #
 class Puppet::HTTP::Service::Puppetserver < Puppet::HTTP::Service
-
   # Use `Puppet::HTTP::Session.route_to(:puppetserver)` to create or get an instance of this class.
   #
   # @param [Puppet::HTTP::Client] client
@@ -35,7 +36,7 @@ class Puppet::HTTP::Service::Puppetserver < Puppet::HTTP::Service
       response = @client.get(
         with_base_url(request_path),
         headers: add_puppet_headers({}),
-        options: {ssl_context: ssl_context}
+        options: { ssl_context: ssl_context }
       )
 
       process_response(response)

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # The Report service is used to submit run reports to the report server.
 #
 # @api public
 #
 class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
-
   # @return [String] Default API for the report service
-  API = '/puppet/v3'.freeze
+  API = '/puppet/v3'
 
   # Use `Puppet::HTTP::Session.route_to(:report)` to create or get an instance of this class.
   #
@@ -46,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
@@ -54,11 +55,8 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
 
     if response.success?
       response
-    elsif !@session.supports?(:report, 'json') && Puppet[:preferred_serialization_format] != 'pson'
-      #TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-      raise Puppet::HTTP::ProtocolError.new(_("To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson") % { server_version: response[Puppet::HTTP::HEADER_PUPPET_VERSION]})
     else
-      raise Puppet::HTTP::ResponseError.new(response)
+      raise Puppet::HTTP::ResponseError, response
     end
   end
 end

data/lib/puppet/http/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Represents an abstract Puppet web service.
 #
 # @abstract Subclass and implement methods for the service's REST APIs.
@@ -90,7 +92,7 @@ class Puppet::HTTP::Service
   #
   # @api public
   def connect(ssl_context: nil)
-    @client.connect(@url, options: {ssl_context: ssl_context})
+    @client.connect(@url, options: { ssl_context: ssl_context })
   end
 
   protected
@@ -105,12 +107,10 @@ class Puppet::HTTP::Service
     Puppet[:http_extra_headers].each do |name, value|
       if modified_headers.keys.find { |key| key.casecmp(name) == 0 }
         Puppet.warning(_('Ignoring extra header "%{name}" as it was previously set.') % { name: name })
+      elsif value.nil? || value.empty?
+        Puppet.warning(_('Ignoring extra header "%{name}" as it has no value.') % { name: name })
       else
-        if value.nil? || value.empty?
-          Puppet.warning(_('Ignoring extra header "%{name}" as it has no value.') % { name: name })
-        else
-          modified_headers[name] = value
-        end
+        modified_headers[name] = value
       end
     end
     modified_headers
@@ -119,8 +119,7 @@ class Puppet::HTTP::Service
   def build_url(api, server, port)
     URI::HTTPS.build(host: server,
                      port: port,
-                     path: api
-                    ).freeze
+                     path: api).freeze
   end
 
   def get_mime_types(model)
@@ -130,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
+    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)
@@ -177,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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # The session is the mechanism by which services may be connected to and accessed.
 #
 # @api public
 class Puppet::HTTP::Session
   # capabilities for a site
-  CAP_LOCALES = 'locales'.freeze
-  CAP_JSON = 'json'.freeze
+  CAP_LOCALES = 'locales'
+  CAP_JSON = 'json'
 
   # puppet version where locales mount was added
   SUPPORTED_LOCALES_MOUNT_AGENT_VERSION = Gem::Version.new("5.3.4")
@@ -50,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
@@ -60,7 +62,7 @@ class Puppet::HTTP::Session
     return cached if cached
 
     canceled = false
-    canceled_handler  = lambda { |cancel| canceled = cancel }
+    canceled_handler = ->(cancel) { canceled = cancel }
 
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")

data/lib/puppet/http/site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Represents a site to which HTTP connections are made. It is a value
 # object, and is suitable for use in a hash. If two sites are equal,
 # then a persistent connection made to the first site, can be re-used
@@ -8,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/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet
   # Contains an HTTP client for making network requests to puppet and other
   # HTTP servers.
@@ -7,8 +9,8 @@ module Puppet
   # @see Puppet::HTTP::Response
   # @api public
   module HTTP
-    ACCEPT_ENCODING = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3".freeze
-    HEADER_PUPPET_VERSION = "X-Puppet-Version".freeze
+    ACCEPT_ENCODING = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+    HEADER_PUPPET_VERSION = "X-Puppet-Version"
 
     require_relative 'http/errors'
     require_relative 'http/site'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/environments'
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/node/server_facts'
@@ -22,6 +24,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   def extract_facts_from_request(request)
     text_facts = request.options[:facts]
     return unless text_facts
+
     format = request.options[:facts_format]
     unless format
       raise ArgumentError, _("Facts but no fact format provided for %{request}") % { request: request.key }
@@ -34,6 +37,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       unless facts.name == request.key
         raise Puppet::Error, _("Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name}).") % { request: request.key.inspect, fact_name: facts.name.inspect }
       end
+
       return facts
     end
   end
@@ -48,7 +52,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
@@ -65,7 +69,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         # name and modulepath to be the same. When using versioned environment dirs the
         # same "environment" can have different modulepaths so simply compare names here.
         if node.environment.name != request.environment.name
-          Puppet.warning _("Requested environment '%{request_env}' did not match server specified environment '%{server_env}'") % {request_env: request.environment.name, server_env: node.environment.name}
+          Puppet.warning _("Requested environment '%{request_env}' did not match server specified environment '%{server_env}'") % { request_env: request.environment.name, server_env: node.environment.name }
           return Puppet::Resource::Catalog.new(node.name, node.environment)
         end
       end
@@ -86,7 +90,8 @@ 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
 
@@ -112,12 +117,13 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # @return [Puppet::Node::Facts] facts object deserialized from supplied string
   # @api private
   def convert_wire_facts(facts, format)
-    if format == 'pson'
+    case format
+    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))
-    elsif format == 'application/json'
-      return Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
+      Puppet::Node::Facts.convert_from('pson', CGI.unescape(facts))
+    when 'application/json'
+      Puppet::Node::Facts.convert_from('json', CGI.unescape(facts))
     else
       raise ArgumentError, _("Unsupported facts format")
     end
@@ -134,9 +140,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
@@ -151,24 +157,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'
-        #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?
-        #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:/}))
-        #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 }
-      else
-        return true
+    if resource[:ensure] == 'absent'
+      # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
+      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)
+      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)
+      Puppet::Util::Profiler.profile(_("Not inlining unsupported source scheme"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :unsupported_scheme]) { false }
+    else
+      true
     end
   end
 
@@ -180,20 +185,20 @@ 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
   # fall outside of an environment.
   def log_file_outside_environment
-    #TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
+    # TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
     Puppet::Util::Profiler.profile(_("Not inlining file outside environment"), [:compiler, :static_compile_inlining, :skipped_file_metadata, :file_outside_environment]) { true }
   end
 
   # Helper method to log file resources that were successfully inlined.
   def log_metadata_inlining
-    #TRANSLATORS Inlining refers to adding additional metadata
+    # TRANSLATORS Inlining refers to adding additional metadata
     Puppet::Util::Profiler.profile(_("Inlining file metadata"), [:compiler, :static_compile_inlining, :inlined_file_metadata]) { true }
   end
 
@@ -215,14 +220,14 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       if resource[:recurse] == true || resource[:recurse] == 'true' || resource[:recurse] == 'remote'
         # Construct a hash mapping sources to arrays (list of files found recursively) of metadata
         options = {
-          :environment        => catalog.environment_instance,
-          :links              => resource[:links] ? resource[:links].to_sym : :manage,
-          :checksum_type      => resource[:checksum] ? resource[:checksum].to_sym : checksum_type.to_sym,
+          :environment => catalog.environment_instance,
+          :links => resource[:links] ? resource[:links].to_sym : :manage,
+          :checksum_type => resource[:checksum] ? resource[:checksum].to_sym : checksum_type.to_sym,
           :source_permissions => resource[:source_permissions] ? resource[:source_permissions].to_sym : :ignore,
-          :recurse            => true,
-          :recurselimit       => resource[:recurselimit],
-          :max_files          => resource[:max_files],
-          :ignore             => resource[:ignore],
+          :recurse => true,
+          :recurselimit => resource[:recurselimit],
+          :max_files => resource[:max_files],
+          :ignore => resource[:ignore],
         }
 
         sources_in_environment = true
@@ -232,32 +237,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?
@@ -266,9 +271,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         end
       else
         options = {
-          :environment        => catalog.environment_instance,
-          :links              => resource[:links] ? resource[:links].to_sym : :manage,
-          :checksum_type      => resource[:checksum] ? resource[:checksum].to_sym : checksum_type.to_sym,
+          :environment => catalog.environment_instance,
+          :links => resource[:links] ? resource[:links].to_sym : :manage,
+          :checksum_type => resource[:checksum] ? resource[:checksum].to_sym : checksum_type.to_sym,
           :source_permissions => resource[:source_permissions] ? resource[:source_permissions].to_sym : :ignore
         }
 
@@ -277,11 +282,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
@@ -318,15 +323,13 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
         benchmark_str = _("Compiled static catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
         profile_str   = _("Compiled static catalog for %{node}") % { node: node.name }
       end
+    elsif node.environment
+      escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
+      benchmark_str = _("Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
+      profile_str   = _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
     else
-      if node.environment
-        escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
-        benchmark_str = _("Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
-        profile_str   = _("Compiled catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
-      else
-        benchmark_str = _("Compiled catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
-        profile_str   = _("Compiled catalog for %{node}") % { node: node.name }
-      end
+      benchmark_str = _("Compiled catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
+      profile_str   = _("Compiled catalog for %{node}") % { node: node.name }
     end
     config = nil
 
@@ -346,14 +349,14 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
           escaped_node_name = node.name.gsub(/%/, '%%')
           if node.environment
             escaped_node_environment = node.environment.to_s.gsub(/%/, '%%')
-            #TRANSLATORS Inlined refers to adding additional metadata
+            # TRANSLATORS Inlined refers to adding additional metadata
             benchmark_str = _("Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds") % { node: escaped_node_name, environment: escaped_node_environment }
-            #TRANSLATORS Inlined refers to adding additional metadata
+            # TRANSLATORS Inlined refers to adding additional metadata
             profile_str   = _("Inlined resource metadata into static catalog for %{node} in environment %{environment}") % { node: node.name, environment: node.environment }
           else
-            #TRANSLATORS Inlined refers to adding additional metadata
+            # TRANSLATORS Inlined refers to adding additional metadata
             benchmark_str = _("Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds") % { node: escaped_node_name }
-            #TRANSLATORS Inlined refers to adding additional metadata
+            # TRANSLATORS Inlined refers to adding additional metadata
             profile_str   = _("Inlined resource metadata into static catalog for %{node}") % { node: node.name }
           end
           benchmark(:notice, benchmark_str) do
@@ -365,7 +368,6 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       end
     end
 
-
     config
   end
 
@@ -375,16 +377,15 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       node = nil
       begin
         node = Puppet::Node.indirection.find(name, :environment => environment,
-                                             :transaction_uuid => transaction_uuid,
-                                             :configured_environment => configured_environment,
-                                             :facts => facts)
+                                                   :transaction_uuid => transaction_uuid,
+                                                   :configured_environment => configured_environment,
+                                                   :facts => facts)
       rescue => detail
         message = _("Failed when searching for node %{name}: %{detail}") % { name: name, detail: detail }
         Puppet.log_exception(detail, message)
         raise Puppet::Error, message, detail.backtrace
       end
 
-
       # Add any external data to the node.
       if node
         add_node_data(node)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/json'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/msgpack'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/rest'