puppet 8.3.1-universal-darwin → 8.4.0-universal-darwin

data/lib/puppet/http/proxy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'uri'
 require_relative '../../puppet/ssl/openssl_loader'
 
@@ -52,8 +53,8 @@ module Puppet::HTTP::Proxy
       host, port = d.split(':')
       host = Regexp.escape(host).gsub('\*', '.*')
 
-      #If this no_proxy entry specifies a port, we want to match it against
-      #the destination port.  Otherwise just match hosts.
+      # 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}$)
         dest_string     = "#{dest.host}:#{dest.port}"

data/lib/puppet/http/redirector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Handle HTTP redirects
 #
 # @api private

data/lib/puppet/http/resolver/server_list.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # Use the server_list setting to resolve a service. This resolver is only used
 # if server_list is set either on the command line or in the configuration file.
 #
 # @api public
 class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
-
   # Create a server list resolver.
   #
   # @param [Puppet::HTTP::Client] client

data/lib/puppet/http/resolver/settings.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # Resolve a service using settings. This is the default resolver if none of the
 # other resolvers find a functional connection.
 #
 # @api public
 class Puppet::HTTP::Resolver::Settings < Puppet::HTTP::Resolver
-
   # Resolve a service using the default server and port settings for this service.
   #
   # @param [Puppet::HTTP::Session] session

data/lib/puppet/http/resolver/srv.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # Resolve a service using DNS SRV records.
 #
 # @api public
 class Puppet::HTTP::Resolver::SRV < Puppet::HTTP::Resolver
-
   # Create an DNS SRV resolver.
   #
   # @param [Puppet::HTTP::Client] client

data/lib/puppet/http/resolver.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Resolver base class. Each resolver represents a different strategy for
 # resolving a service name into a list of candidate servers and ports.
 #

data/lib/puppet/http/response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Represents the response returned from the server from an HTTP request.
 #
 # @api abstract

data/lib/puppet/http/response_converter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::HTTP::ResponseConverter
   module_function
 

data/lib/puppet/http/response_net_http.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # Adapts Net::HTTPResponse to Puppet::HTTP::Response
 #
 # @api public
 class Puppet::HTTP::ResponseNetHTTP < Puppet::HTTP::Response
-
   # Create a response associated with the URL.
   #
   # @param [URI] url

data/lib/puppet/http/retry_after_handler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'date'
 require 'time'
 
@@ -6,7 +7,6 @@ require 'time'
 #
 # @api private
 class Puppet::HTTP::RetryAfterHandler
-
   # Create a handler to allow the system to sleep between HTTP requests
   #
   # @param [Integer] retry_limit number of retries allowed

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The CA service is used to handle certificate related REST requests.
 #
 # @api public

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The Compiler service is used to submit and retrieve data from the
 # puppetserver.
 #
@@ -120,6 +121,10 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       params: { environment: environment },
     )
 
+    if (compiler = response['X-Puppet-Compiler-Name'])
+      Puppet.notice("Catalog compiled by #{compiler}")
+    end
+
     process_response(response)
 
     [response, deserialize(response, Puppet::Resource::Catalog)]
@@ -161,6 +166,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       raise ArgumentError.new("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)
+
     body = {
       certname: certname,
       persistence: persistence,
@@ -302,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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 
 # The FileServer service is used to retrieve file metadata and content.
@@ -99,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(path: nil, environment:, 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,10 +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

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

@@ -1,10 +1,10 @@
 # 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'
 

data/lib/puppet/http/service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Represents an abstract Puppet web service.
 #
 # @abstract Subclass and implement methods for the service's REST APIs.

data/lib/puppet/http/session.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The session is the mechanism by which services may be connected to and accessed.
 #
 # @api public
@@ -61,7 +62,7 @@ class Puppet::HTTP::Session
     return cached if cached
 
     canceled = false
-    canceled_handler  = lambda { |cancel| canceled = cancel }
+    canceled_handler = lambda { |cancel| canceled = cancel }
 
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")

data/lib/puppet/http/site.rb

@@ -1,4 +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

data/lib/puppet/http.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   # Contains an HTTP client for making network requests to puppet and other
   # HTTP servers.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/environments'
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/resource/catalog'
@@ -22,6 +23,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 +36,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
@@ -54,12 +57,20 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     node.trusted_data = Puppet.lookup(:trusted_information) { Puppet::Context::TrustedInformation.local(node) }.to_h
 
     if node.environment
-      # If the requested environment doesn't match the server specified environment,
-      # as determined by the node terminus, and the request wants us to check for an
+      # If the requested environment name doesn't match the server specified environment
+      # name, as determined by the node terminus, and the request wants us to check for an
       # environment mismatch, then return an empty catalog with the server-specified
       # enviroment.
-      if request.remote? && request.options[:check_environment] && node.environment != request.environment
-        return Puppet::Resource::Catalog.new(node.name, node.environment)
+      if request.remote? && request.options[:check_environment]
+        # The "environment" may be same while environment objects differ. This
+        # is most likely because the environment cache was flushed between the request
+        # processing and node lookup. Environment overrides `==` but requires the
+        # 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}
+          return Puppet::Resource::Catalog.new(node.name, node.environment)
+        end
       end
 
       node.environment.with_text_domain do
@@ -79,6 +90,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)
+
     catalog
   end
 
@@ -150,17 +162,17 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # 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
+    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
     end
   end
 
@@ -179,13 +191,13 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # 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
 
@@ -207,14 +219,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
@@ -228,7 +240,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
             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 ! 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
@@ -258,9 +270,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
         }
 
@@ -338,14 +350,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
@@ -357,7 +369,6 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       end
     end
 
-
     config
   end
 
@@ -367,16 +378,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)
@@ -431,8 +441,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
     # And then add the server name and IP
     {"servername" => "networking.fqdn",
-      "serverip"  => "networking.ip",
-      "serverip6" => "networking.ip6"
+     "serverip" => "networking.ip",
+     "serverip6" => "networking.ip6"
     }.each do |var, fact|
       value = Puppet.runtime[:facter].value(fact)
       if !value.nil?
@@ -444,7 +454,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       host = Puppet.runtime[:facter].value('networking.hostname')
       if host.nil?
         Puppet.warning _("Could not retrieve fact servername")
-      elsif domain = Puppet.runtime[:facter].value('networking.domain') #rubocop:disable Lint/AssignmentInCondition 
+      elsif domain = Puppet.runtime[:facter].value('networking.domain') # rubocop:disable Lint/AssignmentInCondition
         @server_facts["servername"] = [host, domain].join(".")
       else
         @server_facts["servername"] = host

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

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

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/rest'
 
@@ -14,6 +15,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
+    end
+    Puppet.notice("Requesting catalog from #{api.url.host}:#{api.url.port}#{ip_address}")
+
     _, catalog = api.post_catalog(
       request.key,
       facts: request.options[:facts_for_catalog],

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

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
+
 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.}
-
 end

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

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

data/lib/puppet/indirector/code.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # Do nothing, requiring that the back-end terminus do all

data/lib/puppet/indirector/data_binding/hiera.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/hiera'
 require 'hiera/scope'
 

data/lib/puppet/indirector/data_binding/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/none'
 
 class Puppet::DataBinding::None < Puppet::Indirector::None

data/lib/puppet/indirector/direct_file_server.rb

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/terminus_helper'
 require_relative '../../puppet/indirector/terminus'
 
 class Puppet::Indirector::DirectFileServer < Puppet::Indirector::Terminus
-
   include Puppet::FileServing::TerminusHelper
 
   def find(request)
     return nil unless Puppet::FileSystem.exist?(request.key)
+
     path2instance(request, request.key)
   end
 
   def search(request)
     return nil unless Puppet::FileSystem.exist?(request.key)
+
     path2instances(request, request.key)
   end
 end

data/lib/puppet/indirector/envelope.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector'
 
 # Provide any attributes or functionality needed for indirected

data/lib/puppet/indirector/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/error'
 
 module Puppet::Indirector

data/lib/puppet/indirector/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 

data/lib/puppet/indirector/face.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/face'
 
 class Puppet::Indirector::Face < Puppet::Face
@@ -21,11 +22,11 @@ class Puppet::Indirector::Face < Puppet::Face
       face's manpage for more details.
     EOT
 
-    before_action do |action, args, options|
+    before_action do |_action, _args, options|
       set_terminus(options[:terminus])
     end
 
-    after_action do |action, args, options|
+    after_action do |_action, _args, _options|
       indirection.reset_terminus_class
     end
   end
@@ -58,7 +59,7 @@ class Puppet::Indirector::Face < Puppet::Face
   action :destroy do
     summary _("Delete an object.")
     arguments _("<key>")
-    when_invoked {|key, options| call_indirection_method :destroy, key, {} }
+    when_invoked {|key, _options| call_indirection_method :destroy, key, {} }
   end
 
   action :find do
@@ -83,13 +84,13 @@ class Puppet::Indirector::Face < Puppet::Face
       currently accept data from STDIN, save actions cannot currently be invoked
       from the command line.
     EOT
-    when_invoked {|key, options| call_indirection_method :save, key, {} }
+    when_invoked {|key, _options| call_indirection_method :save, key, {} }
   end
 
   action :search do
     summary _("Search for an object or retrieve multiple objects.")
     arguments _("<query>")
-    when_invoked {|key, options| call_indirection_method :search, key, {} }
+    when_invoked {|key, _options| call_indirection_method :search, key, {} }
   end
 
   # Print the configuration for the current terminus class
@@ -101,7 +102,7 @@ class Puppet::Indirector::Face < Puppet::Face
       run mode with the '--run_mode' option.
     EOT
 
-    when_invoked do |options|
+    when_invoked do |_options|
       if indirection.terminus_class
         _("Run mode '%{mode}': %{terminus}") % { mode: Puppet.run_mode.name, terminus: indirection.terminus_class }
       else

data/lib/puppet/indirector/fact_search.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # module containing common methods used by json and yaml facts indirection terminus
 module Puppet::Indirector::FactSearch
   def node_matches?(facts, options)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/code'
 
@@ -35,6 +36,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
 
     result = if request.options[:resolve_options]
                raise(Puppet::Error, _("puppet facts show requires version 4.0.40 or greater of Facter.")) unless Facter.respond_to?(:resolve)
+
                find_with_options(request)
              elsif Puppet[:include_legacy_facts]
                # to_hash returns both structured and legacy facts

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/json'
 require_relative '../../../puppet/indirector/fact_search'