puppet 8.5.1-universal-darwin → 8.7.0-universal-darwin

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)
 

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

@@ -118,7 +118,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       body,
       headers: headers,
       # for legacy reasons we always send environment as a query parameter too
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     if (compiler = response['X-Puppet-Compiler-Name'])
@@ -163,9 +163,9 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   #
   def post_catalog4(certname, persistence:, environment:, facts: nil, trusted_facts: nil, transaction_uuid: nil, job_id: nil, options: nil)
     unless persistence.is_a?(Hash) && (missing = [:facts, :catalog] - persistence.keys.map(&:to_sym)).empty?
-      raise ArgumentError.new("The 'persistence' hash is missing the keys: #{missing.join(', ')}")
+      raise ArgumentError, "The 'persistence' hash is missing the keys: #{missing.join(', ')}"
     end
-    raise ArgumentError.new("Facts must be a Hash not a #{facts.class}") unless facts.nil? || facts.is_a?(Hash)
+    raise ArgumentError, "Facts must be a Hash not a #{facts.class}" unless facts.nil? || facts.is_a?(Hash)
 
     body = {
       certname: certname,
@@ -248,7 +248,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       with_base_url("/facts/#{name}"),
       serialize(formatter, facts),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     process_response(response)

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

@@ -11,7 +11,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   API = '/puppet/v3'
 
   # @return [RegEx] RegEx used to determine if a path contains a leading slash
-  PATH_REGEX = /^\//
+  PATH_REGEX = %r{^/}
 
   # Use `Puppet::HTTP::Session.route_to(:fileserver)` to create or get an instance of this class.
   #

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

@@ -47,7 +47,7 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
       with_base_url("/report/#{name}"),
       serialize(formatter, report),
       headers: headers,
-      params: { environment: environment },
+      params: { environment: environment }
     )
 
     # override parent's process_response handling
@@ -56,7 +56,7 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
     if response.success?
       response
     else
-      raise Puppet::HTTP::ResponseError.new(response)
+      raise Puppet::HTTP::ResponseError, response
     end
   end
 end

data/lib/puppet/http/service.rb

@@ -129,30 +129,26 @@ class Puppet::HTTP::Service
 
   def formatter_for_response(response)
     header = response['Content-Type']
-    raise Puppet::HTTP::ProtocolError.new(_("No content type in http response; cannot parse")) unless header
+    raise Puppet::HTTP::ProtocolError, _("No content type in http response; cannot parse") unless header
 
     header.gsub!(/\s*;.*$/, '') # strip any charset
 
     formatter = Puppet::Network::FormatHandler.mime(header)
-    raise Puppet::HTTP::ProtocolError.new("Content-Type is unsupported") if EXCLUDED_FORMATS.include?(formatter.name)
+    raise Puppet::HTTP::ProtocolError, "Content-Type is unsupported" if EXCLUDED_FORMATS.include?(formatter.name)
 
     formatter
   end
 
   def serialize(formatter, object)
-    begin
-      formatter.render(object)
-    rescue => err
-      raise Puppet::HTTP::SerializationError.new("Failed to serialize #{object.class} to #{formatter.name}: #{err.message}", err)
-    end
+    formatter.render(object)
+  rescue => err
+    raise Puppet::HTTP::SerializationError.new("Failed to serialize #{object.class} to #{formatter.name}: #{err.message}", err)
   end
 
   def serialize_multiple(formatter, object)
-    begin
-      formatter.render_multiple(object)
-    rescue => err
-      raise Puppet::HTTP::SerializationError.new("Failed to serialize multiple #{object.class} to #{formatter.name}: #{err.message}", err)
-    end
+    formatter.render_multiple(object)
+  rescue => err
+    raise Puppet::HTTP::SerializationError.new("Failed to serialize multiple #{object.class} to #{formatter.name}: #{err.message}", err)
   end
 
   def deserialize(response, model)
@@ -176,6 +172,6 @@ class Puppet::HTTP::Service
   def process_response(response)
     @session.process_response(response)
 
-    raise Puppet::HTTP::ResponseError.new(response) unless response.success?
+    raise Puppet::HTTP::ResponseError, response unless response.success?
   end
 end

data/lib/puppet/http/session.rb

@@ -52,7 +52,7 @@ class Puppet::HTTP::Session
     raise ArgumentError, "Unknown service #{name}" unless Puppet::HTTP::Service.valid_name?(name)
 
     # short circuit if explicit URL host & port given
-    if url && url.host != nil && !url.host.empty?
+    if url && !url.host.nil? && !url.host.empty?
       service = Puppet::HTTP::Service.create_service(@client, self, name, url.host, url.port)
       service.connect(ssl_context: ssl_context)
       return service

data/lib/puppet/http/site.rb

@@ -10,7 +10,7 @@ class Puppet::HTTP::Site
   attr_reader :scheme, :host, :port
 
   def self.from_uri(uri)
-    self.new(uri.scheme, uri.host, uri.port)
+    new(uri.scheme, uri.host, uri.port)
   end
 
   def initialize(scheme, host, port)