puppet 7.6.1 → 7.7.0

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.

data/lib/puppet/parser/type_loader.rb

@@ -1,6 +1,6 @@
 require 'find'
 require 'forwardable'
-require 'puppet/parser/parser_factory'
+require_relative '../../puppet/parser/parser_factory'
 
 class Puppet::Parser::TypeLoader
   extend  Forwardable

data/lib/puppet/plugins/configuration.rb

@@ -7,11 +7,11 @@
 #
 module Puppet::Plugins
   module Configuration
-    require 'puppet/plugins/syntax_checkers'
-    require 'puppet/syntax_checkers/base64'
-    require 'puppet/syntax_checkers/json'
-    require 'puppet/syntax_checkers/pp'
-    require 'puppet/syntax_checkers/epp'
+    require_relative '../../puppet/plugins/syntax_checkers'
+    require_relative '../../puppet/syntax_checkers/base64'
+    require_relative '../../puppet/syntax_checkers/json'
+    require_relative '../../puppet/syntax_checkers/pp'
+    require_relative '../../puppet/syntax_checkers/epp'
 
     def self.load_plugins
       # Register extensions

data/lib/puppet/pops.rb

@@ -22,100 +22,100 @@ module Puppet
 
     require 'semantic_puppet'
 
-    require 'puppet/pops/patterns'
-    require 'puppet/pops/utils'
-    require 'puppet/pops/puppet_stack'
+    require_relative 'pops/patterns'
+    require_relative 'pops/utils'
+    require_relative 'pops/puppet_stack'
 
-    require 'puppet/pops/adaptable'
-    require 'puppet/pops/adapters'
+    require_relative 'pops/adaptable'
+    require_relative 'pops/adapters'
 
-    require 'puppet/pops/visitable'
-    require 'puppet/pops/visitor'
+    require_relative 'pops/visitable'
+    require_relative 'pops/visitor'
 
-    require 'puppet/pops/issues'
-    require 'puppet/pops/semantic_error'
-    require 'puppet/pops/label_provider'
-    require 'puppet/pops/validation'
-    require 'puppet/pops/issue_reporter'
+    require_relative 'pops/issues'
+    require_relative 'pops/semantic_error'
+    require_relative 'pops/label_provider'
+    require_relative 'pops/validation'
+    require_relative 'pops/issue_reporter'
 
-    require 'puppet/pops/time/timespan'
-    require 'puppet/pops/time/timestamp'
+    require_relative 'pops/time/timespan'
+    require_relative 'pops/time/timestamp'
 
     # (the Types module initializes itself)
-    require 'puppet/pops/types/types'
-    require 'puppet/pops/types/string_converter'
-    require 'puppet/pops/lookup'
+    require_relative 'pops/types/types'
+    require_relative 'pops/types/string_converter'
+    require_relative 'pops/lookup'
 
-    require 'puppet/pops/merge_strategy'
+    require_relative 'pops/merge_strategy'
 
     module Model
-      require 'puppet/pops/model/ast'
-      require 'puppet/pops/model/tree_dumper'
-      require 'puppet/pops/model/ast_transformer'
-      require 'puppet/pops/model/factory'
-      require 'puppet/pops/model/model_tree_dumper'
-      require 'puppet/pops/model/model_label_provider'
+      require_relative 'pops/model/ast'
+      require_relative 'pops/model/tree_dumper'
+      require_relative 'pops/model/ast_transformer'
+      require_relative 'pops/model/factory'
+      require_relative 'pops/model/model_tree_dumper'
+      require_relative 'pops/model/model_label_provider'
     end
 
     module Resource
-      require 'puppet/pops/resource/resource_type_impl'
+      require_relative 'pops/resource/resource_type_impl'
     end
     module Evaluator
-      require 'puppet/pops/evaluator/literal_evaluator'
-      require 'puppet/pops/evaluator/callable_signature'
-      require 'puppet/pops/evaluator/runtime3_converter'
-      require 'puppet/pops/evaluator/runtime3_resource_support'
-      require 'puppet/pops/evaluator/runtime3_support'
-      require 'puppet/pops/evaluator/evaluator_impl'
-      require 'puppet/pops/evaluator/epp_evaluator'
-      require 'puppet/pops/evaluator/collector_transformer'
-      require 'puppet/pops/evaluator/puppet_proc'
-      require 'puppet/pops/evaluator/deferred_resolver'
+      require_relative 'pops/evaluator/literal_evaluator'
+      require_relative 'pops/evaluator/callable_signature'
+      require_relative 'pops/evaluator/runtime3_converter'
+      require_relative 'pops/evaluator/runtime3_resource_support'
+      require_relative 'pops/evaluator/runtime3_support'
+      require_relative 'pops/evaluator/evaluator_impl'
+      require_relative 'pops/evaluator/epp_evaluator'
+      require_relative 'pops/evaluator/collector_transformer'
+      require_relative 'pops/evaluator/puppet_proc'
+      require_relative 'pops/evaluator/deferred_resolver'
       module Collectors
-        require 'puppet/pops/evaluator/collectors/abstract_collector'
-        require 'puppet/pops/evaluator/collectors/fixed_set_collector'
-        require 'puppet/pops/evaluator/collectors/catalog_collector'
-        require 'puppet/pops/evaluator/collectors/exported_collector'
+        require_relative 'pops/evaluator/collectors/abstract_collector'
+        require_relative 'pops/evaluator/collectors/fixed_set_collector'
+        require_relative 'pops/evaluator/collectors/catalog_collector'
+        require_relative 'pops/evaluator/collectors/exported_collector'
       end
     end
 
     module Parser
-      require 'puppet/pops/parser/eparser'
-      require 'puppet/pops/parser/parser_support'
-      require 'puppet/pops/parser/locator'
-      require 'puppet/pops/parser/locatable'
-      require 'puppet/pops/parser/lexer2'
-      require 'puppet/pops/parser/evaluating_parser'
-      require 'puppet/pops/parser/epp_parser'
-      require 'puppet/pops/parser/code_merger'
+      require_relative 'pops/parser/eparser'
+      require_relative 'pops/parser/parser_support'
+      require_relative 'pops/parser/locator'
+      require_relative 'pops/parser/locatable'
+      require_relative 'pops/parser/lexer2'
+      require_relative 'pops/parser/evaluating_parser'
+      require_relative 'pops/parser/epp_parser'
+      require_relative 'pops/parser/code_merger'
     end
 
     module Validation
-      require 'puppet/pops/validation/checker4_0'
-      require 'puppet/pops/validation/validator_factory_4_0'
+      require_relative 'pops/validation/checker4_0'
+      require_relative 'pops/validation/validator_factory_4_0'
     end
 
     # Subsystem for puppet functions defined in ruby.
     #
     # @api public
     module Functions
-      require 'puppet/pops/functions/function'
-      require 'puppet/pops/functions/dispatch'
-      require 'puppet/pops/functions/dispatcher'
+      require_relative 'pops/functions/function'
+      require_relative 'pops/functions/dispatch'
+      require_relative 'pops/functions/dispatcher'
     end
 
     module Migration
-      require 'puppet/pops/migration/migration_checker'
+      require_relative 'pops/migration/migration_checker'
     end
 
     module Serialization
-      require 'puppet/pops/serialization'
+      require_relative 'pops/serialization'
     end
   end
 
-  require 'puppet/parser/ast/pops_bridge'
-  require 'puppet/functions'
-  require 'puppet/datatypes'
+  require_relative '../puppet/parser/ast/pops_bridge'
+  require_relative '../puppet/functions'
+  require_relative '../puppet/datatypes'
 
   Puppet::Pops::Model.register_pcore_types
 end

data/lib/puppet/pops/evaluator/deferred_resolver.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/script_compiler'
+require_relative '../../../puppet/parser/script_compiler'
 
 module Puppet::Pops
 module Evaluator

data/lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -1,10 +1,10 @@
-require 'puppet/parser/scope'
-require 'puppet/pops/evaluator/compare_operator'
-require 'puppet/pops/evaluator/relationship_operator'
-require 'puppet/pops/evaluator/access_operator'
-require 'puppet/pops/evaluator/closure'
-require 'puppet/pops/evaluator/external_syntax_support'
-require 'puppet/pops/types/iterable'
+require_relative '../../../puppet/parser/scope'
+require_relative '../../../puppet/pops/evaluator/compare_operator'
+require_relative '../../../puppet/pops/evaluator/relationship_operator'
+require_relative '../../../puppet/pops/evaluator/access_operator'
+require_relative '../../../puppet/pops/evaluator/closure'
+require_relative '../../../puppet/pops/evaluator/external_syntax_support'
+require_relative '../../../puppet/pops/types/iterable'
 
 module Puppet::Pops
 module Evaluator

data/lib/puppet/pops/evaluator/external_syntax_support.rb

@@ -1,7 +1,7 @@
 # This module is an integral part of the evaluator. It deals with the concern of validating
 # external syntax in text produced by heredoc and templates.
 #
-require 'puppet/plugins/syntax_checkers'
+require_relative '../../../puppet/plugins/syntax_checkers'
 module Puppet::Pops::Evaluator::ExternalSyntaxSupport
   def assert_external_syntax(_, result, syntax, reference_expr)
     # ignore 'unspecified syntax'

data/lib/puppet/pops/loader/task_instantiator.rb

@@ -1,6 +1,6 @@
 # The TypeDefinitionInstantiator instantiates a type alias or a type definition
 #
-require 'puppet/module/task'
+require_relative '../../../puppet/module/task'
 module Puppet::Pops
 module Loader
 class TaskInstantiator

data/lib/puppet/pops/lookup/invocation.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../../../puppet/thread_local'
 
 require_relative 'explainer'
 

data/lib/puppet/pops/model/ast_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/ast'
+require_relative '../../../puppet/parser/ast'
 
 # The receiver of `import(file)` calls; once per imported file, or nil if imports are ignored
 #

data/lib/puppet/pops/model/pn_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Model

data/lib/puppet/pops/parser/eparser.rb

@@ -6,8 +6,8 @@
 
 require 'racc/parser.rb'
 
-require 'puppet'
-require 'puppet/pops'
+require_relative '../../../puppet'
+require_relative '../../../puppet/pops'
 
 module Puppet
   class ParseError < Puppet::Error; end

data/lib/puppet/pops/parser/evaluating_parser.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Parser

data/lib/puppet/pops/parser/lexer2.rb

@@ -6,11 +6,11 @@
 # or Token.new([token], locator) with the same API x[0] = token_symbol, x[1] = self, x[:key] = (:value, :file, :line, :pos) etc
 
 require 'strscan'
-require 'puppet/pops/parser/lexer_support'
-require 'puppet/pops/parser/heredoc_support'
-require 'puppet/pops/parser/interpolation_support'
-require 'puppet/pops/parser/epp_support'
-require 'puppet/pops/parser/slurp_support'
+require_relative '../../../puppet/pops/parser/lexer_support'
+require_relative '../../../puppet/pops/parser/heredoc_support'
+require_relative '../../../puppet/pops/parser/interpolation_support'
+require_relative '../../../puppet/pops/parser/epp_support'
+require_relative '../../../puppet/pops/parser/slurp_support'
 
 module Puppet::Pops
 module Parser

data/lib/puppet/pops/parser/lexer_support.rb

@@ -2,7 +2,7 @@
 module Puppet::Pops
 module Parser
 
-require 'puppet/util/multi_match'
+require_relative '../../../puppet/util/multi_match'
 
 # This is an integral part of the Lexer. It is broken out into a separate module
 # for maintainability of the code, and making the various parts of the lexer focused.