puppet 8.3.1-x86-mingw32 → 8.4.0-x86-mingw32

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera_puppet'
 
 module Puppet::Parser::Functions
@@ -6,87 +7,87 @@ module Puppet::Parser::Functions
     :hiera_array,
     :type => :rvalue,
     :arity => -2,
-    :doc => <<-DOC
-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://puppet.com/docs/hiera/latest/lookup_types.html#array-merge).
-
-The `hiera_array` function takes up to three arguments, in this order:
-
-1. A string key that Hiera searches for in the hierarchy. **Required**.
-2. An optional default value to return if Hiera doesn't find anything matching the key.
-    * 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://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.
-
-**Example**: Using `hiera_array`
-
-~~~ yaml
-# Assuming hiera.yaml
-# :hierarchy:
-#   - web01.example.com
-#   - common
-
-# Assuming common.yaml:
-# users:
-#   - 'cdouglas = regular'
-#   - 'efranklin = regular'
-
-# Assuming web01.example.com.yaml:
-# users: 'abarry = admin'
-~~~
-
-~~~ puppet
-$allusers = hiera_array('users', undef)
-
-# $allusers contains ["cdouglas = regular", "efranklin = regular", "abarry = admin"].
-~~~
-
-You can optionally generate the default value with a
-[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
-takes one parameter.
-
-**Example**: Using `hiera_array` with a lambda
-
-~~~ puppet
-# Assuming the same Hiera data as the previous example:
-
-$allusers = hiera_array('users') | $key | { "Key \'${key}\' not found" }
-
-# $allusers contains ["cdouglas = regular", "efranklin = regular", "abarry = admin"].
-# If hiera_array couldn't match its key, it would return the lambda result,
-# "Key 'users' not found".
-~~~
-
-`hiera_array` expects that all values returned will be strings or arrays. If any matched
-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://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
-Replace the calls as follows:
-
-| from  | to |
-| ----  | ---|
-| hiera_array($key) | lookup($key, { 'merge' => 'unique' }) |
-| hiera_array($key, $default) | lookup($key, { 'default_value' => $default, 'merge' => 'unique' }) |
-| hiera_array($key, $default, $level) | override level not supported |
-
-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](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
-for more information about Hiera lookup functions.
-
-- Since 4.0.0
-DOC
-) do |*args|
+    :doc => <<~DOC
+      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://puppet.com/docs/hiera/latest/lookup_types.html#array-merge).
+      
+      The `hiera_array` function takes up to three arguments, in this order:
+      
+      1. A string key that Hiera searches for in the hierarchy. **Required**.
+      2. An optional default value to return if Hiera doesn't find anything matching the key.
+          * 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://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.
+      
+      **Example**: Using `hiera_array`
+      
+      ~~~ yaml
+      # Assuming hiera.yaml
+      # :hierarchy:
+      #   - web01.example.com
+      #   - common
+      
+      # Assuming common.yaml:
+      # users:
+      #   - 'cdouglas = regular'
+      #   - 'efranklin = regular'
+      
+      # Assuming web01.example.com.yaml:
+      # users: 'abarry = admin'
+      ~~~
+      
+      ~~~ puppet
+      $allusers = hiera_array('users', undef)
+      
+      # $allusers contains ["cdouglas = regular", "efranklin = regular", "abarry = admin"].
+      ~~~
+      
+      You can optionally generate the default value with a
+      [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
+      takes one parameter.
+      
+      **Example**: Using `hiera_array` with a lambda
+      
+      ~~~ puppet
+      # Assuming the same Hiera data as the previous example:
+      
+      $allusers = hiera_array('users') | $key | { "Key \'${key}\' not found" }
+      
+      # $allusers contains ["cdouglas = regular", "efranklin = regular", "abarry = admin"].
+      # If hiera_array couldn't match its key, it would return the lambda result,
+      # "Key 'users' not found".
+      ~~~
+      
+      `hiera_array` expects that all values returned will be strings or arrays. If any matched
+      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://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
+      Replace the calls as follows:
+      
+      | from  | to |
+      | ----  | ---|
+      | hiera_array($key) | lookup($key, { 'merge' => 'unique' }) |
+      | hiera_array($key, $default) | lookup($key, { 'default_value' => $default, 'merge' => 'unique' }) |
+      | hiera_array($key, $default, $level) | override level not supported |
+      
+      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](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
+      for more information about Hiera lookup functions.
+      
+      - Since 4.0.0
+    DOC
+  ) do |*_args|
     Error.is4x('hiera_array')
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera_puppet'
 
 module Puppet::Parser::Functions
@@ -6,97 +7,97 @@ module Puppet::Parser::Functions
     :hiera_hash,
     :type => :rvalue,
     :arity => -2,
-    :doc => <<-DOC
-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://puppet.com/docs/hiera/latest/lookup_types.html#hash-merge).
-
-The merge strategy is determined by Hiera's
-[`:merge_behavior`](https://puppet.com/docs/hiera/latest/configuring.html#mergebehavior)
-setting.
-
-The `hiera_hash` function takes up to three arguments, in this order:
-
-1. A string key that Hiera searches for in the hierarchy. **Required**.
-2. An optional default value to return if Hiera doesn't find anything matching the key.
-    * 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://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.
-
-**Example**: Using `hiera_hash`
-
-~~~ yaml
-# Assuming hiera.yaml
-# :hierarchy:
-#   - web01.example.com
-#   - common
-
-# Assuming common.yaml:
-# users:
-#   regular:
-#     'cdouglas': 'Carrie Douglas'
-
-# Assuming web01.example.com.yaml:
-# users:
-#   administrators:
-#     'aberry': 'Amy Berry'
-~~~
-
-~~~ puppet
-# Assuming we are not web01.example.com:
-
-$allusers = hiera_hash('users', undef)
-
-# $allusers contains {regular => {"cdouglas" => "Carrie Douglas"},
-#                     administrators => {"aberry" => "Amy Berry"}}
-~~~
-
-You can optionally generate the default value with a
-[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
-takes one parameter.
-
-**Example**: Using `hiera_hash` with a lambda
-
-~~~ puppet
-# Assuming the same Hiera data as the previous example:
-
-$allusers = hiera_hash('users') | $key | { "Key \'${key}\' not found" }
-
-# $allusers contains {regular => {"cdouglas" => "Carrie Douglas"},
-#                     administrators => {"aberry" => "Amy Berry"}}
-# If hiera_hash couldn't match its key, it would return the lambda result,
-# "Key 'users' not found".
-~~~
-
-`hiera_hash` expects that all values returned will be hashes. If any of the values
-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://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
-Replace the calls as follows:
-
-| from  | to |
-| ----  | ---|
-| hiera_hash($key) | lookup($key, { 'merge' => 'hash' }) |
-| hiera_hash($key, $default) | lookup($key, { 'default_value' => $default, 'merge' => 'hash' }) |
-| hiera_hash($key, $default, $level) | override level not supported |
-
-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](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
-for more information about Hiera lookup functions.
-
-- Since 4.0.0
-DOC
-  ) do |*args|
+    :doc => <<~DOC
+      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://puppet.com/docs/hiera/latest/lookup_types.html#hash-merge).
+      
+      The merge strategy is determined by Hiera's
+      [`:merge_behavior`](https://puppet.com/docs/hiera/latest/configuring.html#mergebehavior)
+      setting.
+      
+      The `hiera_hash` function takes up to three arguments, in this order:
+      
+      1. A string key that Hiera searches for in the hierarchy. **Required**.
+      2. An optional default value to return if Hiera doesn't find anything matching the key.
+          * 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://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.
+      
+      **Example**: Using `hiera_hash`
+      
+      ~~~ yaml
+      # Assuming hiera.yaml
+      # :hierarchy:
+      #   - web01.example.com
+      #   - common
+      
+      # Assuming common.yaml:
+      # users:
+      #   regular:
+      #     'cdouglas': 'Carrie Douglas'
+      
+      # Assuming web01.example.com.yaml:
+      # users:
+      #   administrators:
+      #     'aberry': 'Amy Berry'
+      ~~~
+      
+      ~~~ puppet
+      # Assuming we are not web01.example.com:
+      
+      $allusers = hiera_hash('users', undef)
+      
+      # $allusers contains {regular => {"cdouglas" => "Carrie Douglas"},
+      #                     administrators => {"aberry" => "Amy Berry"}}
+      ~~~
+      
+      You can optionally generate the default value with a
+      [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
+      takes one parameter.
+      
+      **Example**: Using `hiera_hash` with a lambda
+      
+      ~~~ puppet
+      # Assuming the same Hiera data as the previous example:
+      
+      $allusers = hiera_hash('users') | $key | { "Key \'${key}\' not found" }
+      
+      # $allusers contains {regular => {"cdouglas" => "Carrie Douglas"},
+      #                     administrators => {"aberry" => "Amy Berry"}}
+      # If hiera_hash couldn't match its key, it would return the lambda result,
+      # "Key 'users' not found".
+      ~~~
+      
+      `hiera_hash` expects that all values returned will be hashes. If any of the values
+      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://puppet.com/docs/puppet/#{Puppet.minor_version}/deprecated_language.html.
+      Replace the calls as follows:
+      
+      | from  | to |
+      | ----  | ---|
+      | hiera_hash($key) | lookup($key, { 'merge' => 'hash' }) |
+      | hiera_hash($key, $default) | lookup($key, { 'default_value' => $default, 'merge' => 'hash' }) |
+      | hiera_hash($key, $default, $level) | override level not supported |
+      
+      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](https://puppet.com/docs/hiera/latest/puppet.html#hiera-lookup-functions)
+      for more information about Hiera lookup functions.
+      
+      - Since 4.0.0
+    DOC
+  ) do |*_args|
     Error.is4x('hiera_hash')
   end
 end

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

@@ -1,101 +1,102 @@
 # frozen_string_literal: true
+
 require 'hiera_puppet'
 
 module Puppet::Parser::Functions
   newfunction(
     :hiera_include,
     :arity => -2,
-    :doc => <<-DOC
-Assigns classes to a node using an
-[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:
-
-- A string key name to use for classes.
-- A call to this function (i.e. `hiera_include('classes')`) in your environment's
-`sites.pp` manifest, outside of any node definitions and below any top-scope variables
-that Hiera uses in lookups.
-- `classes` keys in the appropriate Hiera data sources, with an array for each
-`classes` key and each value of the array containing the name of a class.
-
-The function takes up to three arguments, in this order:
-
-1. A string key that Hiera searches for in the hierarchy. **Required**.
-2. An optional default value to return if Hiera doesn't find anything matching the key.
-    * 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://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://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`
-
-~~~ yaml
-# Assuming hiera.yaml
-# :hierarchy:
-#   - web01.example.com
-#   - common
-
-# Assuming web01.example.com.yaml:
-# classes:
-#   - apache::mod::php
-
-# Assuming common.yaml:
-# classes:
-#   - apache
-~~~
-
-~~~ puppet
-# In site.pp, outside of any node definitions and below any top-scope variables:
-hiera_include('classes', undef)
-
-# Puppet assigns the apache and apache::mod::php classes to the web01.example.com node.
-~~~
-
-You can optionally generate the default value with a
-[lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
-takes one parameter.
-
-**Example**: Using `hiera_include` with a lambda
-
-~~~ puppet
-# Assuming the same Hiera data as the previous example:
-
-# In site.pp, outside of any node definitions and below any top-scope variables:
-hiera_include('classes') | $key | {"Key \'${key}\' not found" }
-
-# Puppet assigns the apache and apache::mod::php classes to the web01.example.com node.
-# If hiera_include couldn't match its key, it would return the lambda result,
-# "Key 'classes' not found".
-~~~
-
-`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 |
-| ----  | ---|
-| hiera_include($key) | include(lookup($key, { 'merge' => 'unique' })) |
-| 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.
-
-- Since 4.0.0
-DOC
-  ) do |*args|
+    :doc => <<~DOC
+      Assigns classes to a node using an
+      [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:
+      
+      - A string key name to use for classes.
+      - A call to this function (i.e. `hiera_include('classes')`) in your environment's
+      `sites.pp` manifest, outside of any node definitions and below any top-scope variables
+      that Hiera uses in lookups.
+      - `classes` keys in the appropriate Hiera data sources, with an array for each
+      `classes` key and each value of the array containing the name of a class.
+      
+      The function takes up to three arguments, in this order:
+      
+      1. A string key that Hiera searches for in the hierarchy. **Required**.
+      2. An optional default value to return if Hiera doesn't find anything matching the key.
+          * 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://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://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`
+      
+      ~~~ yaml
+      # Assuming hiera.yaml
+      # :hierarchy:
+      #   - web01.example.com
+      #   - common
+      
+      # Assuming web01.example.com.yaml:
+      # classes:
+      #   - apache::mod::php
+      
+      # Assuming common.yaml:
+      # classes:
+      #   - apache
+      ~~~
+      
+      ~~~ puppet
+      # In site.pp, outside of any node definitions and below any top-scope variables:
+      hiera_include('classes', undef)
+      
+      # Puppet assigns the apache and apache::mod::php classes to the web01.example.com node.
+      ~~~
+      
+      You can optionally generate the default value with a
+      [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) that
+      takes one parameter.
+      
+      **Example**: Using `hiera_include` with a lambda
+      
+      ~~~ puppet
+      # Assuming the same Hiera data as the previous example:
+      
+      # In site.pp, outside of any node definitions and below any top-scope variables:
+      hiera_include('classes') | $key | {"Key \'${key}\' not found" }
+      
+      # Puppet assigns the apache and apache::mod::php classes to the web01.example.com node.
+      # If hiera_include couldn't match its key, it would return the lambda result,
+      # "Key 'classes' not found".
+      ~~~
+      
+      `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 |
+      | ----  | ---|
+      | hiera_include($key) | include(lookup($key, { 'merge' => 'unique' })) |
+      | 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.
+      
+      - Since 4.0.0
+    DOC
+  ) do |*_args|
     Error.is4x('hiera_include')
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Include the specified classes
 Puppet::Parser::Functions::newfunction(:include, :arity => -2, :doc =>
 "Declares one or more classes, causing the resources in them to be
@@ -30,6 +31,6 @@ the future parser's resource and relationship expressions.
 - Since 4.7.0 returns an Array[Type[Class]] of all included classes 
 ") do |classes|
   call_function('include', classes)
-  #TRANSLATORS "function_include", "Scope", and "Scope#call_function" refer to Puppet internals and should not be translated
+  # TRANSLATORS "function_include", "Scope", and "Scope#call_function" refer to Puppet internals and should not be translated
   Puppet.warn_once('deprecations', '3xfunction#include', _("Calling function_include via the Scope class is deprecated. Use Scope#call_function instead"))
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Parser::Functions::newfunction(:inline_epp, :type => :rvalue, :arity => -2, :doc =>
 "Evaluates an Embedded Puppet (EPP) template string and returns the rendered
 text result as a String.
@@ -46,7 +47,6 @@ END
 ~~~
 
 - Since 3.5
-- Requires [future parser](https://puppet.com/docs/puppet/3.8/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
-
+- Requires [future parser](https://puppet.com/docs/puppet/3.8/experiments_future.html) in Puppet 3.5 to 3.8") do |_arguments|
   Puppet::Parser::Functions::Error.is4x('inline_epp')
 end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :arity => -2, :doc =>
   "Evaluate a template string and return its value.  See
   [the templating docs](https://puppet.com/docs/puppet/latest/lang_template.html) for
   more information. Note that if multiple template strings are specified, their
   output is all concatenated and returned as the output of the function.") do |vals|
-
   if Puppet[:tasks]
     raise Puppet::ParseErrorWithIssue.from_issue_and_stack(
       Puppet::Pops::Issues::FEATURE_NOT_SUPPORTED_WHEN_SCRIPTING,
@@ -13,15 +13,15 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :arit
 
   require 'erb'
 
-    vals.collect do |string|
-      # Use a wrapper, so the template can't get access to the full
-      # Scope object.
+  vals.collect do |string|
+    # Use a wrapper, so the template can't get access to the full
+    # Scope object.
 
-      wrapper = Puppet::Parser::TemplateWrapper.new(self)
-      begin
-        wrapper.result(string)
-      rescue => detail
-        raise Puppet::ParseError, _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
-      end
-    end.join("")
+    wrapper = Puppet::Parser::TemplateWrapper.new(self)
+    begin
+      wrapper.result(string)
+    rescue => detail
+      raise Puppet::ParseError, _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
+    end
+  end.join("")
 end