puppet 8.3.1 → 8.4.0

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 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.}
 
   def allow_remote_requests?

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/file_bucket/file'
 require_relative '../../../puppet/util/checksums'
@@ -17,6 +18,7 @@ module Puppet::FileBucketFile
       # If filebucket mode is 'list'
       if request.options[:list_all]
         return nil unless ::File.exist?(request.options[:bucket_path])
+
         return list(request)
       end
       checksum, files_original_path = request_to_checksum_and_path(request)
@@ -28,9 +30,10 @@ module Puppet::FileBucketFile
           other_contents_file = path_for(request.options[:bucket_path], request.options[:diff_with], 'contents')
           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))
         else
-          #TRANSLATORS "FileBucket" should not be translated
+          # TRANSLATORS "FileBucket" should not be translated
           Puppet.info _("FileBucket read %{checksum}") % { checksum: checksum }
           model.new(Puppet::FileSystem.binread(contents_file))
         end
@@ -72,7 +75,7 @@ module Puppet::FileBucketFile
         end
       }
       # Sort the results
-      bucket.each { |filename, contents|
+      bucket.each { |_filename, contents|
         contents.sort_by! do |item|
           # NOTE: Ruby 2.4 may reshuffle item order even if the keys in sequence are sorted already
           item[0]
@@ -129,6 +132,7 @@ module Puppet::FileBucketFile
 
     def path_match(file_handle, files_original_path)
       return true unless files_original_path # if no path was provided, it's a match
+
       file_handle.rewind
       file_handle.each_line do |line|
         return true if line.chomp == files_original_path
@@ -160,7 +164,7 @@ module Puppet::FileBucketFile
         Puppet::FileSystem.exclusive_open(paths_file, 0640, 'a+:external') do |f|
           if Puppet::FileSystem.exist?(contents_file)
             if verify_identical_file(contents_file, bucket_file)
-              #TRANSLATORS "FileBucket" should not be translated
+              # 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.
@@ -174,7 +178,7 @@ module Puppet::FileBucketFile
               # needed, but ask the user to validate.
               # Note: Don't print the full path to the bucket file in the
               # exception to avoid disclosing file system layout on server.
-              #TRANSLATORS "FileBucket" should not be translated
+              # TRANSLATORS "FileBucket" should not be translated
               Puppet.err(_("Unable to verify existing FileBucket backup at '%{path}'.") % { path: contents_file.to_path })
               raise Puppet::FileBucket::BucketError, _("Existing backup and new file have different content but same checksum, %{value}. Verify existing backup and remove if incorrect.") %
                 { value: bucket_file.checksum }
@@ -203,8 +207,10 @@ module Puppet::FileBucketFile
         path = nil
       end
       raise ArgumentError, _("Unsupported checksum type %{checksum_type}") % { checksum_type: checksum_type.inspect } if checksum_type != Puppet[:digest_algorithm]
+
       expected = method(checksum_type + "_hex_length").call
       raise _("Invalid checksum %{checksum}") % { checksum: checksum.inspect } if checksum !~ /^[0-9a-f]{#{expected}}$/
+
       [checksum, path]
     end
 
@@ -258,6 +264,5 @@ module Puppet::FileBucketFile
         end
       end
     end
-
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/rest'
 require_relative '../../../puppet/file_bucket/file'
 
@@ -16,6 +17,7 @@ module Puppet::FileBucketFile
       )
     rescue Puppet::HTTP::ResponseError => e
       return nil if e.response.code == 404
+
       raise convert_to_http_error(e.response)
     end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/code'
 
 module Puppet::FileBucketFile

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/direct_file_server'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/file_server'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/rest'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_content.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A stub class, so our constants work.
 class Puppet::Indirector::FileContent # :nodoc:
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/direct_file_server'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/file_server'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/http_metadata'
 require_relative '../../../puppet/indirector/generic_http'
 require_relative '../../../puppet/indirector/file_metadata'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/rest'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_metadata.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A stub class, so our constants work.
 class Puppet::Indirector::FileMetadata # :nodoc:
 end

data/lib/puppet/indirector/file_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/configuration'
 require_relative '../../puppet/file_serving/fileset'
 require_relative '../../puppet/file_serving/terminus_helper'
@@ -30,6 +31,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     # if not.
     path = mount.find(relative_path, request)
     return nil unless path
+
     path2instance(request, path)
   end
 

data/lib/puppet/indirector/generic_http.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/file_serving/terminus_helper'
 
 class Puppet::Indirector::GenericHttp < Puppet::Indirector::Terminus

data/lib/puppet/indirector/hiera.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require 'hiera/scope'
 
@@ -9,9 +10,10 @@ require 'hiera/scope'
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?
-      #TRANSLATORS "Hiera" is the name of a code library and should not be translated
+      # TRANSLATORS "Hiera" is the name of a code library and should not be translated
       raise _("Hiera terminus not supported without hiera library")
     end
+
     super
   end
 
@@ -42,8 +44,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   # @return [Symbol,Hash,nil] The Hiera 'resolution_type'
   def convert_merge(merge)
     case merge
-    when nil
-    when 'first'
+    when nil, 'first'
       # Nil is OK. Defaults to Hiera :priority
       nil
     when Puppet::Pops::MergeStrategy
@@ -69,7 +70,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
         convert_merge(strategy)
       end
     else
-      #TRANSLATORS "merge" is a parameter name and should not be translated
+      # TRANSLATORS "merge" is a parameter name and should not be translated
       raise Puppet::DataBinding::LookupError, _("Unrecognized value for request 'merge' parameter: '%{merge}'") % { merge: merge }
     end
   end

data/lib/puppet/indirector/indirection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/docs'
 require_relative '../../puppet/util/profiler'
 require_relative '../../puppet/indirector/envelope'
@@ -33,12 +34,14 @@ class Puppet::Indirector::Indirection
   def self.model(name)
     match = @@indirections.find { |i| i.name == name }
     return nil unless match
+
     match.model
   end
 
   # Create and return our cache terminus.
   def cache
     raise Puppet::DevError, _("Tried to cache when no cache class was set") unless cache_class
+
     terminus(cache_class)
   end
 
@@ -64,8 +67,9 @@ class Puppet::Indirector::Indirection
 
   # Set the time-to-live for instances created through this indirection.
   def ttl=(value)
-    #TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
+    # TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
     raise ArgumentError, _("Indirection TTL must be an integer") unless value.is_a?(Integer)
+
     @ttl = value
   end
 
@@ -101,6 +105,7 @@ class Puppet::Indirector::Indirection
     @doc = doc
 
     raise(ArgumentError, _("Indirection %{name} is already defined") % { name: @name }) if @@indirections.find { |i| i.name == @name }
+
     @@indirections << self
 
     @indirected_class = indirected_class
@@ -178,6 +183,7 @@ class Puppet::Indirector::Indirection
     unless terminus_class and terminus_class.to_s != ""
       raise ArgumentError, _("Invalid terminus name %{terminus_class}") % { terminus_class: terminus_class.inspect }
     end
+
     unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
           { terminus_class: terminus_class, name: self.name }
@@ -265,6 +271,7 @@ class Puppet::Indirector::Indirection
     # See if our instance is in the cache and up to date.
     cached = cache.find(request) if cache? && ! request.ignore_cache?
     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 }
       return nil
@@ -300,8 +307,10 @@ class Puppet::Indirector::Indirection
     result = terminus.search(request)
     if result
       raise Puppet::DevError, _("Search results from terminus %{terminus_name} are not an array") % { terminus_name: terminus.name } unless result.is_a?(Array)
+
       result.each do |instance|
         next unless instance.respond_to? :expiration
+
         instance.expiration ||= self.expiration
       end
       return result
@@ -368,6 +377,7 @@ class Puppet::Indirector::Indirection
     unless klass
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
     end
+
     klass.new
   end
 end

data/lib/puppet/indirector/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 
@@ -26,7 +27,8 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     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
     end
-    1                           # emulate success...
+
+    1 # emulate success...
   end
 
   def search(request)

data/lib/puppet/indirector/memory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # Manage a memory-cached list of instances.
@@ -13,6 +14,7 @@ class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
 
   def destroy(request)
     raise ArgumentError.new(_("Could not find %{request} to destroy") % { request: request.key }) unless @instances.include?(request.key)
+
     @instances.delete(request.key)
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 
@@ -11,6 +12,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     if ! Puppet.features.msgpack?
       raise _("MessagePack terminus not supported without msgpack library")
     end
+
     super
   end
 
@@ -33,7 +35,8 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     unless detail.is_a? Errno::ENOENT
       raise Puppet::Error, _("Could not destroy %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail }, detail.backtrace
     end
-    1                           # emulate success...
+
+    1 # emulate success...
   end
 
   def search(request)
@@ -63,7 +66,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     rescue Errno::ENOENT
       return nil
     rescue => detail
-      #TRANSLATORS "MessagePack" is a program name and should not be translated
+      # TRANSLATORS "MessagePack" is a program name and should not be translated
       raise Puppet::Error, _("Could not read MessagePack data for %{indirection} %{key}: %{detail}") % { indirection: indirection.name, key: key, detail: detail }, detail.backtrace
     end
 

data/lib/puppet/indirector/node/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/exec'
 
@@ -10,6 +11,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
   def command
     command = Puppet[:external_nodes]
     raise ArgumentError, _("You must set the 'external_nodes' parameter to use the external node terminus") unless command != _("none")
+
     command.split
   end
 
@@ -64,8 +66,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
       hash
     end
-
   rescue => detail
-      raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace
+    raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace
   end
 end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/json'
 
 class Puppet::Node::Json < Puppet::Indirector::JSON
   desc "Store node information as flat files, serialized using JSON,
     or deserialize stored JSON nodes."
-
 end

data/lib/puppet/indirector/node/memory.rb

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

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

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

data/lib/puppet/indirector/node/plain.rb

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

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

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

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

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/node'
 
 class Puppet::Node::StoreConfigs < Puppet::Indirector::StoreConfigs
-
   desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
-
 end

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

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

data/lib/puppet/indirector/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # A none terminus type, meant to always return nil

data/lib/puppet/indirector/plain.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 
 # An empty terminus type, meant to just return empty objects.

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

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

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

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

data/lib/puppet/indirector/report/processor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/reports'
@@ -49,6 +50,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
 
   def processors(&blk)
     return [] if Puppet[:reports] == "none"
+
     reports.each do |name|
       mod = Puppet::Reports.report(name)
       if mod

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

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

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

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

data/lib/puppet/indirector/request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'cgi'
 require 'uri'
 require_relative '../../puppet/indirector'
@@ -36,11 +37,11 @@ class Puppet::Indirector::Request
 
   def environment=(env)
     @environment =
-    if env.is_a?(Puppet::Node::Environment)
-      env
-    else
-      Puppet.lookup(:environments).get!(env)
-    end
+      if env.is_a?(Puppet::Node::Environment)
+        env
+      else
+        Puppet.lookup(:environments).get!(env)
+      end
   end
 
   # LAK:NOTE This is a messy interface to the cache, and it's only
@@ -101,6 +102,7 @@ class Puppet::Indirector::Request
   def model
     ind = indirection
     raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless ind
+
     ind.model
   end
 

data/lib/puppet/indirector/resource/ral.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::Ral < Puppet::Indirector::Code

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

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

data/lib/puppet/indirector/resource/validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)

data/lib/puppet/indirector/rest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def find(request)

data/lib/puppet/indirector/store_configs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Indirector::StoreConfigs < Puppet::Indirector::Terminus
   def initialize
     super