puppet 8.2.0-universal-darwin → 8.4.0-universal-darwin

data/lib/puppet/gettext/config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 require_relative '../../puppet/file_system'
 
@@ -64,6 +65,7 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to create
   def self.reset_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
     Puppet.debug { "Reset text domain to #{domain_name.inspect}" }
@@ -84,6 +86,7 @@ module Puppet::GettextConfig
   # non-default text domain.
   def self.clear_text_domain
     return if @gettext_disabled || !gettext_loaded?
+
     FastGettext.text_domain = nil
   end
 
@@ -113,6 +116,7 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to switch to
   def self.use_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
     if FastGettext.translation_repositories.include?(domain_name)
@@ -136,6 +140,7 @@ module Puppet::GettextConfig
   # @param [String, Symbol] domain_name the name of the domain to delete
   def self.delete_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+
     domain_name = domain_name.to_sym
 
     deleted = FastGettext.translation_repositories.delete(domain_name)
@@ -268,6 +273,7 @@ module Puppet::GettextConfig
   # @param [String] locale the language portion of a locale string (e.g. "ja")
   def self.set_locale(locale)
     return if @gettext_disabled || !gettext_loaded?
+
     # make sure we're not using the `available_locales` machinery
     FastGettext.default_available_locales = nil
 

data/lib/puppet/gettext/module_translations.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/gettext/config'
 
 module Puppet::ModuleTranslations
-
   # @api private
   # Loads translation files for each of the specified modules,
   # if present. Requires the modules to have `forge_name` specified.

data/lib/puppet/gettext/stubs.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # These stub the translation methods normally brought in
 # by FastGettext. Used when Gettext could not be properly
 # initialized.

data/lib/puppet/graph/key.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Sequential, nestable keys for tracking order of insertion in "the graph"
 # @api private
 class Puppet::Graph::Key

data/lib/puppet/graph/prioritizer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Base, template method, class for Prioritizers. This provides the basic
 # tracking facilities used.
 #

data/lib/puppet/graph/rb_tree_map.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Algorithms and Containers project is Copyright (c) 2009 Kanwei Li
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -123,6 +124,7 @@ class Puppet::Graph::RbTreeMap
     result = nil
     if @root
       return unless has_key? key
+
       @root, result = delete_recursive(@root, key)
       @root.color = :black if @root
       @size -= 1
@@ -182,12 +184,14 @@ class Puppet::Graph::RbTreeMap
 
   def first
     return nil unless @root
+
     node = min_recursive(@root)
     [node.key, node.value]
   end
 
   def last
     return nil unless @root
+
     node = max_recursive(@root)
     [node.key, node.value]
   end
@@ -198,6 +202,7 @@ class Puppet::Graph::RbTreeMap
 
   class Node # :nodoc: all
     attr_accessor :color, :key, :value, :left, :right
+
     def initialize(key, value)
       @key = key
       @value = value
@@ -287,6 +292,7 @@ class Puppet::Graph::RbTreeMap
 
   def recursive_yield(node, &blk)
     return unless node
+
     recursive_yield(node.left, &blk)
     yield node.key, node.value
     recursive_yield(node.right, &blk)
@@ -301,6 +307,7 @@ class Puppet::Graph::RbTreeMap
       if ( ( (key <=> node.key) == 0) && node.right.nil? )
         return nil, node.value
       end
+
       if ( !isred(node.right) && !isred(node.right.left) )
         node.move_red_right
       end
@@ -321,6 +328,7 @@ class Puppet::Graph::RbTreeMap
     if node.left.nil?
       return nil, node.value
     end
+
     if ( !isred(node.left) && !isred(node.left.left) )
       node.move_red_left
     end
@@ -334,6 +342,7 @@ class Puppet::Graph::RbTreeMap
       node = node.rotate_right
     end
     return nil, node.value if node.right.nil?
+
     if ( !isred(node.right) && !isred(node.right.left) )
       node.move_red_right
     end
@@ -344,8 +353,9 @@ class Puppet::Graph::RbTreeMap
 
   def get_recursive(node, key)
     return nil if node.nil?
+
     case key <=> node.key
-    when  0 then return node
+    when 0 then return node
     when -1 then return get_recursive(node.left, key)
     when  1 then return get_recursive(node.right, key)
     end
@@ -370,7 +380,7 @@ class Puppet::Graph::RbTreeMap
     end
 
     case key <=> node.key
-    when  0 then node.value = value
+    when 0 then node.value = value
     when -1 then node.left = insert(node.left, key, value)
     when  1 then node.right = insert(node.right, key, value)
     end

data/lib/puppet/graph/relationship_graph.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The relationship graph is the final form of a puppet catalog in
 # which all dependency edges are explicitly in the graph. This form of the
 # catalog is used to traverse the graph in the order in which resources are
@@ -244,8 +245,8 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     #   can "do the right thing" for references to other vertices that may or
     #   may not be containers.
     #
-    admissible = Hash.new { |h,k| k }
-    completed  = Hash.new { |h,k| k }
+    admissible = Hash.new { |_h,k| k }
+    completed  = Hash.new { |_h,k| k }
     containers.each { |x|
       admissible[x] = whit_class.new(:name => "admissible_#{x.ref}", :catalog => catalog)
       completed[x]  = whit_class.new(:name => "completed_#{x.ref}",  :catalog => catalog)

data/lib/puppet/graph/sequential_prioritizer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This implements a priority in which keys are given values that will keep them
 # in the same priority in which they priorities are requested. Nested
 # structures (those in which a key is contained within another key) are

data/lib/puppet/graph/simple_graph.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/external/dot'
 require_relative '../../puppet/relationship'
 require 'set'
@@ -143,7 +144,7 @@ class Puppet::Graph::SimpleGraph
             end
             s[:scc] << this_scc
           end
-          recur.pop               # done with this node, finally.
+          recur.pop # done with this node, finally.
         end
 
       when :after_recursion then
@@ -198,7 +199,7 @@ class Puppet::Graph::SimpleGraph
   # through the graph first, which are more likely to be interesting to the
   # user.  I think; it would be interesting to verify that. --daniel 2011-01-23
   def paths_in_cycle(cycle, max_paths = 1)
-    #TRANSLATORS "negative or zero" refers to the count of paths
+    # TRANSLATORS "negative or zero" refers to the count of paths
     raise ArgumentError, _("negative or zero max_paths") if max_paths < 1
 
     # Calculate our filtered outbound vertex lists...
@@ -211,7 +212,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 do # rubocop:disable Lint/AssignmentInCondition
       if frame[1].member?(frame[0]) then
         found << frame[1] + [frame[0]]
         break if found.length >= max_paths
@@ -242,7 +243,7 @@ class Puppet::Graph::SimpleGraph
       filename = write_cycles_to_graph(cycles)
       message += _("Cycle graph written to %{filename}.") % { filename: filename }
     else
-      #TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
+      # TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
       message += _("Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz")
     end
     Puppet.err(message)
@@ -279,6 +280,7 @@ class Puppet::Graph::SimpleGraph
   # Remove a vertex from the graph.
   def remove_vertex!(v)
     return unless vertex?(v)
+
     @upstream_from.clear
     @downstream_from.clear
     (@in_to[v].values+@out_from[v].values).flatten.each { |e| remove_edge!(e) }
@@ -300,6 +302,7 @@ class Puppet::Graph::SimpleGraph
   # since they have to specify what kind of edge it is.
   def add_edge(e,*a)
     return add_relationship(e,*a) unless a.empty?
+
     e = Puppet::Relationship.from_data_hash(e) if e.is_a?(Hash)
     @upstream_from.clear
     @downstream_from.clear
@@ -331,7 +334,7 @@ class Puppet::Graph::SimpleGraph
   end
 
   def each_edge
-    @in_to.each { |t,ns| ns.each { |s,es| es.each { |e| yield e }}}
+    @in_to.each { |_t,ns| ns.each { |_s,es| es.each { |e| yield e }}}
   end
 
   # Remove an edge from our graph.
@@ -348,6 +351,7 @@ class Puppet::Graph::SimpleGraph
   def adjacent(v, options = {})
     ns = (options[:direction] == :in) ? @in_to[v] : @out_from[v]
     return [] unless ns
+
     (options[:type] == :edges) ? ns.values.flatten : ns.keys
   end
 
@@ -361,6 +365,7 @@ class Puppet::Graph::SimpleGraph
     until stack.empty?
       node = stack.shift
       next if seen.member? node
+
       connected = adjacent(node, :direction => direction)
       connected.each do |target|
         yield node, target
@@ -382,6 +387,7 @@ class Puppet::Graph::SimpleGraph
 
   def downstream_from_vertex(v)
     return @downstream_from[v] if @downstream_from[v]
+
     result = @downstream_from[v] = {}
     @out_from[v].keys.each do |node|
       result[node] = 1
@@ -396,6 +402,7 @@ class Puppet::Graph::SimpleGraph
 
   def upstream_from_vertex(v)
     return @upstream_from[v] if @upstream_from[v]
+
     result = @upstream_from[v] = {}
     @in_to[v].keys.each do |node|
       result[node] = 1
@@ -447,17 +454,17 @@ class Puppet::Graph::SimpleGraph
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|
       name = v.ref
-      params = {'name'     => stringify(name),
-        'fontsize' => fontsize,
-        'label'    => name}
+      params = {'name' => stringify(name),
+                'fontsize' => fontsize,
+                'label' => name}
       v_label = v.ref
       params.merge!(v_label) if v_label and v_label.kind_of? Hash
       graph << DOT::DOTNode.new(params)
     end
     edges.each do |e|
-      params = {'from'     => stringify(e.source.ref),
-        'to'       => stringify(e.target.ref),
-        'fontsize' => fontsize }
+      params = {'from' => stringify(e.source.ref),
+                'to' => stringify(e.target.ref),
+                'fontsize' => fontsize }
       e_label = e.ref
       params.merge!(e_label) if e_label and e_label.kind_of? Hash
       graph << edge_klass.new(params)
@@ -507,26 +514,26 @@ class Puppet::Graph::SimpleGraph
   def to_data_hash
     hash = { 'edges' => edges.map(&:to_data_hash) }
     hash['vertices'] = if self.class.use_new_yaml_format
-      vertices
-    else
-      # Represented in YAML using the old (version 2.6) format.
-      result = {}
-      vertices.each do |vertex|
-        adjacencies = {}
-        [:in, :out].each do |direction|
-          direction_hash = {}
-          adjacencies[direction.to_s] = direction_hash
-          adjacent(vertex, :direction => direction, :type => :edges).each do |edge|
-            other_vertex = direction == :in ? edge.source : edge.target
-            (direction_hash[other_vertex.to_s] ||= []) << edge
-          end
-          direction_hash.each_pair { |key, edges| direction_hash[key] = edges.uniq.map(&:to_data_hash) }
-        end
-        vname = vertex.to_s
-        result[vname] = { 'adjacencies' => adjacencies, 'vertex' => vname }
-      end
-      result
-    end
+                         vertices
+                       else
+                         # Represented in YAML using the old (version 2.6) format.
+                         result = {}
+                         vertices.each do |vertex|
+                           adjacencies = {}
+                           [:in, :out].each do |direction|
+                             direction_hash = {}
+                             adjacencies[direction.to_s] = direction_hash
+                             adjacent(vertex, :direction => direction, :type => :edges).each do |edge|
+                               other_vertex = direction == :in ? edge.source : edge.target
+                               (direction_hash[other_vertex.to_s] ||= []) << edge
+                             end
+                             direction_hash.each_pair { |key, edges| direction_hash[key] = edges.uniq.map(&:to_data_hash) }
+                           end
+                           vname = vertex.to_s
+                           result[vname] = { 'adjacencies' => adjacencies, 'vertex' => vname }
+                         end
+                         result
+                       end
     hash
   end
 

data/lib/puppet/graph.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Graph
   require_relative 'graph/prioritizer'
   require_relative 'graph/sequential_prioritizer'

data/lib/puppet/http/client.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The HTTP client provides methods for making `GET`, `POST`, etc requests to
 # HTTP(S) servers. It also provides methods for resolving Puppetserver REST
 # service endpoints using SRV records and settings (such as `server_list`,
@@ -85,7 +86,6 @@
 #
 # @api public
 class Puppet::HTTP::Client
-
   attr_reader :pool
 
   # Create a new http client instance. Use `Puppet.runtime[:http]` to get
@@ -237,6 +237,7 @@ class Puppet::HTTP::Client
   # @api public
   def put(url, body, headers: {}, params: {}, options: {})
     raise ArgumentError, "'put' requires a string 'body' argument" unless body.is_a?(String)
+
     url = encode_query(url, params)
 
     request = Net::HTTP::Put.new(url, @default_headers.merge(headers))
@@ -265,6 +266,7 @@ class Puppet::HTTP::Client
   # @api public
   def post(url, body, headers: {}, params: {}, options: {}, &block)
     raise ArgumentError, "'post' requires a string 'body' argument" unless body.is_a?(String)
+
     url = encode_query(url, params)
 
     request = Net::HTTP::Post.new(url, @default_headers.merge(headers))
@@ -469,6 +471,7 @@ class Puppet::HTTP::Client
   def resolve_ssl_context(ssl_context, include_system_store)
     if ssl_context
       raise Puppet::HTTP::HTTPError, "The ssl_context and include_system_store parameters are mutually exclusive" if include_system_store
+
       ssl_context
     elsif include_system_store
       system_ssl_context

data/lib/puppet/http/dns.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'resolv'
 
 module Puppet::HTTP
   class DNS
-
     class CacheEntry
       attr_reader :records, :ttl, :resolution_time
 
@@ -49,9 +49,9 @@ module Puppet::HTTP
       Puppet.debug "Searching for SRV records for domain: #{domain}"
 
       case service_name
-        when :puppet then service = '_x-puppet'
-        when :file   then service = '_x-puppet-fileserver'
-        else              service = "_x-puppet-#{service_name}"
+      when :puppet then service = '_x-puppet'
+      when :file   then service = '_x-puppet-fileserver'
+      else              service = "_x-puppet-#{service_name}"
       end
       record_name = "#{service}._tcp.#{domain}"
 
@@ -72,7 +72,7 @@ module Puppet::HTTP
         each_srv_record(domain, :puppet, &block)
       else
         each_priority(records) do |recs|
-          while next_rr = recs.delete(find_weighted_server(recs)) #rubocop:disable Lint/AssignmentInCondition
+          while next_rr = recs.delete(find_weighted_server(recs)) # rubocop:disable Lint/AssignmentInCondition
             Puppet.debug "Yielding next server of #{next_rr.target}:#{next_rr.port}"
             yield next_rr.target.to_s, next_rr.port
           end

data/lib/puppet/http/errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::HTTP
   # A base class for puppet http errors
   # @api public

data/lib/puppet/http/external_client.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Adapts an external http_client_class to the HTTP client API. The former
 # is typically registered by puppetserver and only implements a subset of
 # the Puppet::Network::HTTP::Connection methods. As a result, only the
@@ -7,7 +8,6 @@
 #
 # @api private
 class Puppet::HTTP::ExternalClient < Puppet::HTTP::Client
-
   # Create an external http client.
   #
   # @param [Class] http_client_class The class to create to handle the request
@@ -40,6 +40,7 @@ class Puppet::HTTP::ExternalClient < Puppet::HTTP::Client
   # @api private
   def post(url, body, headers: {}, params: {}, options: {}, &block)
     raise ArgumentError.new("'post' requires a string 'body' argument") unless body.is_a?(String)
+
     url = encode_query(url, params)
 
     options[:use_ssl] = url.scheme == 'https'
@@ -85,5 +86,4 @@ class Puppet::HTTP::ExternalClient < Puppet::HTTP::Client
   def delete(url, headers: {}, params: {}, options: {})
     raise NotImplementedError
   end
-
 end

data/lib/puppet/http/factory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/ssl/openssl_loader'
 require 'net/http'
 require_relative '../../puppet/http'

data/lib/puppet/http/pool.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A pool for persistent `Net::HTTP` connections. Connections are
 # stored in the pool indexed by their {Site}.
 # Connections are borrowed from the pool, yielded to the caller, and
@@ -71,13 +72,13 @@ class Puppet::HTTP::Pool
     end
   end
 
-
   # Safely close a persistent connection.
   # Don't try to close a connection that's already closed.
   #
   # @api private
   def close_connection(site, http)
     return false unless http.started?
+
     Puppet.debug("Closing connection for #{site}")
     http.finish
     true

data/lib/puppet/http/pool_entry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # An entry in the peristent HTTP pool that references the connection and
 # an expiration time for the connection.
 #

data/lib/puppet/http/proxy.rb

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

data/lib/puppet/http/redirector.rb

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

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

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

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

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

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

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

data/lib/puppet/http/resolver.rb

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

data/lib/puppet/http/response.rb

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

data/lib/puppet/http/response_converter.rb

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

data/lib/puppet/http/response_net_http.rb

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

data/lib/puppet/http/retry_after_handler.rb

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

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The Compiler service is used to submit and retrieve data from the
 # puppetserver.
 #
@@ -120,6 +121,10 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       params: { environment: environment },
     )
 
+    if (compiler = response['X-Puppet-Compiler-Name'])
+      Puppet.notice("Catalog compiled by #{compiler}")
+    end
+
     process_response(response)
 
     [response, deserialize(response, Puppet::Resource::Catalog)]
@@ -161,6 +166,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
       raise ArgumentError.new("The 'persistence' hash is missing the keys: #{missing.join(', ')}")
     end
     raise ArgumentError.new("Facts must be a Hash not a #{facts.class}") unless facts.nil? || facts.is_a?(Hash)
+
     body = {
       certname: certname,
       persistence: persistence,
@@ -302,9 +308,9 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   # @api public
   def put_filebucket_file(path, body:, environment:)
     headers = add_puppet_headers({
-      'Accept' => 'application/octet-stream',
-      'Content-Type' => 'application/octet-stream'
-      })
+                                   'Accept' => 'application/octet-stream',
+                                   'Content-Type' => 'application/octet-stream'
+                                 })
 
     response = @client.put(
       with_base_url("/file_bucket_file/#{path}"),