puppet 8.5.1-x86-mingw32 → 8.7.0-x86-mingw32

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

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -31,7 +31,7 @@ module Puppet::FileBucketFile
           raise _("could not find diff_with %{diff}") % { diff: request.options[:diff_with] } unless Puppet::FileSystem.exist?(other_contents_file)
           raise _("Unable to diff on this platform") unless Puppet[:diff] != ""
 
-          return diff(Puppet::FileSystem.path_string(contents_file), Puppet::FileSystem.path_string(other_contents_file))
+          diff(Puppet::FileSystem.path_string(contents_file), Puppet::FileSystem.path_string(other_contents_file))
         else
           # TRANSLATORS "FileBucket" should not be translated
           Puppet.info _("FileBucket read %{checksum}") % { checksum: checksum }
@@ -64,14 +64,14 @@ module Puppet::FileBucketFile
       msg = ''.dup
       # Get all files with mtime between 'from' and 'to'
       Pathname.new(request.options[:bucket_path]).find { |item|
-        if item.file? and item.basename.to_s == "paths"
-          filenames = item.read.strip.split("\n")
-          filestat = Time.parse(item.stat.mtime.to_s)
-          if from <= filestat and filestat <= to
-            filenames.each do |filename|
-              bucket[filename] += [[item.stat.mtime, item.parent.basename]]
-            end
-          end
+        next unless item.file? and item.basename.to_s == "paths"
+
+        filenames = item.read.strip.split("\n")
+        filestat = Time.parse(item.stat.mtime.to_s)
+        next unless from <= filestat and filestat <= to
+
+        filenames.each do |filename|
+          bucket[filename] += [[item.stat.mtime, item.parent.basename]]
         end
       }
       # Sort the results
@@ -88,7 +88,7 @@ module Puppet::FileBucketFile
           msg += "#{chksum} #{date} #{filename}\n"
         }
       }
-      return model.new(msg)
+      model.new(msg)
     end
 
     def head(request)
@@ -125,7 +125,7 @@ module Puppet::FileBucketFile
       # given its possible that request.options[:bucket_path] or Puppet[:bucketdir]
       # contained characters in an encoding that are not represented the
       # same way when the bytes are decoded as UTF-8, continue using system encoding
-      Puppet::FileSystem.open(paths_file, 0640, 'a+:external') do |f|
+      Puppet::FileSystem.open(paths_file, 0o640, 'a+:external') do |f|
         path_match(f, files_original_path)
       end
     end
@@ -137,7 +137,7 @@ module Puppet::FileBucketFile
       file_handle.each_line do |line|
         return true if line.chomp == files_original_path
       end
-      return false
+      false
     end
 
     # @param bucket_file [Puppet::FileBucket::File] IO object representing
@@ -152,7 +152,7 @@ module Puppet::FileBucketFile
     #   existing and new backup
     # @api private
     def save_to_disk(bucket_file, files_original_path, contents_file, paths_file)
-      Puppet::Util.withumask(0007) do
+      Puppet::Util.withumask(0o007) do
         unless Puppet::FileSystem.dir_exist?(paths_file)
           Puppet::FileSystem.dir_mkpath(paths_file)
         end
@@ -161,14 +161,14 @@ module Puppet::FileBucketFile
         # given its possible that request.options[:bucket_path] or Puppet[:bucketdir]
         # contained characters in an encoding that are not represented the
         # same way when the bytes are decoded as UTF-8, continue using system encoding
-        Puppet::FileSystem.exclusive_open(paths_file, 0640, 'a+:external') do |f|
+        Puppet::FileSystem.exclusive_open(paths_file, 0o640, 'a+:external') do |f|
           if Puppet::FileSystem.exist?(contents_file)
             if verify_identical_file(contents_file, bucket_file)
               # TRANSLATORS "FileBucket" should not be translated
               Puppet.info _("FileBucket got a duplicate file %{file_checksum}") % { file_checksum: bucket_file.checksum }
               # Don't touch the contents file on Windows, since we can't update the
               # mtime of read-only files there.
-              if !Puppet::Util::Platform.windows?
+              unless Puppet::Util::Platform.windows?
                 Puppet::FileSystem.touch(contents_file)
               end
             elsif contents_file_matches_checksum?(contents_file, bucket_file.checksum_data, bucket_file.checksum_type)
@@ -202,7 +202,7 @@ module Puppet::FileBucketFile
     end
 
     def request_to_checksum_and_path(request)
-      checksum_type, checksum, path = request.key.split(/\//, 3)
+      checksum_type, checksum, path = request.key.split(%r{/}, 3)
       if path == '' # Treat "md5/<checksum>/" like "md5/<checksum>"
         path = nil
       end
@@ -257,7 +257,7 @@ module Puppet::FileBucketFile
     # @return [void]
     # @api private
     def copy_bucket_file_to_contents_file(contents_file, bucket_file)
-      Puppet::FileSystem.replace_file(contents_file, 0440) do |of|
+      Puppet::FileSystem.replace_file(contents_file, 0o440) do |of|
         # PUP-1044 writes all of the contents
         bucket_file.stream() do |src|
           FileUtils.copy_stream(src, of)

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

@@ -13,7 +13,7 @@ module Puppet::FileBucketFile
       api.head_filebucket_file(
         request.key,
         environment: request.environment.to_s,
-        bucket_path: request.options[:bucket_path],
+        bucket_path: request.options[:bucket_path]
       )
     rescue Puppet::HTTP::ResponseError => e
       return nil if e.response.code == 404
@@ -31,7 +31,7 @@ module Puppet::FileBucketFile
         diff_with: request.options[:diff_with],
         list_all: request.options[:list_all],
         fromdate: request.options[:fromdate],
-        todate: request.options[:todate],
+        todate: request.options[:todate]
       )
       filebucket_file
     rescue Puppet::HTTP::ResponseError => e
@@ -44,7 +44,7 @@ module Puppet::FileBucketFile
       api.put_filebucket_file(
         request.key,
         body: request.instance.render,
-        environment: request.environment.to_s,
+        environment: request.environment.to_s
       )
     rescue Puppet::HTTP::ResponseError => e
       raise convert_to_http_error(e.response)

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

@@ -17,7 +17,7 @@ class Puppet::Indirector::FileContent::Rest < Puppet::Indirector::REST
 
     api.get_file_content(
       path: Puppet::Util.uri_unescape(url.path),
-      environment: request.environment.to_s,
+      environment: request.environment.to_s
     ) do |data|
       content << data
     end

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

@@ -46,7 +46,7 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
       ignore: request.options[:ignore],
       links: request.options[:links],
       checksum_type: request.options[:checksum_type],
-      source_permissions: request.options[:source_permissions],
+      source_permissions: request.options[:source_permissions]
     )
     file_metadatas
   rescue Puppet::HTTP::ResponseError => e

data/lib/puppet/indirector/hiera.rb

@@ -9,7 +9,7 @@ require 'hiera/scope'
 # Use `Puppet::DataBinding.indirection.terminus(:hiera)` instead.
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
-    if !Puppet.features.hiera?
+    unless Puppet.features.hiera?
       # TRANSLATORS "Hiera" is the name of a code library and should not be translated
       raise _("Hiera terminus not supported without hiera library")
     end

data/lib/puppet/indirector/indirection.rb

@@ -26,7 +26,7 @@ class Puppet::Indirector::Indirection
   # Return a list of all known indirections.  Used to generate the
   # reference.
   def self.instances
-    @@indirections.collect { |i| i.name }
+    @@indirections.collect(&:name)
   end
 
   # Find an indirected model by name.  This is provided so that Terminus classes
@@ -121,10 +121,10 @@ class Puppet::Indirector::Indirection
   def set_global_setting(setting, value)
     case setting
     when :cache_class
-      validate_terminus_class(value) if !value.nil?
+      validate_terminus_class(value) unless value.nil?
       @cache_class = Puppet::ThreadLocal.new(value)
     when :terminus_class
-      validate_terminus_class(value) if !value.nil?
+      validate_terminus_class(value) unless value.nil?
       @terminus_class = Puppet::ThreadLocal.new(value)
     when :terminus_setting
       @terminus_setting = Puppet::ThreadLocal.new(value)
@@ -135,13 +135,13 @@ class Puppet::Indirector::Indirection
 
   # Set up our request object.
   def request(*args)
-    Puppet::Indirector::Request.new(self.name, *args)
+    Puppet::Indirector::Request.new(name, *args)
   end
 
   # Return the singleton terminus for this indirection.
   def terminus(terminus_name = nil)
     # Get the name of the terminus.
-    raise Puppet::DevError, _("No terminus specified for %{name}; cannot redirect") % { name: self.name } unless terminus_name ||= terminus_class
+    raise Puppet::DevError, _("No terminus specified for %{name}; cannot redirect") % { name: name } unless terminus_name ||= terminus_class
 
     termini[terminus_name] ||= make_terminus(terminus_name)
   end
@@ -158,11 +158,11 @@ class Puppet::Indirector::Indirection
   # Determine the terminus class.
   def terminus_class
     unless @terminus_class.value
-      setting = self.terminus_setting
+      setting = terminus_setting
       if setting
         self.terminus_class = Puppet.settings[setting]
       else
-        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name }
+        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: name }
       end
     end
     @terminus_class.value
@@ -184,9 +184,9 @@ class Puppet::Indirector::Indirection
       raise ArgumentError, _("Invalid terminus name %{terminus_class}") % { terminus_class: terminus_class.inspect }
     end
 
-    unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    unless Puppet::Indirector::Terminus.terminus_class(name, terminus_class)
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
-                           { terminus_class: terminus_class, name: self.name }
+                           { terminus_class: terminus_class, name: name }
     end
   end
 
@@ -201,7 +201,7 @@ class Puppet::Indirector::Indirection
     instance = cache.find(request(:find, key, nil, options))
     return nil unless instance
 
-    Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: self.name, instance: instance.name }
+    Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: name, instance: instance.name }
 
     # Set an expiration date in the past
     instance.expiration = Time.now - 60
@@ -220,7 +220,7 @@ class Puppet::Indirector::Indirection
     terminus = prepare(request)
 
     result = find_in_cache(request)
-    if not result.nil?
+    if !result.nil?
       result
     elsif request.ignore_terminus?
       nil
@@ -228,10 +228,10 @@ class Puppet::Indirector::Indirection
       # Otherwise, return the result from the terminus, caching if
       # appropriate.
       result = terminus.find(request)
-      if not result.nil?
-        result.expiration ||= self.expiration if result.respond_to?(:expiration)
+      unless result.nil?
+        result.expiration ||= expiration if result.respond_to?(:expiration)
         if cache? && !request.ignore_cache_save?
-          Puppet.info _("Caching %{indirection} for %{request}") % { indirection: self.name, request: request.key }
+          Puppet.info _("Caching %{indirection} for %{request}") % { indirection: name, request: request.key }
           begin
             cache.save request(:save, key, result, options)
           rescue => detail
@@ -242,13 +242,11 @@ class Puppet::Indirector::Indirection
 
         filtered = result
         if terminus.respond_to?(:filter)
-          Puppet::Util::Profiler.profile(_("Filtered result for %{indirection} %{request}") % { indirection: self.name, request: request.key }, [:indirector, :filter, self.name, request.key]) do
-            begin
-              filtered = terminus.filter(result)
-            rescue Puppet::Error => detail
-              Puppet.log_exception(detail)
-              raise detail
-            end
+          Puppet::Util::Profiler.profile(_("Filtered result for %{indirection} %{request}") % { indirection: name, request: request.key }, [:indirector, :filter, name, request.key]) do
+            filtered = terminus.filter(result)
+          rescue Puppet::Error => detail
+            Puppet.log_exception(detail)
+            raise detail
           end
         end
         filtered
@@ -273,14 +271,14 @@ class Puppet::Indirector::Indirection
     return nil unless cached
 
     if cached.expired?
-      Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: self.name, request: request.key, expiration: cached.expiration }
+      Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: name, request: request.key, expiration: cached.expiration }
       return nil
     end
 
-    Puppet.debug { "Using cached #{self.name} for #{request.key}" }
+    Puppet.debug { "Using cached #{name} for #{request.key}" }
     cached
   rescue => detail
-    Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: self.name, request: request.key, detail: detail })
+    Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: name, request: request.key, detail: detail })
     nil
   end
 
@@ -311,9 +309,9 @@ class Puppet::Indirector::Indirection
       result.each do |instance|
         next unless instance.respond_to? :expiration
 
-        instance.expiration ||= self.expiration
+        instance.expiration ||= expiration
       end
-      return result
+      result
     end
   end
 
@@ -323,7 +321,7 @@ class Puppet::Indirector::Indirection
     request = request(:save, key, instance, options)
     terminus = prepare(request)
 
-    result = terminus.save(request) if !request.ignore_terminus?
+    result = terminus.save(request) unless request.ignore_terminus?
 
     # If caching is enabled, save our document there
     cache.save(request) if cache? && !request.ignore_cache_save?
@@ -373,9 +371,9 @@ class Puppet::Indirector::Indirection
   # Create a new terminus instance.
   def make_terminus(terminus_class)
     # Load our terminus class.
-    klass = Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    klass = Puppet::Indirector::Terminus.terminus_class(name, terminus_class)
     unless klass
-      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
+      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: name }
     end
 
     klass.new

data/lib/puppet/indirector/json.rb

@@ -16,16 +16,16 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::FileSystem.replace_file(filename, 0660) { |f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
+    Puppet::FileSystem.replace_file(filename, 0o660) { |f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
   rescue TypeError => detail
-    Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail })
+    Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: name, request: request.key, detail: detail })
   end
 
   def destroy(request)
     Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail }, detail.backtrace
+      raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: name, request: request.key, detail: detail }, detail.backtrace
     end
 
     1 # emulate success...
@@ -66,7 +66,7 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     end
 
     begin
-      return from_json(json)
+      from_json(json)
     rescue => detail
       raise Puppet::Error, _("Could not parse JSON data for %{name} %{key}: %{detail}") % { name: indirection.name, key: key, detail: detail }, detail.backtrace
     end