puppet 5.5.22 → 6.0.0

data/lib/puppet/node.rb

@@ -275,8 +275,7 @@ class Puppet::Node
         trusted_param || Puppet::Context::TrustedInformation.local(self)
       end
 
-      # Ruby 1.9.3 can't apply to_h to a hash, so check first
-      self.trusted_data = (trusted.is_a?(Hash) ? trusted : trusted.to_h)
+      self.trusted_data = trusted.to_h
     end
   end
 end

data/lib/puppet/node/environment.rb

@@ -85,7 +85,6 @@ class Puppet::Node::Environment
     @modulepath = modulepath
     @manifest = manifest
     @config_version = config_version
-    @modules_strict_semver = false
   end
 
   # Creates a new Puppet::Node::Environment instance, overriding any of the passed
@@ -240,22 +239,6 @@ class Puppet::Node::Environment
     Puppet.settings.value(param, self.name)
   end
 
-  # A SemanticPuppet::VersionRange version >= 1.0.0 will not include versions with pre-release
-  # identifiers unless that is explicitly declared. This may cause backward compatibility
-  # issues when resolving module dependencies and the flag is therefore set to `false` by default.
-  #
-  # @param flag [Boolean] set to true to resolve module dependencies using strict SemVer semantics
-  #
-  def modules_strict_semver=(flag)
-    @modules_strict_semver = flag
-  end
-
-  # @return [Boolean] the current value of the modules_strict_semver flag.
-  # @api public
-  def modules_strict_semver?
-    @modules_strict_semver
-  end
-
   # @api public
   # @return [Puppet::Resource::TypeCollection] The current global TypeCollection
   def known_resource_types
@@ -285,7 +268,7 @@ class Puppet::Node::Environment
   # @param name [String] The module name
   # @return [Puppet::Module, nil] The module if found, else nil
   def module(name)
-    modules_by_name[name]
+    modules.find {|mod| mod.name == name}
   end
 
   # Locate a module instance by the full forge name (EG authorname/module)
@@ -330,7 +313,7 @@ class Puppet::Node::Environment
 
       @modules = module_references.collect do |reference|
         begin
-          Puppet::Module.new(reference[:name], reference[:path], self, modules_strict_semver?)
+          Puppet::Module.new(reference[:name], reference[:path], self)
         rescue Puppet::Module::Error => e
           Puppet.log_exception(e)
           nil
@@ -340,12 +323,6 @@ class Puppet::Node::Environment
     @modules
   end
 
-  # @api private
-  def modules_by_name
-    @modules_by_name ||= Hash[modules.map { |mod| [mod.name, mod] }]
-  end
-  private :modules_by_name
-
   # Generate a warning if the given directory in a module path entry is named `lib`.
   #
   # @api private
@@ -378,7 +355,7 @@ class Puppet::Node::Environment
             Puppet::Module.is_module_directory?(name, path)
           end
           modules_by_path[path] = module_names.sort.map do |name|
-            Puppet::Module.new(name, File.join(path, name), self, modules_strict_semver?)
+            Puppet::Module.new(name, File.join(path, name), self)
           end
         end
       else
@@ -513,7 +490,8 @@ class Puppet::Node::Environment
     [self.class, name, full_modulepath, manifest].hash
   end
 
-  # not private so it can be called in tests
+  private
+
   def self.extralibs()
     if Puppet::Util.get_env('PUPPETLIB')
       split_path(Puppet::Util.get_env('PUPPETLIB'))
@@ -522,14 +500,11 @@ class Puppet::Node::Environment
     end
   end
 
-  private
-
   def self.expand_dirs(dirs)
     dirs.collect do |dir|
       Puppet::FileSystem.expand_path(dir)
     end
   end
-  private_class_method :expand_dirs
 
   # Reparse the manifests for the given environment
   #

data/lib/puppet/node/facts.rb

@@ -131,7 +131,17 @@ class Puppet::Node::Facts
       or fact.is_a? String
       fact
     else
-      fact.to_s
+      result = fact.to_s
+      # The result may be ascii-8bit encoded without being a binary (low level object.inspect returns ascii-8bit string)
+      if result.encoding == Encoding::ASCII_8BIT
+        begin
+          result = result.encode(Encoding::UTF_8)
+        rescue
+          # return the ascii-8bit - it will be taken as a binary
+          result
+        end
+      end
+      result
     end
   end
 end

data/lib/puppet/parameter.rb

@@ -1,4 +1,3 @@
-require 'puppet/util/methodhelper'
 require 'puppet/util/logging'
 require 'puppet/util/docs'
 
@@ -22,7 +21,6 @@ class Puppet::Parameter
   include Puppet::Util
   include Puppet::Util::Errors
   include Puppet::Util::Logging
-  include Puppet::Util::MethodHelper
 
   require 'puppet/parameter/value_collection'
 
@@ -340,16 +338,15 @@ class Puppet::Parameter
   # @api public
   # @note A parameter should be created via the DSL method {Puppet::Type::newparam}
   #
-  def initialize(options = {})
-    options = symbolize_options(options)
-    if resource = options[:resource]
+  def initialize(resource: nil, value: nil, should: nil)
+    if resource
       self.resource = resource
-      options.delete(:resource)
     else
       raise Puppet::DevError, _("No resource set for %{name}") % { name: self.class.name }
     end
 
-    set_options(options)
+    self.value = value if value
+    self.should = should if should
   end
 
   # Writes the given `msg` to the log with the loglevel indicated by the associated resource's

data/lib/puppet/parser/ast.rb

@@ -7,12 +7,11 @@ class Puppet::Parser::AST
   AST = Puppet::Parser::AST
 
   include Puppet::Util::Errors
-  include Puppet::Util::MethodHelper
 
   attr_accessor :parent, :scope, :file, :line, :pos
 
   def inspect
-    "( #{self.class} #{self} #{@children.inspect} )"
+    "( #{self.class} #{self.to_s} #{@children.inspect} )"
   end
 
   # Evaluate the current object.  Just a stub method, since the subclass
@@ -44,14 +43,11 @@ class Puppet::Parser::AST
     end
   end
 
-  # Initialize the object.  Requires a hash as the argument, and
-  # takes each of the parameters of the hash and calls the setter
-  # method for them.  This is probably pretty inefficient and should
-  # likely be changed at some point.
-  def initialize(args)
-    set_options(args)
+  def initialize(file: nil, line: nil, pos: nil)
+    @file = file
+    @line = line
+    @pos = pos
   end
-
 end
 
 # And include all of the AST subclasses.

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

@@ -12,8 +12,8 @@ class Puppet::Parser::AST::Branch < Puppet::Parser::AST
     @children.each { |child| yield child }
   end
 
-  def initialize(arghash)
-    super(arghash)
-    @children ||= []
+  def initialize(children: [], **args)
+    @children = children
+    super(**args)
   end
 end

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

@@ -16,6 +16,11 @@ class Puppet::Parser::AST::Leaf < Puppet::Parser::AST
   def to_s
     @value.to_s unless @value.nil?
   end
+
+  def initialize(value: nil, **options)
+    @value = value
+    super(**options)
+  end
 end
 
 # Host names, either fully qualified or just the short name, or even a regex

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

@@ -26,6 +26,6 @@ class Puppet::Parser::AST::ResourceParam < Puppet::Parser::AST::Branch
   end
 
   def to_s
-    "#{@param} => #{@value}"
+    "#{@param} => #{@value.to_s}"
   end
 end

data/lib/puppet/parser/catalog_compiler.rb

@@ -0,0 +1,32 @@
+require 'puppet/loaders'
+require 'puppet/pops'
+
+# A Catalog "compiler" that is like the regular compiler but with an API
+# that is harmonized with the ScriptCompiler
+#
+# The Script compiler is "one shot" - it does not support rechecking if underlying source has changed or
+# deal with possible errors in a cached environment.
+#
+class Puppet::Parser::CatalogCompiler < Puppet::Parser::Compiler
+
+  # Evaluates the configured setup for a script + code in an environment with modules
+  #
+  def compile
+    Puppet[:strict_variables] = true
+    Puppet[:strict] = :error
+
+    Puppet.override(rich_data: true) do
+      super
+    end
+
+  rescue Puppet::ParseErrorWithIssue => detail
+    detail.node = node.name
+    Puppet.log_exception(detail)
+    raise
+  rescue => detail
+    message = "#{detail} on node #{node.name}"
+    Puppet.log_exception(detail, message)
+    raise Puppet::Error, message, detail.backtrace
+  end
+
+end

data/lib/puppet/parser/compiler.rb

@@ -16,7 +16,6 @@ class Puppet::Parser::Compiler
 
   include Puppet::Util
   include Puppet::Util::Errors
-  include Puppet::Util::MethodHelper
   include Puppet::Pops::Evaluator::Runtime3Support
 
   def self.compile(node, code_id = nil)
@@ -397,7 +396,7 @@ class Puppet::Parser::Compiler
   # Return a resource by either its ref or its type and title.
   def_delegator :@catalog, :resource, :findresource
 
-  def initialize(node, options = {})
+  def initialize(node, code_id: nil)
     @node = sanitize_node(node)
     # Array of resources representing all application instances we've found
     @applications = []
@@ -409,7 +408,7 @@ class Puppet::Parser::Compiler
     # in the middle of executing evaluate_applications
     @current_app = nil
     @current_components = nil
-    set_options(options)
+    @code_id = code_id
     initvars
     add_catalog_validators
     # Resolutions of fully qualified variable names

data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb

@@ -1,8 +1,6 @@
 class Puppet::Parser::Compiler
   # Validator that asserts that all capability resources that are referenced by 'consume' or 'require' has
   # been exported by some other resource in the environment
-  #
-  # @deprecated application orchestration will be removed in puppet 7
   class CatalogValidator::EnvironmentRelationshipValidator < CatalogValidator
 
     def validate

data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb

@@ -1,7 +1,5 @@
 class Puppet::Parser::Compiler
   # Validator that asserts that only application components can appear inside a site.
-  #
-  # @deprecated application orchestration will be removed in puppet 7
   class CatalogValidator::SiteValidator < CatalogValidator
     def self.validation_stage?(stage)
       PRE_FINISH.equal?(stage)

data/lib/puppet/parser/environment_compiler.rb

@@ -1,6 +1,5 @@
 require 'puppet/parser/compiler'
 
-# @deprecated application orchestration will be removed in puppet 7
 class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
   def self.compile(env, code_id=nil)
     begin
@@ -55,8 +54,6 @@ class Puppet::Parser::EnvironmentCompiler < Puppet::Parser::Compiler
   end
 
   def compile
-    Puppet.deprecation_warning("Application orchestration is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html")
-
     add_function_overrides
     begin
       Puppet.override(@context_overrides, _("For compiling environment catalog %{env}") % { env: environment.name }) do

data/lib/puppet/parser/functions.rb

@@ -24,17 +24,49 @@ module Puppet::Parser::Functions
     Puppet::Util::Log.levels.each do |level|
       newfunction(level,
                   :environment => root_env,
-                  :doc => "Log a message on the server at level #{level}.") do |vals|
+                  :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
         send(level, vals.join(" "))
       end
     end
   end
 
+  class AutoloaderDelegate
+    attr_reader :delegatee
+
+    def initialize
+      @delegatee = Puppet::Util::Autoload.new(self, "puppet/parser/functions")
+    end
+
+    def loadall(env = Puppet.lookup(:current_environment))
+      if Puppet[:strict] != :off
+        Puppet.warn_once('deprecations', 'Puppet::Parser::Functions#loadall', _("The method 'Puppet::Parser::Functions.autoloader#loadall' is deprecated in favor of using 'Scope#call_function'."))
+      end
+
+      @delegatee.loadall(env)
+    end
+
+    def load(name, env = Puppet.lookup(:current_environment))
+      if Puppet[:strict] != :off
+        Puppet.warn_once('deprecations', "Puppet::Parser::Functions#load('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#load(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % {name: name})
+      end
+
+      @delegatee.load(name, env)
+    end
+
+    def loaded?(name)
+      if Puppet[:strict] != :off
+        Puppet.warn_once('deprecations', "Puppet::Parser::Functions.loaded?('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % {name: name})
+      end
+
+      @delegatee.loaded?(name)
+    end
+  end
+
   # Accessor for singleton autoloader
   #
   # @api private
   def self.autoloader
-    @autoloader ||= Puppet::Util::Autoload.new(self, "puppet/parser/functions")
+    @autoloader ||= AutoloaderDelegate.new
   end
 
   # An adapter that ties the anonymous module that acts as the container for all 3x functions to the environment
@@ -44,10 +76,15 @@ module Puppet::Parser::Functions
   # @api private
   class AnonymousModuleAdapter < Puppet::Pops::Adaptable::Adapter
     attr_accessor :module
+  end
 
-    def self.create_adapter(env)
-      adapter = super(env)
-      adapter.module = Module.new do
+  # Get the module that functions are mixed into corresponding to an
+  # environment
+  #
+  # @api private
+  def self.environment_module(env)
+    AnonymousModuleAdapter.adapt(env) do |a|
+      a.module ||= Module.new do
         @metadata = {}
 
         def self.all_function_info
@@ -62,16 +99,7 @@ module Puppet::Parser::Functions
           @metadata[name] = info
         end
       end
-      adapter
-    end
-  end
-
-  # Get the module that functions are mixed into corresponding to an
-  # environment
-  #
-  # @api private
-  def self.environment_module(env)
-    AnonymousModuleAdapter.adapt(env).module
+    end.module
   end
 
   # Create a new Puppet DSL function.
@@ -175,7 +203,9 @@ module Puppet::Parser::Functions
           elsif arity < 0 and args[0].size < (arity+1).abs
             raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})") % { name: name, arg_count: args[0].size, min_arg_count: (arity+1).abs }
           end
-          self.send(real_fname, args[0])
+          r = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.convert_return(self.send(real_fname, args[0]))
+          # avoid leaking aribtrary value if not being an rvalue function
+          options[:type] == :rvalue ? r : nil
         else
           raise ArgumentError, _("custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)")
         end
@@ -203,7 +233,7 @@ module Puppet::Parser::Functions
     name = name.intern
 
     unless func = get_function(name, environment)
-      autoloader.load(name, environment)
+      autoloader.delegatee.load(name, environment)
       func = get_function(name, environment)
     end
 
@@ -215,7 +245,7 @@ module Puppet::Parser::Functions
   end
 
   def self.functiondocs(environment = Puppet.lookup(:current_environment))
-    autoloader.loadall
+    autoloader.delegatee.loadall(environment)
 
     ret = ""
 

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

@@ -7,12 +7,12 @@ result as a String.
 The first argument to this function should be a `<MODULE NAME>/<TEMPLATE FILE>`
 reference, which loads `<TEMPLATE FILE>` from `<MODULE NAME>`'s `templates`
 directory. In most cases, the last argument is optional; if used, it should be a
-[hash](https://puppet.com/docs/puppet/latest/lang_data_hash.html) that contains parameters to
+[hash](/puppet/latest/reference/lang_data_hash.html) that contains parameters to
 pass to the template.
 
-- See the [template](https://puppet.com/docs/puppet/latest/lang_template.html) documentation
+- See the [template](/puppet/latest/reference/lang_template.html) documentation
 for general template usage information.
-- See the [EPP syntax](https://puppet.com/docs/puppet/latest/lang_template_epp.html)
+- See the [EPP syntax](/puppet/latest/reference/lang_template_epp.html)
 documentation for examples of EPP.
 
 For example, to call the apache module's `templates/vhost/_docroot.epp`