puppet 7.3.0-universal-darwin → 7.7.0-universal-darwin

data/lib/puppet/network/http/connection.rb

@@ -1,4 +1,4 @@
-require 'puppet/http'
+require_relative '../../../puppet/http'
 
 # This will be raised if too many redirects happen for a given HTTP request
 class Puppet::Network::HTTP::RedirectionLimitExceededException < Puppet::Error ; end

data/lib/puppet/network/http/error.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json'
+require_relative '../../../puppet/util/json'
 
 module Puppet::Network::HTTP::Error
   Issues = Puppet::Network::HTTP::Issues

data/lib/puppet/network/http/handler.rb

@@ -1,9 +1,9 @@
 module Puppet::Network::HTTP
 end
 
-require 'puppet/network/http'
-require 'puppet/util/profiler'
-require 'puppet/util/profiler/aggregate'
+require_relative '../../../puppet/network/http'
+require_relative '../../../puppet/util/profiler'
+require_relative '../../../puppet/util/profiler/aggregate'
 require 'resolv'
 
 module Puppet::Network::HTTP::Handler

data/lib/puppet/network/http_pool.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/http/connection'
+require_relative '../../puppet/network/http/connection'
 
 module Puppet::Network; end
 

data/lib/puppet/node.rb

@@ -1,9 +1,9 @@
-require 'puppet/indirector'
+require_relative '../puppet/indirector'
 
 # A class for managing nodes, including their facts and environment.
 class Puppet::Node
-  require 'puppet/node/facts'
-  require 'puppet/node/environment'
+  require_relative 'node/facts'
+  require_relative 'node/environment'
 
   # Set up indirection, so that nodes can be looked for in
   # the node sources.

data/lib/puppet/node/environment.rb

@@ -1,7 +1,7 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 require 'monitor'
-require 'puppet/parser/parser_factory'
-require 'puppet/concurrent/lock'
+require_relative '../../puppet/parser/parser_factory'
+require_relative '../../puppet/concurrent/lock'
 
 # Just define it, so this class has fewer load dependencies.
 class Puppet::Node
@@ -214,15 +214,22 @@ class Puppet::Node::Environment
     errors
   end
 
+  def rich_data_from_env_conf
+    unless @checked_conf_for_rich_data
+      environment_conf = Puppet.lookup(:environments).get_conf(name)
+      @rich_data_from_conf = environment_conf&.rich_data
+      @checked_conf_for_rich_data = true
+    end
+    @rich_data_from_conf
+  end
+
   # Checks if this environment permits use of rich data types in the catalog
+  # Checks the environment conf for an override on first query, then going forward
+  # either uses that, or if unset, uses the current value of the `rich_data` setting.
   # @return [Boolean] `true` if rich data is permitted.
   # @api private
   def rich_data?
-    if @rich_data.nil?
-      environment_conf = Puppet.lookup(:environments).get_conf(name)
-      @rich_data = (environment_conf.nil? ? Puppet[:rich_data] : environment_conf.rich_data)
-    end
-    @rich_data
+    @rich_data = rich_data_from_env_conf.nil? ? Puppet[:rich_data] : rich_data_from_env_conf
   end
 
   # Return an environment-specific Puppet setting.

data/lib/puppet/node/facts.rb

@@ -1,8 +1,8 @@
 require 'time'
 
-require 'puppet/node'
-require 'puppet/indirector'
-require 'puppet/util/psych_support'
+require_relative '../../puppet/node'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/util/psych_support'
 
 
 # Manage a given node's facts.  This either accepts facts and stores them, or

data/lib/puppet/pal/pal_api.rb

@@ -1,15 +1,15 @@
 module Puppet
-  require 'puppet/parser/script_compiler'
-  require 'puppet/parser/catalog_compiler'
+  require_relative '../../puppet/parser/script_compiler'
+  require_relative '../../puppet/parser/catalog_compiler'
 
   module Pal
-    require 'puppet/pal/json_catalog_encoder'
-    require 'puppet/pal/function_signature'
-    require 'puppet/pal/task_signature'
-    require 'puppet/pal/plan_signature'
-    require 'puppet/pal/compiler'
-    require 'puppet/pal/script_compiler'
-    require 'puppet/pal/catalog_compiler'
-    require 'puppet/pal/pal_impl'
+    require_relative '../../puppet/pal/json_catalog_encoder'
+    require_relative '../../puppet/pal/function_signature'
+    require_relative '../../puppet/pal/task_signature'
+    require_relative '../../puppet/pal/plan_signature'
+    require_relative '../../puppet/pal/compiler'
+    require_relative '../../puppet/pal/script_compiler'
+    require_relative '../../puppet/pal/catalog_compiler'
+    require_relative '../../puppet/pal/pal_impl'
   end
 end

data/lib/puppet/pal/pal_impl.rb

@@ -1,9 +1,9 @@
 # Puppet as a Library "PAL"
 
 # Yes, this requires all of puppet for now because 'settings' and many other things...
-require 'puppet'
-require 'puppet/parser/script_compiler'
-require 'puppet/parser/catalog_compiler'
+require_relative '../../puppet'
+require_relative '../../puppet/parser/script_compiler'
+require_relative '../../puppet/parser/catalog_compiler'
 
 module Puppet
 # This is the main entry point for "Puppet As a Library" PAL.

data/lib/puppet/parameter.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/logging'
-require 'puppet/util/docs'
+require_relative '../puppet/util/logging'
+require_relative '../puppet/util/docs'
 
 # The Parameter class is the implementation of a resource's attributes of _parameter_ kind.
 # The Parameter class is also the base class for {Puppet::Property}, and is used to describe meta-parameters
@@ -22,7 +22,7 @@ class Puppet::Parameter
   include Puppet::Util::Errors
   include Puppet::Util::Logging
 
-  require 'puppet/parameter/value_collection'
+  require_relative 'parameter/value_collection'
 
   class << self
     include Puppet::Util
@@ -571,4 +571,4 @@ class Puppet::Parameter
   #   @see Puppet::Parser::Compiler#finish
 end
 
-require 'puppet/parameter/path'
+require_relative 'parameter/path'

data/lib/puppet/parameter/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/coercion'
+require_relative '../../puppet/coercion'
 
 # This specialized {Puppet::Parameter} handles Boolean options, accepting lots
 # of strings and symbols for both truth and falsehood.

data/lib/puppet/parameter/package_options.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter'
+require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles munging of package options.
 # Package options are passed as an array of key value pairs. Special munging is

data/lib/puppet/parameter/path.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter'
+require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles validation and munging of paths.
 # By default, a single path is accepted, and by calling {accept_arrays} it is possible to

data/lib/puppet/parameter/value.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter/value_collection'
+require_relative '../../puppet/parameter/value_collection'
 
 # Describes an acceptable value for a parameter or property.
 # An acceptable value is either specified as a literal value or a regular expression.

data/lib/puppet/parameter/value_collection.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter/value'
+require_relative '../../puppet/parameter/value'
 
 # A collection of values and regular expressions, used for specifying allowed values
 # in a given parameter.

data/lib/puppet/parser.rb

@@ -1,20 +1,20 @@
 # is only needed to create the name space
 module Puppet::Parser; end
 
-require 'puppet/parser/ast'
-require 'puppet/parser/abstract_compiler'
-require 'puppet/parser/compiler'
-require 'puppet/parser/compiler/catalog_validator'
-require 'puppet/resource/type_collection'
+require_relative 'parser/ast'
+require_relative 'parser/abstract_compiler'
+require_relative 'parser/compiler'
+require_relative 'parser/compiler/catalog_validator'
+require_relative '../puppet/resource/type_collection'
 
-require 'puppet/parser/functions'
-require 'puppet/parser/files'
-require 'puppet/parser/relationship'
+require_relative 'parser/functions'
+require_relative 'parser/files'
+require_relative 'parser/relationship'
 
-require 'puppet/resource/type'
+require_relative '../puppet/resource/type'
 require 'monitor'
 
-Dir[File.dirname(__FILE__) + '/parser/compiler/catalog_validator/*.rb'].each { |f| require f }
+require_relative 'parser/compiler/catalog_validator/relationship_validator.rb'
 
 # PUP-3274 This should probably go someplace else
 class Puppet::LexError < RuntimeError; end

data/lib/puppet/parser/ast.rb

@@ -51,11 +51,11 @@ class Puppet::Parser::AST
 end
 
 # And include all of the AST subclasses.
-require 'puppet/parser/ast/branch'
-require 'puppet/parser/ast/leaf'
-require 'puppet/parser/ast/block_expression'
-require 'puppet/parser/ast/hostclass'
-require 'puppet/parser/ast/node'
-require 'puppet/parser/ast/resource'
-require 'puppet/parser/ast/resource_instance'
-require 'puppet/parser/ast/resourceparam'
+require_relative 'ast/branch'
+require_relative 'ast/leaf'
+require_relative 'ast/block_expression'
+require_relative 'ast/hostclass'
+require_relative 'ast/node'
+require_relative 'ast/resource'
+require_relative 'ast/resource_instance'
+require_relative 'ast/resourceparam'

data/lib/puppet/parser/ast/hostclass.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/ast/top_level_construct'
+require_relative '../../../puppet/parser/ast/top_level_construct'
 
 class Puppet::Parser::AST::Hostclass < Puppet::Parser::AST::TopLevelConstruct
   attr_accessor :name, :context

data/lib/puppet/parser/ast/pops_bridge.rb

@@ -1,5 +1,5 @@
-require 'puppet/parser/ast/top_level_construct'
-require 'puppet/pops'
+require_relative '../../../puppet/parser/ast/top_level_construct'
+require_relative '../../../puppet/pops'
 
 # The AST::Bridge contains classes that bridges between the new Pops based model
 # and the 3.x AST. This is required to be able to reuse the Puppet::Resource::Type which is

data/lib/puppet/parser/catalog_compiler.rb

@@ -1,5 +1,5 @@
-require 'puppet/loaders'
-require 'puppet/pops'
+require_relative '../../puppet/loaders'
+require_relative '../../puppet/pops'
 
 # A Catalog "compiler" that is like the regular compiler but with an API
 # that is harmonized with the ScriptCompiler

data/lib/puppet/parser/compiler.rb

@@ -1,11 +1,11 @@
 require 'forwardable'
 
-require 'puppet/node'
-require 'puppet/resource/catalog'
-require 'puppet/util/errors'
+require_relative '../../puppet/node'
+require_relative '../../puppet/resource/catalog'
+require_relative '../../puppet/util/errors'
 
-require 'puppet/loaders'
-require 'puppet/pops'
+require_relative '../../puppet/loaders'
+require_relative '../../puppet/pops'
 
 # Maintain a graph of scopes, along with a bunch of data
 # about the individual catalog we're compiling.

data/lib/puppet/parser/e4_parser_adapter.rb

@@ -1,4 +1,4 @@
-require 'puppet/pops'
+require_relative '../../puppet/pops'
 
 module Puppet
 module Parser

data/lib/puppet/parser/functions.rb

@@ -1,7 +1,7 @@
-require 'puppet/util/autoload'
-require 'puppet/parser/scope'
-require 'puppet/pops/adaptable'
-require 'puppet/concurrent/lock'
+require_relative '../../puppet/util/autoload'
+require_relative '../../puppet/parser/scope'
+require_relative '../../puppet/pops/adaptable'
+require_relative '../../puppet/concurrent/lock'
 
 # A module for managing parser functions.  Each specified function
 # is added to a central module that then gets included into the Scope

data/lib/puppet/parser/functions/digest.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/checksums'
+require_relative '../../../puppet/util/checksums'
 Puppet::Parser::Functions::newfunction(:digest, :type => :rvalue, :arity => 1, :doc => "Returns a hash value from a provided string using the digest_algorithm setting from the Puppet config file.") do |args|
   algo = Puppet[:digest_algorithm]
   Puppet::Util::Checksums.method(algo.intern).call args[0]

data/lib/puppet/parser/functions/file.rb

@@ -1,4 +1,4 @@
-require 'puppet/file_system'
+require_relative '../../../puppet/file_system'
 
 Puppet::Parser::Functions::newfunction(
   :file, :arity => -2, :type => :rvalue,

data/lib/puppet/parser/functions/fqdn_rand.rb

@@ -2,13 +2,16 @@ require 'digest/md5'
 require 'digest/sha2'
 
 Puppet::Parser::Functions::newfunction(:fqdn_rand, :arity => -2, :type => :rvalue, :doc =>
-  "Usage: `fqdn_rand(MAX, [SEED])`. MAX is required and must be a positive
-  integer; SEED is optional and may be any number or string.
+  "Usage: `fqdn_rand(MAX, [SEED], [DOWNCASE])`. MAX is required and must be a positive
+  integer; SEED is optional and may be any number or string; DOWNCASE is optional
+  and should be a boolean true or false.
 
   Generates a random Integer number greater than or equal to 0 and less than MAX,
   combining the `$fqdn` fact and the value of SEED for repeatable randomness.
   (That is, each node will get a different random number from this function, but
-  a given node's result will be the same every time unless its hostname changes.)
+  a given node's result will be the same every time unless its hostname changes.) If
+  DOWNCASE is true, then the `fqdn` fact will be downcased when computing the value
+  so that the result is not sensitive to the case of the `fqdn` fact.
 
   This function is usually used for spacing out runs of resource-intensive cron
   tasks that run on many nodes, which could cause a thundering herd or degrade
@@ -17,7 +20,12 @@ Puppet::Parser::Functions::newfunction(:fqdn_rand, :arity => -2, :type => :rvalu
   node. (For example, `fqdn_rand(30)`, `fqdn_rand(30, 'expensive job 1')`, and
   `fqdn_rand(30, 'expensive job 2')` will produce totally different numbers.)") do |args|
     max = args.shift.to_i
- 
+    initial_seed = args.shift
+    downcase = !!args.shift
+
+    fqdn = self['::fqdn']
+    fqdn = fqdn.downcase if downcase
+
     # Puppet 5.4's fqdn_rand function produces a different value than earlier versions
     # for the same set of inputs.
     # This causes problems because the values are often written into service configuration files.
@@ -27,9 +35,9 @@ Puppet::Parser::Functions::newfunction(:fqdn_rand, :arity => -2, :type => :rvalu
     # when running on a non-FIPS enabled platform and only using SHA256 on FIPS enabled
     # platforms.
     if Puppet::Util::Platform.fips_enabled?
-      seed = Digest::SHA256.hexdigest([self['::fqdn'],max,args].join(':')).hex
+      seed = Digest::SHA256.hexdigest([fqdn,max,initial_seed].join(':')).hex
     else
-      seed = Digest::MD5.hexdigest([self['::fqdn'],max,args].join(':')).hex
+      seed = Digest::MD5.hexdigest([fqdn,max,initial_seed].join(':')).hex
     end
 
     Puppet::Util.deterministic_rand_int(seed,max)

data/lib/puppet/parser/functions/versioncmp.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package'
+require_relative '../../../puppet/util/package'
 
 Puppet::Parser::Functions::newfunction( :versioncmp, :type => :rvalue, :arity => 2, :doc =>
 "Compares two version numbers.

data/lib/puppet/parser/parser_factory.rb

@@ -17,8 +17,8 @@ module Puppet::Parser
     #
     def self.evaluating_parser
       unless defined?(Puppet::Parser::E4ParserAdapter)
-        require 'puppet/parser/e4_parser_adapter'
-        require 'puppet/pops/parser/code_merger'
+        require_relative '../../puppet/parser/e4_parser_adapter'
+        require_relative '../../puppet/pops/parser/code_merger'
       end
       E4ParserAdapter.new
     end

data/lib/puppet/parser/resource.rb

@@ -1,11 +1,11 @@
-require 'puppet/resource'
+require_relative '../../puppet/resource'
 
 # The primary difference between this class and its
 # parent is that this class has rules on who can set
 # parameters
 class Puppet::Parser::Resource < Puppet::Resource
-  require 'puppet/parser/resource/param'
-  require 'puppet/util/tagging'
+  require_relative 'resource/param'
+  require_relative '../../puppet/util/tagging'
 
   include Puppet::Util
   include Puppet::Util::Errors

data/lib/puppet/parser/scope.rb

@@ -2,9 +2,9 @@
 # such.
 require 'forwardable'
 
-require 'puppet/parser'
-require 'puppet/parser/templatewrapper'
-require 'puppet/parser/resource'
+require_relative '../../puppet/parser'
+require_relative '../../puppet/parser/templatewrapper'
+require_relative '../../puppet/parser/resource'
 
 # This class is part of the internal parser/evaluator/compiler functionality of Puppet.
 # It is passed between the various classes that participate in evaluation.

data/lib/puppet/parser/script_compiler.rb

@@ -1,5 +1,5 @@
-require 'puppet/loaders'
-require 'puppet/pops'
+require_relative '../../puppet/loaders'
+require_relative '../../puppet/pops'
 
 # A Script "compiler" that does not support catalog operations
 #

data/lib/puppet/parser/templatewrapper.rb

@@ -1,6 +1,6 @@
-require 'puppet/parser/files'
+require_relative '../../puppet/parser/files'
 require 'erb'
-require 'puppet/file_system'
+require_relative '../../puppet/file_system'
 
 # A simple wrapper for templates, so they don't have full access to
 # the scope objects.