puppet 8.5.1 → 8.6.0

data/lib/puppet/functions.rb

@@ -188,12 +188,11 @@ module Puppet::Functions
     # and it will fail unless protected with an if defined? if the local
     # variable does not exist in the block's binder.
     #
-    begin
-      loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
-      create_loaded_function(func_name, loader, function_base, &block)
-    rescue StandardError => e
-      raise ArgumentError, _("Function Load Error for function '%{function_name}': %{message}") % { function_name: func_name, message: e.message }
-    end
+
+    loader = block.binding.eval('loader_injected_arg if defined?(loader_injected_arg)')
+    create_loaded_function(func_name, loader, function_base, &block)
+  rescue StandardError => e
+    raise ArgumentError, _("Function Load Error for function '%{function_name}': %{message}") % { function_name: func_name, message: e.message }
   end
 
   # Creates a function in, or in a local loader under the given loader.
@@ -570,7 +569,7 @@ module Puppet::Functions
       @block_name = nil
       @return_type = nil
       @argument_mismatch_hander = argument_mismatch_handler
-      self.instance_eval(&block)
+      instance_eval(&block)
       callable_t = create_callable(@types, @block_type, @return_type, @min, @max)
       @dispatcher.add(Puppet::Pops::Functions::Dispatch.new(callable_t, meth_name, @names, @max == :default, @block_name, @injections, @weaving, @argument_mismatch_hander))
     end
@@ -591,14 +590,12 @@ module Puppet::Functions
     end
 
     def internal_type_parse(type_string, loader)
-      begin
-        Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
-      rescue StandardError => e
-        raise ArgumentError, _("Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n") % {
-          type_string: type_string,
-          message: e.message
-        }
-      end
+      Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
+    rescue StandardError => e
+      raise ArgumentError, _("Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n") % {
+        type_string: type_string,
+        message: e.message
+      }
     end
     private :internal_type_parse
   end
@@ -688,10 +685,10 @@ module Puppet::Functions
     PARAM_NAMES = [
       [],
       ['p0'].freeze,
-      ['p0', 'p1'].freeze,
-      ['p0', 'p1', 'p2'].freeze,
-      ['p0', 'p1', 'p2', 'p3'].freeze,
-      ['p0', 'p1', 'p2', 'p3', 'p4'].freeze,
+      %w[p0 p1].freeze,
+      %w[p0 p1 p2].freeze,
+      %w[p0 p1 p2 p3].freeze,
+      %w[p0 p1 p2 p3 p4].freeze
     ]
 
     # Creates an anonymous Function3x class that wraps a 3x function
@@ -746,25 +743,23 @@ module Puppet::Functions
         # used to support other features than calling.
         #
         def call(scope, *args, &block)
+          result = catch(:return) do
+            mapped_args = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.map_args(args, scope, '')
+            # this is the scope.function_xxx(...) call
+            return scope.send(self.class.method3x, mapped_args)
+          end
+          result.value
+        rescue Puppet::Pops::Evaluator::Next => jumper
+          begin
+            throw :next, jumper.value
+          rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+            raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
+          end
+        rescue Puppet::Pops::Evaluator::Return => jumper
           begin
-            result = catch(:return) do
-              mapped_args = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.map_args(args, scope, '')
-              # this is the scope.function_xxx(...) call
-              return scope.send(self.class.method3x, mapped_args)
-            end
-            return result.value
-          rescue Puppet::Pops::Evaluator::Next => jumper
-            begin
-              throw :next, jumper.value
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
-            end
-          rescue Puppet::Pops::Evaluator::Return => jumper
-            begin
-              throw :return, jumper
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
-            end
+            throw :return, jumper
+          rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+            raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
           end
         end
       end

data/lib/puppet/generate/type.rb

@@ -135,7 +135,7 @@ module Puppet
         end
 
         # Sort the inputs by path
-        inputs.sort_by! { |input| input.path }
+        inputs.sort_by!(&:path)
       end
 
       def self.bad_input?
@@ -155,7 +155,7 @@ module Puppet
       def self.generate(inputs, outputdir = nil, force = false)
         # remove files for non existing inputs
         unless outputdir.nil?
-          filenames_to_keep = inputs.map { |i| i.output_name }
+          filenames_to_keep = inputs.map(&:output_name)
           existing_files = Puppet::FileSystem.children(outputdir).map { |f| Puppet::FileSystem.basename(f) }
           files_to_remove = existing_files - filenames_to_keep
           files_to_remove.each do |f|

data/lib/puppet/gettext/config.rb

@@ -43,9 +43,9 @@ module Puppet::GettextConfig
   # @return [String] the active locale
   def self.current_locale
     if gettext_loaded?
-      return FastGettext.default_locale
+      FastGettext.default_locale
     else
-      return 'en'
+      'en'
     end
   end
 
@@ -55,7 +55,7 @@ module Puppet::GettextConfig
   def self.loaded_text_domains
     return [] if @gettext_disabled || !gettext_loaded?
 
-    return FastGettext.translation_repositories.keys
+    FastGettext.translation_repositories.keys
   end
 
   # @api private
@@ -191,11 +191,11 @@ module Puppet::GettextConfig
   # @return [String] path to the config, or nil if not found
   def self.puppet_locale_path
     if Puppet::FileSystem.exist?(LOCAL_PATH)
-      return LOCAL_PATH
+      LOCAL_PATH
     elsif Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(WINDOWS_PATH)
-      return WINDOWS_PATH
+      WINDOWS_PATH
     elsif !Puppet::Util::Platform.windows? && Puppet::FileSystem.exist?(POSIX_PATH)
-      return POSIX_PATH
+      POSIX_PATH
     else
       nil
     end
@@ -207,9 +207,9 @@ module Puppet::GettextConfig
   # @return [Symbol] :mo if in a package structure, :po otherwise
   def self.translation_mode(conf_path)
     if WINDOWS_PATH == conf_path || POSIX_PATH == conf_path
-      return :mo
+      :mo
     else
-      return :po
+      :po
     end
   end
 
@@ -239,7 +239,7 @@ module Puppet::GettextConfig
     end
 
     add_repository_to_domain(project_name, locale_dir, file_format, text_domain)
-    return true
+    true
   end
 
   # @api private

data/lib/puppet/graph/rb_tree_map.rb

@@ -236,33 +236,41 @@ class Puppet::Graph::RbTreeMap
 
     def rotate_left
       r = @right
-      r_key, r_value = r.key, r.value
+      r_key = r.key
+      r_value = r.value
       b = r.left
       r.left = @left
       @left = r
       @right = r.right
       r.right = b
-      r.color, r.key, r.value = :red, @key, @value
-      @key, @value = r_key, r_value
+      r.color = :red
+      r.key = @key
+      r.value = @value
+      @key = r_key
+      @value = r_value
       self
     end
 
     def rotate_right
       l = @left
-      l_key, l_value = l.key, l.value
+      l_key = l.key
+      l_value = l.value
       b = l.right
       l.right = @right
       @right = l
       @left = l.left
       l.left = b
-      l.color, l.key, l.value = :red, @key, @value
-      @key, @value = l_key, l_value
+      l.color = :red
+      l.key = @key
+      l.value = @value
+      @key = l_key
+      @value = l_value
       self
     end
 
     def move_red_left
       colorflip
-      if (@right.left && @right.left.red?)
+      if @right.left && @right.left.red?
         @right.rotate_right
         rotate_left
         colorflip
@@ -272,7 +280,7 @@ class Puppet::Graph::RbTreeMap
 
     def move_red_right
       colorflip
-      if (@left.left && @left.left.red?)
+      if @left.left && @left.left.red?
         rotate_right
         colorflip
       end
@@ -300,15 +308,15 @@ class Puppet::Graph::RbTreeMap
 
   def delete_recursive(node, key)
     if (key <=> node.key) == -1
-      node.move_red_left if (!isred(node.left) && !isred(node.left.left))
+      node.move_red_left if !isred(node.left) && !isred(node.left.left)
       node.left, result = delete_recursive(node.left, key)
     else
       node.rotate_right if isred(node.left)
-      if (((key <=> node.key) == 0) && node.right.nil?)
+      if ((key <=> node.key) == 0) && node.right.nil?
         return nil, node.value
       end
 
-      if (!isred(node.right) && !isred(node.right.left))
+      if !isred(node.right) && !isred(node.right.left)
         node.move_red_right
       end
       if (key <=> node.key) == 0
@@ -321,7 +329,7 @@ class Puppet::Graph::RbTreeMap
         node.right, result = delete_recursive(node.right, key)
       end
     end
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def delete_min_recursive(node)
@@ -329,35 +337,35 @@ class Puppet::Graph::RbTreeMap
       return nil, node.value
     end
 
-    if (!isred(node.left) && !isred(node.left.left))
+    if !isred(node.left) && !isred(node.left.left)
       node.move_red_left
     end
     node.left, result = delete_min_recursive(node.left)
 
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def delete_max_recursive(node)
-    if (isred(node.left))
+    if isred(node.left)
       node = node.rotate_right
     end
     return nil, node.value if node.right.nil?
 
-    if (!isred(node.right) && !isred(node.right.left))
+    if !isred(node.right) && !isred(node.right.left)
       node.move_red_right
     end
     node.right, result = delete_max_recursive(node.right)
 
-    return node.fixup, result
+    [node.fixup, result]
   end
 
   def get_recursive(node, key)
     return nil if node.nil?
 
     case key <=> node.key
-    when 0 then return node
-    when -1 then return get_recursive(node.left, key)
-    when  1 then return get_recursive(node.right, key)
+    when 0 then node
+    when -1 then get_recursive(node.left, key)
+    when  1 then get_recursive(node.right, key)
     end
   end
 
@@ -385,9 +393,9 @@ class Puppet::Graph::RbTreeMap
     when  1 then node.right = insert(node.right, key, value)
     end
 
-    node.rotate_left if (node.right && node.right.red?)
-    node.rotate_right if (node.left && node.left.red? && node.left.left && node.left.left.red?)
-    node.colorflip if (node.left && node.left.red? && node.right && node.right.red?)
+    node.rotate_left if node.right && node.right.red?
+    node.rotate_right if node.left && node.left.red? && node.left.left && node.left.left.red?
+    node.colorflip if node.left && node.left.red? && node.right && node.right.red?
     node
   end
 

data/lib/puppet/graph/relationship_graph.rb

@@ -128,22 +128,22 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
         deferred_resources << resource
       end
 
-      if @ready.empty? and deferred_resources.any?
-        if made_progress
-          enqueue(*deferred_resources)
-        else
-          deferred_resources.each do |res|
-            overly_deferred_resource_handler.call(res)
-            finish(res)
-          end
-        end
+      next unless @ready.empty? and deferred_resources.any?
 
-        made_progress = false
-        deferred_resources = []
+      if made_progress
+        enqueue(*deferred_resources)
+      else
+        deferred_resources.each do |res|
+          overly_deferred_resource_handler.call(res)
+          finish(res)
+        end
       end
+
+      made_progress = false
+      deferred_resources = []
     end
 
-    if !continue_while.call()
+    unless continue_while.call()
       while (resource = next_resource)
         canceled_resource_handler.call(resource)
         finish(resource)

data/lib/puppet/graph/simple_graph.rb

@@ -106,7 +106,7 @@ class Puppet::Graph::SimpleGraph
     # decent Ruby stack.
     recur = [{ :node => root }]
 
-    while not recur.empty? do
+    until recur.empty?
       frame = recur.last
       vertex = frame[:node]
 
@@ -171,7 +171,7 @@ class Puppet::Graph::SimpleGraph
 
     # we usually have a disconnected graph, must walk all possible roots
     vertices.each do |vertex|
-      if !state[:index][vertex] then
+      unless state[:index][vertex] then
         tarjan vertex, state
       end
     end
@@ -186,9 +186,7 @@ class Puppet::Graph::SimpleGraph
     # time-scale.
     state[:scc].select do |component|
       multi_vertex_component?(component) || single_vertex_referring_to_self?(component)
-    end.map do |component|
-      component.sort
-    end.sort
+    end.map(&:sort).sort
   end
 
   # Perform a BFS on the sub graph representing the cycle, with a view to
@@ -212,7 +210,7 @@ class Puppet::Graph::SimpleGraph
 
     # frame struct is vertex, [path]
     stack = [[cycle.first, []]]
-    while frame = stack.shift do # rubocop:disable Lint/AssignmentInCondition
+    while frame = stack.shift # rubocop:disable Lint/AssignmentInCondition
       if frame[1].member?(frame[0]) then
         found << frame[1] + [frame[0]]
         break if found.length >= max_paths
@@ -223,7 +221,7 @@ class Puppet::Graph::SimpleGraph
       end
     end
 
-    return found.sort
+    found.sort
   end
 
   # @return [Array] array of dependency cycles (arrays)
@@ -268,7 +266,7 @@ class Puppet::Graph::SimpleGraph
     filename = File.join(Puppet[:graphdir], "cycles.dot")
     # DOT files are assumed to be UTF-8 by default - http://www.graphviz.org/doc/info/lang.html
     File.open(filename, "w:UTF-8") { |f| f.puts graph }
-    return filename
+    filename
   end
 
   # Add a new vertex to the graph.
@@ -330,7 +328,7 @@ class Puppet::Graph::SimpleGraph
   end
 
   def edges
-    @in_to.values.collect { |x| x.values }.flatten
+    @in_to.values.collect(&:values).flatten
   end
 
   def each_edge
@@ -449,7 +447,7 @@ class Puppet::Graph::SimpleGraph
   # which match +dot+ properties will be used as well.
   def to_dot_graph(params = {})
     params['name'] ||= self.class.name.tr(':', '_')
-    fontsize   = params['fontsize'] ? params['fontsize'] : '8'
+    fontsize   = params['fontsize'] || '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|

data/lib/puppet/http/client.rb

@@ -365,7 +365,7 @@ class Puppet::HTTP::Client
     response = nil
     done = false
 
-    while !done do
+    until done
       connect(request.uri, options: options) do |http|
         apply_auth(request, basic_auth) if redirects.zero?
 

data/lib/puppet/http/dns.rb

@@ -41,7 +41,7 @@ module Puppet::HTTP
     # @param [Symbol] service_name the key of the service we are querying
     # @yields [String, Integer] server and port of selected record
     def each_srv_record(domain, service_name = :puppet, &block)
-      if (domain.nil? or domain.empty?)
+      if domain.nil? or domain.empty?
         Puppet.debug "Domain not known; skipping SRV lookup"
         return
       end
@@ -118,7 +118,7 @@ module Puppet::HTTP
     # @param [String] service_name the service whose TTL we want
     # @return [Integer] the TTL for this service, in seconds
     def ttl(service_name)
-      return @record_cache[service_name].ttl
+      @record_cache[service_name].ttl
     end
 
     # Checks if the cached entry for the given service has expired.
@@ -128,9 +128,9 @@ module Puppet::HTTP
     def expired?(service_name)
       entry = @record_cache[service_name]
       if entry
-        return Time.now > (entry.resolution_time + entry.ttl)
+        Time.now > (entry.resolution_time + entry.ttl)
       else
-        return true
+        true
       end
     end
 

data/lib/puppet/http/external_client.rb

@@ -39,7 +39,7 @@ class Puppet::HTTP::ExternalClient < Puppet::HTTP::Client
   # (see Puppet::HTTP::Client#post)
   # @api private
   def post(url, body, headers: {}, params: {}, options: {}, &block)
-    raise ArgumentError.new("'post' requires a string 'body' argument") unless body.is_a?(String)
+    raise ArgumentError, "'post' requires a string 'body' argument" unless body.is_a?(String)
 
     url = encode_query(url, params)
 

data/lib/puppet/http/factory.rb

@@ -17,7 +17,7 @@ class Puppet::HTTP::Factory
 
   def initialize
     # PUP-1411, make sure that openssl is initialized before we try to connect
-    if !@@openssl_initialized
+    unless @@openssl_initialized
       OpenSSL::SSL::SSLContext.new
       @@openssl_initialized = true
     end

data/lib/puppet/http/proxy.rb

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

data/lib/puppet/http/redirector.rb

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

data/lib/puppet/http/resolver.rb

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

data/lib/puppet/http/retry_after_handler.rb

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

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

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