puppet 5.0.0 → 6.0.0

data/lib/puppet/parser/compiler.rb

@@ -10,11 +10,12 @@ require 'puppet/pops'
 # Maintain a graph of scopes, along with a bunch of data
 # about the individual catalog we're compiling.
 class Puppet::Parser::Compiler
+  include Puppet::Parser::AbstractCompiler
+
   extend Forwardable
 
   include Puppet::Util
   include Puppet::Util::Errors
-  include Puppet::Util::MethodHelper
   include Puppet::Pops::Evaluator::Runtime3Support
 
   def self.compile(node, code_id = nil)
@@ -24,8 +25,8 @@ class Puppet::Parser::Compiler
     if !errors.empty?
       errors.each { |e| Puppet.err(e) } if errors.size > 1
       errmsg = [
-        "Compilation has been halted because: #{errors.first}",
-        "For more information, see https://docs.puppet.com/puppet/latest/reference/environments.html",
+        _("Compilation has been halted because: %{error}") % { error: errors.first },
+        _("For more information, see https://puppet.com/docs/puppet/latest/environments_about.html"),
       ]
       raise(Puppet::Error, errmsg.join(' '))
     end
@@ -36,10 +37,10 @@ class Puppet::Parser::Compiler
     Puppet.log_exception(detail)
     raise
   rescue => detail
-    message = "#{detail} on node #{node.name}"
+    message = _("%{message} on node %{node}") % { message: detail, node: node.name }
     Puppet.log_exception(detail, message)
     raise Puppet::Error, message, detail.backtrace
- end
+  end
 
   attr_reader :node, :facts, :collections, :catalog, :resources, :relationships, :topscope
   attr_reader :qualified_variables
@@ -143,6 +144,10 @@ class Puppet::Parser::Compiler
   # Return a list of all of the defined classes.
   def_delegator :@catalog, :classes, :classlist
 
+  def with_context_overrides(description = '', &block)
+    Puppet.override( @context_overrides , description, &block)
+  end
+
   # Compiler our catalog.  This mostly revolves around finding and evaluating classes.
   # This is the main entry into our catalog.
   def compile
@@ -315,7 +320,7 @@ class Puppet::Parser::Compiler
       raise Puppet::Error, _("Invalid node mapping in %{app}: Mapping must be a hash") % { app: app.ref } unless mapping.is_a?(Hash)
       all_mapped = Set.new
       mapping.each do |k,v|
-        raise Puppet::Error, _("Invalid node mapping in %{app}: Key %{k} is not a Node") % { app: app.ref, k: k } unless k.is_a?(Puppet::Resource) && k.type == _('Node')
+        raise Puppet::Error, _("Invalid node mapping in %{app}: Key %{k} is not a Node") % { app: app.ref, k: k } unless k.is_a?(Puppet::Resource) && k.type == 'Node'
         v = [v] unless v.is_a?(Array)
         v.each do |res|
           raise Puppet::Error, _("Invalid node mapping in %{app}: Value %{res} is not a resource") % { app: app.ref, res: res } unless res.is_a?(Puppet::Resource)
@@ -348,7 +353,7 @@ class Puppet::Parser::Compiler
   # evaluated later in the process.
   #
   def evaluate_classes(classes, scope, lazy_evaluate = true)
-    raise Puppet::DevError, "No source for scope passed to evaluate_classes" unless scope.source
+    raise Puppet::DevError, _("No source for scope passed to evaluate_classes") unless scope.source
     class_parameters = nil
     # if we are a param class, save the classes hash
     # and transform classes to be the keys
@@ -391,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 = []
@@ -403,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
@@ -454,10 +459,10 @@ class Puppet::Parser::Compiler
       component_ref = args['component']
       kind = args['kind']
 
-      # That component_ref is either a QNAME or a Class['literal'|QREF] is asserted during validation so no
+      # That component_ref is either a QREF or a Class['literal'|QREF] is asserted during validation so no
       # need to check that here
-      if component_ref.is_a?(Puppet::Pops::Model::QualifiedName)
-        component_name = component_ref.value
+      if component_ref.is_a?(Puppet::Pops::Model::QualifiedReference)
+        component_name = component_ref.cased_value
         component_type = 'type'
         component = krt.find_definition(component_name)
       else
@@ -466,7 +471,8 @@ class Puppet::Parser::Compiler
         component = krt.find_hostclass(component_name)
       end
       if component.nil?
-        raise Puppet::ParseError, "Capability mapping error: #{kind} clause references nonexistent #{component_type} #{component_name}"
+        raise Puppet::ParseError, _("Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}") %
+            { kind: kind, component_type: component_type, component_name: component_name }
       end
 
       blueprint = args['blueprint']
@@ -657,7 +663,7 @@ class Puppet::Parser::Compiler
         data[target] = source_data.merge(metaparams_as_data(target, names))
       end
 
-      target.tag(*(source.tags))
+      target.merge_tags_from(source)
     end
   end
 
@@ -714,6 +720,7 @@ class Puppet::Parser::Compiler
     Puppet.override( @context_overrides , _("For initializing compiler")) do
       # THE MAGIC STARTS HERE ! This triggers parsing, loading etc.
       @catalog.version = environment.known_resource_types.version
+      @loaders.pre_load
     end
 
     @catalog.add_resource(Puppet::Parser::Resource.new("stage", :main, :scope => @topscope))
@@ -732,62 +739,23 @@ class Puppet::Parser::Compiler
   end
 
   def sanitize_node(node)
-    # Resurrect "trusted information" that comes from node/fact terminus.
-    # The current way this is done in puppet db (currently the only one)
-    # is to store the node parameter 'trusted' as a hash of the trusted information.
-    #
-    # Thus here there are two main cases:
-    # 1. This terminus was used in a real agent call (only meaningful if someone curls the request as it would
-    #  fail since the result is a hash of two catalogs).
-    # 2  It is a command line call with a given node that use a terminus that:
-    # 2.1 does not include a 'trusted' fact - use local from node trusted information
-    # 2.2 has a 'trusted' fact - this in turn could be
-    # 2.2.1 puppet db having stored trusted node data as a fact (not a great design)
-    # 2.2.2 some other terminus having stored a fact called "trusted" (most likely that would have failed earlier, but could
-    #       be spoofed).
-    #
-    # For the reasons above, the resurrection of trusted node data with authenticated => true is only performed
-    # if user is running as root, else it is resurrected as unauthenticated.
-    #
-    trusted_param = node.parameters['trusted']
-    if trusted_param
-      # Blows up if it is a parameter as it will be set as $trusted by the compiler as if it was a variable
-      node.parameters.delete('trusted')
-      unless trusted_param.is_a?(Hash) && %w{authenticated certname extensions}.all? {|key| trusted_param.has_key?(key) }
-        # trusted is some kind of garbage, do not resurrect
-        trusted_param = nil
-      end
-    else
-      # trusted may be Boolean false if set as a fact by someone
-      trusted_param = nil
-    end
-
-    # The options for node.trusted_data in priority order are:
-    # 1) node came with trusted_data so use that
-    # 2) else if there is :trusted_information in the puppet context
-    # 3) else if the node provided a 'trusted' parameter (parsed out above)
-    # 4) last, fallback to local node trusted information
-    #
-    # Note that trusted_data should be a hash, but (2) and (4) are not
-    # hashes, so we to_h at the end
-    if !node.trusted_data
-      trusted = Puppet.lookup(:trusted_information) do
-        trusted_param || Puppet::Context::TrustedInformation.local(node)
-      end
-
-      # Ruby 1.9.3 can't apply to_h to a hash, so check first
-      node.trusted_data = trusted.is_a?(Hash) ? trusted : trusted.to_h
-    end
-
+    node.sanitize
     node
   end
 
   # Set the node's parameters into the top-scope as variables.
   def set_node_parameters
     node.parameters.each do |param, value|
+      # We don't want to set @topscope['environment'] from the parameters,
+      # instead we want to get that from the node's environment itself in
+      # case a custom node terminus has done any mucking about with
+      # node.parameters.
+      next if param.to_s == 'environment'
       # Ensure node does not leak Symbol instances in general
       @topscope[param.to_s] = value.is_a?(Symbol) ? value.to_s : value
     end
+    @topscope['environment'] = node.environment.name.to_s
+
     # These might be nil.
     catalog.client_version = node.parameters["clientversion"]
     catalog.server_version = node.parameters["serverversion"]

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

@@ -4,9 +4,9 @@ Puppet::Parser::Functions::newfunction(
   :arity => -3,
   :doc => <<DOC
 Returns the given value if it is of the given
-[data type](https://docs.puppetlabs.com/puppet/latest/reference/lang_data.html), or
+[data type](https://puppet.com/docs/puppet/latest/lang_data.html), or
 otherwise either raises an error or executes an optional two-parameter
-[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html).
+[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html).
 
 The function takes two mandatory arguments, in this order:
 
@@ -51,10 +51,10 @@ $valid_username = assert_type(String[1], $raw_username) |$expected, $actual| {
 ~~~
 
 For more information about data types, see the
-[documentation](https://docs.puppetlabs.com/puppet/latest/reference/lang_data.html).
+[documentation](https://puppet.com/docs/puppet/latest/lang_data.html).
 
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('assert_type')
+  Puppet::Parser::Functions::Error.is4x('assert_type')
 end

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

@@ -20,5 +20,5 @@ To search for the existence of files, use the `find_file()` function.
 - since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('binary_file')
+  Puppet::Parser::Functions::Error.is4x('binary_file')
 end

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

@@ -35,5 +35,5 @@ Would notice the value `[10]`
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('break')
+  Puppet::Parser::Functions::Error.is4x('break')
 end

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

@@ -47,6 +47,12 @@ Puppet::Parser::Functions::newfunction(:create_resources, :arity => -3, :doc =>
     final value of a parameter (just as when setting a parameter to `undef` in a puppet language
     resource declaration).
   ENDHEREDOC
+  if Puppet[:tasks]
+    raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
+      Puppet::Pops::Issues::CATALOG_OPERATION_NOT_SUPPORTED_WHEN_SCRIPTING,
+      {:operation => 'create_resources'})
+  end
+
   raise ArgumentError, (_("create_resources(): wrong number of arguments (%{count}; must be 2 or 3)") % { count: args.length }) if args.length > 3
   raise ArgumentError, (_('create_resources(): second argument must be a hash')) unless args[1].is_a?(Hash)
   if args.length == 3
@@ -61,13 +67,7 @@ Puppet::Parser::Functions::newfunction(:create_resources, :arity => -3, :doc =>
   # If relayed via other puppet functions in ruby that do not nest their calls, the source position
   # will be in the original puppet source.
   #
-  stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-  if stacktrace.size > 0
-    file, line = stacktrace[0]
-  else
-    file = nil
-    line = nil
-  end
+  file, line = Puppet::Pops::PuppetStack.top_of_stack
 
   if type.start_with? '@@'
     exported = true

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

@@ -103,5 +103,5 @@ defined('$tmp_file2')
 - Since 4.0.0 includes all future parser features
 DOC
 ) do |vals|
-  Error.is4x('defined')
+  Puppet::Parser::Functions::Error.is4x('defined')
 end

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

@@ -3,7 +3,8 @@ Puppet::Parser::Functions::newfunction(
   :type => :rvalue,
   :arity => -1,
   :doc => <<-DOC
-Returns a value for a sequence of given keys/indexes into a structure.
+Returns a value for a sequence of given keys/indexes into a structure, such as
+an array or hash.
 This function is used to "dig into" a complex data structure by
 using a sequence of keys / indexes to access a value from which
 the next key/index is accessed recursively.
@@ -13,17 +14,25 @@ The first encountered `undef` value or key stops the "dig" and `undef` is return
 An error is raised if an attempt is made to "dig" into
 something other than an `undef` (which immediately returns `undef`), an `Array` or a `Hash`.
 
+
+
 **Example:** Using `dig`
 
 ```puppet
 $data = {a => { b => [{x => 10, y => 20}, {x => 100, y => 200}]}}
-notice $data.dig(a, b, 1, x)
+notice $data.dig('a', 'b', 1, 'x')
 ```
 
 Would notice the value 100.
 
+This is roughly equivalent to `$data['a']['b'][1]['x']`. However, a standard
+index will return an error and cause catalog compilation failure if any parent
+of the final key (`'x'`) is `undef`. The `dig` function will return undef,
+rather than failing catalog compilation. This allows you to check if data
+exists in a structure without mandating that it always exists.
+
 * Since 4.5.0
 DOC
 ) do |args|
-  Error.is4x('dig')
+  Puppet::Parser::Functions::Error.is4x('dig')
 end

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

@@ -3,7 +3,7 @@ Puppet::Parser::Functions::newfunction(
   :type => :rvalue,
   :arity => -3,
   :doc => <<-DOC
-Runs a [lambda](http://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html)
+Runs a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 repeatedly using each value in a data structure, then returns the values unchanged.
 
 This function takes two mandatory arguments, in this order:
@@ -94,11 +94,11 @@ $data.each |$key, $value| {
 
 For an example that demonstrates how to create multiple `file` resources using `each`,
 see the Puppet
-[iteration](https://docs.puppetlabs.com/puppet/latest/reference/lang_iteration.html)
+[iteration](https://puppet.com/docs/puppet/latest/lang_iteration.html)
 documentation.
 
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('each')
+  Puppet::Parser::Functions::Error.is4x('each')
 end

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

@@ -22,6 +22,9 @@ function like this:
 `epp('apache/vhost/_docroot.epp', { 'docroot' => '/var/www/html',
 'virtual_docroot' => '/var/www/example' })`
 
+This function can also accept an absolute path, which can load a template file
+from anywhere on disk.
+
 Puppet produces a syntax error if you pass more parameters than are declared in
 the template's parameter tag. When passing parameters to a template that
 contains a parameter tag, use the same names as the tag's declared parameters.
@@ -32,5 +35,5 @@ function fails to pass any required parameter.
 
 - Since 4.0.0") do |args|
 
-  Error.is4x('epp')
+  Puppet::Parser::Functions::Error.is4x('epp')
 end

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

@@ -3,9 +3,9 @@ Puppet::Parser::Functions::newfunction(
   :type => :rvalue,
   :arity => -3,
   :doc => <<-DOC
-Applies a [lambda](http://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html)
+Applies a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 to every value in a data structure and returns an array or hash containing any elements
-for which the lambda evaluates to `true`.
+for which the lambda evaluates to a truthy value (not `false` or `undef`).
 
 This function takes two mandatory arguments, in this order:
 
@@ -74,5 +74,5 @@ $filtered_data = $data.filter |$keys, $values| { $keys =~ /berry$/ and $values <
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('filter')
+  Puppet::Parser::Functions::Error.is4x('filter')
 end

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

@@ -23,6 +23,6 @@ The function returns `undef` if none of the given paths were found
 - since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('find_file')
+  Puppet::Parser::Functions::Error.is4x('find_file')
 end
 

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

@@ -1,4 +1,5 @@
 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
@@ -16,6 +17,20 @@ 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
-    seed = Digest::MD5.hexdigest([self['::fqdn'],max,args].join(':')).hex
+ 
+    # 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.
+    # When they change, services get notified and restart.
+
+    # Restoring previous fqdn_rand behavior of calculating its seed value using MD5
+    # 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
+    else
+      seed = Digest::MD5.hexdigest([self['::fqdn'],max,args].join(':')).hex
+    end
+
     Puppet::Util.deterministic_rand_int(seed,max)
 end

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

@@ -14,20 +14,18 @@ Puppet::Parser::Functions::newfunction(:generate, :arity => -2, :type => :rvalue
       #TRANSLATORS "fully qualified" refers to a fully qualified file system path
       raise Puppet::ParseError, _("Generators must be fully qualified") unless Puppet::Util.absolute_path?(args[0])
 
-      if Puppet.features.microsoft_windows?
+      if Puppet::Util::Platform.windows?
         valid = args[0] =~ /^[a-z]:(?:[\/\\][-.~\w]+)+$/i
       else
         valid = args[0] =~ /^[-\/\w.+]+$/
       end
 
       unless valid
-        raise Puppet::ParseError,
-          _("Generators can only contain alphanumerics, file separators, and dashes")
+        raise Puppet::ParseError, _("Generators can only contain alphanumerics, file separators, and dashes")
       end
 
       if args[0] =~ /\.\./
-        raise Puppet::ParseError,
-          _("Can not use generators with '..' in them.")
+        raise Puppet::ParseError, _("Can not use generators with '..' in them.")
       end
 
       begin

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

@@ -16,7 +16,7 @@ The function takes up to three arguments, in this order:
     * If this argument isn't provided and this function results in a lookup failure, Puppet
     fails with a compilation error.
 3. The optional name of an arbitrary
-[hierarchy level](https://docs.puppetlabs.com/hiera/latest/hierarchy.html) to insert at the
+[hierarchy level](https://puppet.com/docs/hiera/latest/hierarchy.html) to insert at the
 top of the hierarchy. This lets you temporarily modify the hierarchy for a single lookup.
     * If Hiera doesn't find a matching key in the overriding hierarchy level, it continues
     searching the rest of the hierarchy.
@@ -58,7 +58,7 @@ $users = hiera('users', undef)
 ~~~
 
 You can optionally generate the default value with a
-[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) that
+[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
 takes one parameter.
 
 **Example**: Using `hiera` with a lambda
@@ -78,7 +78,7 @@ The returned value's data type depends on the types of the results. In the examp
 above, Hiera matches the 'users' key and returns it as a hash.
 
 The `hiera` function is deprecated in favor of using `lookup` and will be removed in 6.0.0.
-See  https://docs.puppet.com/puppet/#{Puppet.minor_version}/reference/deprecated_language.html.
+See https://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
 Replace the calls as follows:
 
 | from  | to |
@@ -92,7 +92,7 @@ result must be post processed to get exactly the same result, for example using
 with calls to stdlib's `deep_merge` function depending on kind of hiera call and setting of merge in hiera.yaml.
 
 See
-[the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
+[the documentation](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
 for more information about Hiera lookup functions.
 
 - Since 4.0.0

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

@@ -9,7 +9,7 @@ module Puppet::Parser::Functions
 Finds all matches of a key throughout the hierarchy and returns them as a single flattened
 array of unique values. If any of the matched values are arrays, they're flattened and
 included in the results. This is called an
-[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge).
+[array merge lookup](https://puppet.com/docs/hiera/latest/lookup_types.html#array-merge).
 
 The `hiera_array` function takes up to three arguments, in this order:
 
@@ -18,7 +18,7 @@ The `hiera_array` function takes up to three arguments, in this order:
     * If this argument isn't provided and this function results in a lookup failure, Puppet
     fails with a compilation error.
 3. The optional name of an arbitrary
-[hierarchy level](https://docs.puppetlabs.com/hiera/latest/hierarchy.html) to insert at the
+[hierarchy level](https://puppet.com/docs/hiera/latest/hierarchy.html) to insert at the
 top of the hierarchy. This lets you temporarily modify the hierarchy for a single lookup.
     * If Hiera doesn't find a matching key in the overriding hierarchy level, it continues
     searching the rest of the hierarchy.
@@ -47,7 +47,7 @@ $allusers = hiera_array('users', undef)
 ~~~
 
 You can optionally generate the default value with a
-[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) that
+[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
 takes one parameter.
 
 **Example**: Using `hiera_array` with a lambda
@@ -66,7 +66,7 @@ $allusers = hiera_array('users') | $key | { "Key \'${key}\' not found" }
 value is a hash, Puppet raises a type mismatch error.
 
 `hiera_array` is deprecated in favor of using `lookup` and will be removed in 6.0.0.
-See  https://docs.puppet.com/puppet/#{Puppet.minor_version}/reference/deprecated_language.html.
+See https://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
 Replace the calls as follows:
 
 | from  | to |
@@ -80,7 +80,7 @@ result must be post processed to get exactly the same result, for example using
 with calls to stdlib's `deep_merge` function depending on kind of hiera call and setting of merge in hiera.yaml.
 
 See
-[the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
+[the documentation](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
 for more information about Hiera lookup functions.
 
 - Since 4.0.0

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

@@ -9,10 +9,10 @@ module Puppet::Parser::Functions
 Finds all matches of a key throughout the hierarchy and returns them in a merged hash.
 If any of the matched hashes share keys, the final hash uses the value from the
 highest priority match. This is called a
-[hash merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#hash-merge).
+[hash merge lookup](https://puppet.com/docs/hiera/latest/lookup_types.html#hash-merge).
 
 The merge strategy is determined by Hiera's
-[`:merge_behavior`](https://docs.puppetlabs.com/hiera/latest/configuring.html#mergebehavior)
+[`:merge_behavior`](https://puppet.com/docs/hiera/latest/configuring.html#mergebehavior)
 setting.
 
 The `hiera_hash` function takes up to three arguments, in this order:
@@ -22,7 +22,7 @@ The `hiera_hash` function takes up to three arguments, in this order:
     * If this argument isn't provided and this function results in a lookup failure, Puppet
     fails with a compilation error.
 3. The optional name of an arbitrary
-[hierarchy level](https://docs.puppetlabs.com/hiera/latest/hierarchy.html) to insert at the
+[hierarchy level](https://puppet.com/docs/hiera/latest/hierarchy.html) to insert at the
 top of the hierarchy. This lets you temporarily modify the hierarchy for a single lookup.
     * If Hiera doesn't find a matching key in the overriding hierarchy level, it continues
     searching the rest of the hierarchy.
@@ -56,7 +56,7 @@ $allusers = hiera_hash('users', undef)
 ~~~
 
 You can optionally generate the default value with a
-[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) that
+[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
 takes one parameter.
 
 **Example**: Using `hiera_hash` with a lambda
@@ -76,7 +76,7 @@ $allusers = hiera_hash('users') | $key | { "Key \'${key}\' not found" }
 found in the data sources are strings or arrays, Puppet raises a type mismatch error.
 
 `hiera_hash` is deprecated in favor of using `lookup` and will be removed in 6.0.0.
-See  https://docs.puppet.com/puppet/#{Puppet.minor_version}/reference/deprecated_language.html.
+See  https://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
 Replace the calls as follows:
 
 | from  | to |
@@ -90,7 +90,7 @@ result must be post processed to get exactly the same result, for example using
 with calls to stdlib's `deep_merge` function depending on kind of hiera call and setting of merge in hiera.yaml.
 
 See
-[the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
+[the documentation](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
 for more information about Hiera lookup functions.
 
 - Since 4.0.0

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

@@ -6,7 +6,7 @@ module Puppet::Parser::Functions
     :arity => -2,
     :doc => <<-DOC
 Assigns classes to a node using an
-[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
+[array merge lookup](https://puppet.com/docs/hiera/latest/lookup_types.html#array-merge)
 that retrieves the value for a user-specified key from Hiera's data.
 
 The `hiera_include` function requires:
@@ -25,13 +25,13 @@ The function takes up to three arguments, in this order:
     * If this argument isn't provided and this function results in a lookup failure, Puppet
     fails with a compilation error.
 3. The optional name of an arbitrary
-[hierarchy level](https://docs.puppetlabs.com/hiera/latest/hierarchy.html) to insert at the
+[hierarchy level](https://puppet.com/docs/hiera/latest/hierarchy.html) to insert at the
 top of the hierarchy. This lets you temporarily modify the hierarchy for a single lookup.
     * If Hiera doesn't find a matching key in the overriding hierarchy level, it continues
     searching the rest of the hierarchy.
 
 The function uses an
-[array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
+[array merge lookup](https://puppet.com/docs/hiera/latest/lookup_types.html#array-merge)
 to retrieve the `classes` array, so every node gets every class from the hierarchy.
 
 **Example**: Using `hiera_include`
@@ -59,7 +59,7 @@ hiera_include('classes', undef)
 ~~~
 
 You can optionally generate the default value with a
-[lambda](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html) that
+[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
 takes one parameter.
 
 **Example**: Using `hiera_include` with a lambda
@@ -75,9 +75,8 @@ hiera_include('classes') | $key | {"Key \'${key}\' not found" }
 # "Key 'classes' not found".
 ~~~
 
-`hiera_include` is deprecated in favor of using a combination of `include`and `lookup` and will be
-removed in 6.0.0. See  https://docs.puppet.com/puppet/#{Puppet.minor_version}/reference/deprecated_language.html.
-Replace the calls as follows:
+`hiera_include` is deprecated in favor of using a combination of `include` and `lookup` and will be
+removed in Puppet 6.0.0. Replace the calls as follows:
 
 | from  | to |
 | ----  | ---|
@@ -85,14 +84,14 @@ Replace the calls as follows:
 | hiera_include($key, $default) | include(lookup($key, { 'default_value' => $default, 'merge' => 'unique' })) |
 | hiera_include($key, $default, $level) | override level not supported |
 
+See
+[the Upgrading to Hiera 5 migration guide](https://puppet.com/docs/puppet/5.5/hiera_migrate.html)
+for more information.
+
 Note that calls using the 'override level' option are not directly supported by 'lookup' and the produced
 result must be post processed to get exactly the same result, for example using simple hash/array `+` or
 with calls to stdlib's `deep_merge` function depending on kind of hiera call and setting of merge in hiera.yaml.
 
-See [the documentation](http://links.puppet.com/hierainclude) for more information
-and a more detailed example of how `hiera_include` uses array merge lookups to classify
-nodes.
-
 - Since 4.0.0
 DOC
   ) do |*args|

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

@@ -47,5 +47,5 @@ END
 - Since 3.5
 - Requires [future parser](/puppet/3.8/reference/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
 
-  Error.is4x('inline_epp')
+  Puppet::Parser::Functions::Error.is4x('inline_epp')
 end