From b9560df899fdea34ac69692ef2447ffdd2d3365a Mon Sep 17 00:00:00 2001
From: "Angel L. Mateo" <amateo@um.es>
Date: Tue, 2 Sep 2014 11:35:42 +0200
Subject: Check if file exists before loading with loadyaml. If not, return nil

---
 lib/puppet/parser/functions/loadyaml.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/loadyaml.rb b/lib/puppet/parser/functions/loadyaml.rb
index 10c4005..ca655f6 100644
--- a/lib/puppet/parser/functions/loadyaml.rb
+++ b/lib/puppet/parser/functions/loadyaml.rb
@@ -13,7 +13,12 @@ module Puppet::Parser::Functions
       raise Puppet::ParseError, ("loadyaml(): wrong number of arguments (#{args.length}; must be 1)")
     end
 
-    YAML.load_file(args[0])
+    if File.exists?(args[0]) then
+      YAML.load_file(args[0])
+    else
+      warning("Can't load " + args[0] + ". File does not exist!")
+      nil
+    end
 
   end
 
-- 
cgit v1.2.3


From 260c1f4b92113a1da3b30562a11d20a79e5b08db Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <oliver@majinai.net>
Date: Thu, 4 Dec 2014 22:33:15 +0100
Subject: Add new functions validate_numeric() and validate_integer().

---
 lib/puppet/parser/functions/validate_integer.rb | 128 ++++++++++++++++++++++++
 lib/puppet/parser/functions/validate_numeric.rb |  90 +++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 lib/puppet/parser/functions/validate_integer.rb
 create mode 100644 lib/puppet/parser/functions/validate_numeric.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
new file mode 100644
index 0000000..c12d676
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -0,0 +1,128 @@
+module Puppet::Parser::Functions
+
+  newfunction(:validate_integer, :doc => <<-'ENDHEREDOC') do |args|
+    Validate that the first argument is an integer (or an array of integers). Abort catalog compilation if any of the checks fail.
+    
+    The second argument is optional and passes a maximum. (All elements of) the first argument has to be less or equal to this max.
+
+    The third argument is optional and passes a minimum.  (All elements of) the first argument has to be greater or equal to this min.
+    If, and only if, a minimum is given, the second argument may be an empty string or undef, which will be handled to just check
+    if (all elements of) the first argument are greater or equal to the given minimum.
+
+    It will fail if the first argument is not an integer or array of integers, and if arg 2 and arg 3 are not convertable to an integer.
+
+    The following values will pass:
+
+      validate_integer(1)
+      validate_integer(1, 2)
+      validate_integer(1, 1)
+      validate_integer(1, 2, 0)
+      validate_integer(2, 2, 2)
+      validate_integer(2, '', 0)
+      validate_integer(2, undef, 0)
+      $foo = undef
+      validate_integer(2, $foo, 0)
+      validate_integer([1,2,3,4,5], 6)
+      validate_integer([1,2,3,4,5], 6, 0)
+
+    Plus all of the above, but any combination of values passed as strings ('1' or "1").
+    Plus all of the above, but with (correct) combinations of negative integer values.
+
+    The following values will not:
+
+      validate_integer(true)
+      validate_integer(false)
+      validate_integer(7.0)
+      validate_integer({ 1 => 2 })
+      $foo = undef
+      validate_integer($foo)
+      validate_integer($foobaridontexist)
+
+      validate_integer(1, 0)
+      validate_integer(1, true)
+      validate_integer(1, '')
+      validate_integer(1, undef)
+      validate_integer(1, , 0)
+      validate_integer(1, 2, 3)
+      validate_integer(1, 3, 2)
+      validate_integer(1, 3, true)
+
+    Plus all of the above, but any combination of values passed as strings ('false' or "false").
+    Plus all of the above, but with incorrect combinations of negative integer values.
+    Plus all of the above, but with non-integer crap in arrays or maximum / minimum argument.
+
+    ENDHEREDOC
+
+    # tell the user we need at least one, and optionally up to two other parameters
+    raise Puppet::ParseError, "validate_integer(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
+
+    input, max, min = *args
+
+    # check maximum parameter
+    if args.length > 1
+      max = max.to_s
+      # allow max to be empty (or undefined) if we have a minimum set
+      if args.length > 2 and max == ''
+        max = nil
+      else
+        begin
+          max = Integer(max)
+        rescue TypeError, ArgumentError
+          raise Puppet::ParseError, "validate_integer(): Expected second argument to be unset or an Integer, got #{max}:#{max.class}"
+        end
+      end
+    else
+      max = nil
+    end
+
+    # check minimum parameter
+    if args.length > 2
+      begin
+        min = Integer(min.to_s)
+      rescue TypeError, ArgumentError
+        raise Puppet::ParseError, "validate_integer(): Expected third argument to be unset or an Integer, got #{min}:#{min.class}"
+      end
+    else
+      min = nil
+    end
+
+    # ensure that min < max
+    if min and max and min > max
+      raise Puppet::ParseError, "validate_integer(): Expected second argument to be larger than third argument, got #{max} < #{min}"
+    end
+
+    # create lamba validator function
+    validator = lambda do |num|
+      # check input < max
+      if max and num > max
+        raise Puppet::ParseError, "validate_integer(): Expected #{input.inspect} to be smaller or equal to #{max}, got #{input.inspect}."
+      end
+      # check input > min (this will only be checked if no exception has been raised before)
+      if min and num < min
+        raise Puppet::ParseError, "validate_integer(): Expected #{input.inspect} to be greater or equal to #{min}, got #{input.inspect}."
+      end
+    end
+
+    # if this is an array, handle it.
+    case input
+    when Array
+      # check every element of the array
+      input.each_with_index do |arg, pos|
+        begin
+          arg = Integer(arg.to_s)
+          validator.call(arg)
+        rescue TypeError, ArgumentError
+          raise Puppet::ParseError, "validate_integer(): Expected element at array position #{pos} to be an Integer, got #{arg.class}"
+        end
+      end
+    # check the input. this will also fail any stuff other than pure, shiny integers
+    else
+      begin
+        input = Integer(input.to_s)
+        validator.call(input)
+      rescue TypeError, ArgumentError
+        raise Puppet::ParseError, "validate_integer(): Expected first argument to be an Integer or Array, got #{input.class}"
+      end
+    end
+  end
+end
diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb
new file mode 100644
index 0000000..27eec30
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_numeric.rb
@@ -0,0 +1,90 @@
+module Puppet::Parser::Functions
+
+  newfunction(:validate_numeric, :doc => <<-'ENDHEREDOC') do |args|
+    Validate that the first argument is a numeric value (or an array of numeric values). Abort catalog compilation if any of the checks fail.
+    
+    The second argument is optional and passes a maximum. (All elements of) the first argument has to be less or equal to this max.
+
+    The third argument is optional and passes a minimum.  (All elements of) the first argument has to be greater or equal to this min.
+    If, and only if, a minimum is given, the second argument may be an empty string or undef, which will be handled to just check
+    if (all elements of) the first argument are greater or equal to the given minimum.
+
+    It will fail if the first argument is not a numeric (Integer or Float) or array of numerics, and if arg 2 and arg 3 are not convertable to a numeric.
+
+    For passing and failing usage, see `validate_integer()`. It is all the same for validate_numeric, yet now floating point values are allowed, too.
+
+    ENDHEREDOC
+
+    # tell the user we need at least one, and optionally up to two other parameters
+    raise Puppet::ParseError, "validate_numeric(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
+
+    input, max, min = *args
+
+    # check maximum parameter
+    if args.length > 1
+      max = max.to_s
+      # allow max to be empty (or undefined) if we have a minimum set
+      if args.length > 2 and max == ''
+        max = nil
+      else
+        begin
+          max = Float(max)
+        rescue TypeError, ArgumentError
+          raise Puppet::ParseError, "validate_numeric(): Expected second argument to be unset or a Numeric, got #{max}:#{max.class}"
+        end
+      end
+    else
+      max = nil
+    end
+
+    # check minimum parameter
+    if args.length > 2
+      begin
+        min = Float(min.to_s)
+      rescue TypeError, ArgumentError
+        raise Puppet::ParseError, "validate_numeric(): Expected third argument to be unset or a Numeric, got #{min}:#{min.class}"
+      end
+    else
+      min = nil
+    end
+
+    # ensure that min < max
+    if min and max and min > max
+      raise Puppet::ParseError, "validate_numeric(): Expected second argument to be larger than third argument, got #{max} < #{min}"
+    end
+
+    # create lamba validator function
+    validator = lambda do |num|
+      # check input < max
+      if max and num > max
+        raise Puppet::ParseError, "validate_numeric(): Expected #{input.inspect} to be smaller or equal to #{max}, got #{input.inspect}."
+      end
+      # check input > min (this will only be checked if no exception has been raised before)
+      if min and num < min
+        raise Puppet::ParseError, "validate_numeric(): Expected #{input.inspect} to be greater or equal to #{min}, got #{input.inspect}."
+      end
+    end
+
+    # if this is an array, handle it.
+    case input
+    when Array
+      # check every element of the array
+      input.each_with_index do |arg, pos|
+        begin
+          arg = Float(arg.to_s)
+          validator.call(arg)
+        rescue TypeError, ArgumentError
+          raise Puppet::ParseError, "validate_numeric(): Expected element at array position #{pos} to be a Numeric, got #{arg.class}"
+        end
+      end
+    # check the input. this will also fail any stuff other than pure, shiny integers
+    else
+      begin
+        input = Float(input.to_s)
+        validator.call(input)
+      rescue TypeError, ArgumentError
+        raise Puppet::ParseError, "validate_numeric(): Expected first argument to be a Numeric or Array, got #{input.class}"
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 305342782998e36e48e1011d12a37c523b838bec Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 5 Dec 2014 08:48:10 +0100
Subject: Fixing ruby 1.8 support.

---
 lib/puppet/parser/functions/validate_integer.rb | 3 +++
 lib/puppet/parser/functions/validate_numeric.rb | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
index c12d676..995f8db 100644
--- a/lib/puppet/parser/functions/validate_integer.rb
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -115,6 +115,9 @@ module Puppet::Parser::Functions
           raise Puppet::ParseError, "validate_integer(): Expected element at array position #{pos} to be an Integer, got #{arg.class}"
         end
       end
+    # for the sake of compatibility with ruby 1.8, we need extra handling of hashes
+    when Hash
+      raise Puppet::ParseError, "validate_integer(): Expected first argument to be an Integer or Array, got #{input.class}"
     # check the input. this will also fail any stuff other than pure, shiny integers
     else
       begin
diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb
index 27eec30..d2e4d16 100644
--- a/lib/puppet/parser/functions/validate_numeric.rb
+++ b/lib/puppet/parser/functions/validate_numeric.rb
@@ -77,6 +77,9 @@ module Puppet::Parser::Functions
           raise Puppet::ParseError, "validate_numeric(): Expected element at array position #{pos} to be a Numeric, got #{arg.class}"
         end
       end
+    # for the sake of compatibility with ruby 1.8, we need extra handling of hashes
+    when Hash
+      raise Puppet::ParseError, "validate_integer(): Expected first argument to be a Numeric or Array, got #{input.class}"
     # check the input. this will also fail any stuff other than pure, shiny integers
     else
       begin
-- 
cgit v1.2.3


From 2a3babc348895a4c8990d57f003c41e50f3ed932 Mon Sep 17 00:00:00 2001
From: Rob Fugina <rfugina@genome.wustl.edu>
Date: Tue, 18 Nov 2014 12:34:55 -0600
Subject: Added type checks for dirname(), and additional tests

---
 lib/puppet/parser/functions/dirname.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dirname.rb b/lib/puppet/parser/functions/dirname.rb
index ea8cc1e..40b300d 100644
--- a/lib/puppet/parser/functions/dirname.rb
+++ b/lib/puppet/parser/functions/dirname.rb
@@ -4,11 +4,17 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "dirname(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    if arguments.size < 1 then
+      raise(Puppet::ParseError, "dirname(): No arguments given")
+    end
+    if arguments.size > 1 then
+      raise(Puppet::ParseError, "dirname(): Too many arguments given (#{arguments.size})")
+    end
+    unless arguments[0].is_a?(String)
+      raise(Puppet::ParseError, 'dirname(): Requires string as argument')
+    end
 
-    path = arguments[0]
-    return File.dirname(path)
+    return File.dirname(arguments[0])
   end
 end
 
-- 
cgit v1.2.3


From 53b1802a92010c9f2ef557005c57977cb219cb64 Mon Sep 17 00:00:00 2001
From: Adam Crews <adam@pathdefender.com>
Date: Sun, 1 Feb 2015 22:46:16 -0800
Subject: Add a ceiling function to complement the floor function.

---
 lib/puppet/parser/functions/ceiling.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 lib/puppet/parser/functions/ceiling.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/ceiling.rb b/lib/puppet/parser/functions/ceiling.rb
new file mode 100644
index 0000000..5f3b10b
--- /dev/null
+++ b/lib/puppet/parser/functions/ceiling.rb
@@ -0,0 +1,25 @@
+module Puppet::Parser::Functions
+  newfunction(:ceiling, :type => :rvalue, :doc => <<-EOS
+    Returns the smallest integer greater or equal to the argument.
+    Takes a single numeric value as an argument.
+    EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "ceiling(): Wrong number of arguments " +
+          "given (#{arguments.size} for 1)") if arguments.size != 1
+
+    begin
+      arg = Float(arguments[0])
+    rescue TypeError, ArgumentError => e
+      raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
+            "given (#{arguments[0]} for Numeric)")
+    end
+
+    raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
+          "given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
+
+    arg.ceil
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From 84f866ffafbb27a6aa6a1eea92c393a63829e242 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Wed, 28 Jan 2015 15:28:54 -0800
Subject: (MODULES-1738) Don't modify global seed in fqdn_rotate()

As per puppetlabs/puppet@292233c, this leaves the global seed in a
deterministic state, which is bad. Puppet::Util.deterministic_rand()
exists to avoid running into this issue, but is only present starting in
Puppet 3.2.0.
---
 lib/puppet/parser/functions/fqdn_rotate.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rotate.rb b/lib/puppet/parser/functions/fqdn_rotate.rb
index 7f4d37d..cf22d36 100644
--- a/lib/puppet/parser/functions/fqdn_rotate.rb
+++ b/lib/puppet/parser/functions/fqdn_rotate.rb
@@ -31,8 +31,20 @@ Rotates an array a random number of times based on a nodes fqdn.
 
     elements = result.size
 
-    srand(Digest::MD5.hexdigest([lookupvar('::fqdn'),arguments].join(':')).hex)
-    rand(elements).times {
+    seed = Digest::MD5.hexdigest([lookupvar('::fqdn'),arguments].join(':')).hex
+    # deterministic_rand() was added in Puppet 3.2.0; reimplement if necessary
+    if Puppet::Util.respond_to?(:deterministic_rand)
+      offset = Puppet::Util.deterministic_rand(seed, elements).to_i
+    else
+      if defined?(Random) == 'constant' && Random.class == Class
+        offset = Random.new(seed).rand(elements)
+      else
+        srand(seed)
+        offset = rand(elements)
+        srand()
+      end
+    end
+    offset.times {
        result.push result.shift
     }
 
-- 
cgit v1.2.3


From 1321d586a88edb7c8bf07c5edb2d5ce2ae44c1a3 Mon Sep 17 00:00:00 2001
From: Sean Millichamp <sean.millichamp@secure-24.com>
Date: Sat, 14 Feb 2015 10:46:34 -0500
Subject: (MODULES-1771) Don't modify input to is_domain_name()

Fix is_domain_name() so it dup's its incoming argument
to avoid changing the original with a later chomp!
---
 lib/puppet/parser/functions/is_domain_name.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_domain_name.rb b/lib/puppet/parser/functions/is_domain_name.rb
index b3fee96..24cc208 100644
--- a/lib/puppet/parser/functions/is_domain_name.rb
+++ b/lib/puppet/parser/functions/is_domain_name.rb
@@ -13,7 +13,7 @@ Returns true if the string passed to this function is a syntactically correct do
         "given #{arguments.size} for 1")
     end
 
-    domain = arguments[0]
+    domain = arguments[0].dup
 
     # Limits (rfc1035, 3.1)
     domain_max_length=255
-- 
cgit v1.2.3


From b693c870d20f8bf0c574b9581a92ce3842fb3c05 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Thu, 19 Feb 2015 12:01:26 -0800
Subject: Check for string before copying

---
 lib/puppet/parser/functions/is_domain_name.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_domain_name.rb b/lib/puppet/parser/functions/is_domain_name.rb
index 24cc208..2860ded 100644
--- a/lib/puppet/parser/functions/is_domain_name.rb
+++ b/lib/puppet/parser/functions/is_domain_name.rb
@@ -13,6 +13,9 @@ Returns true if the string passed to this function is a syntactically correct do
         "given #{arguments.size} for 1")
     end
 
+    # Only allow string types
+    return false unless arguments[0].is_a?(String)
+
     domain = arguments[0].dup
 
     # Limits (rfc1035, 3.1)
@@ -20,9 +23,6 @@ Returns true if the string passed to this function is a syntactically correct do
     label_min_length=1
     label_max_length=63
 
-    # Only allow string types
-    return false unless domain.is_a?(String)
-
     # Allow ".", it is the top level domain
     return true if domain == '.'
 
-- 
cgit v1.2.3


From 7021b1f55cdc320c7eb389cd91f6be294629669b Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 25 Feb 2015 11:39:27 -0800
Subject: Add Hash to upcase

---
 lib/puppet/parser/functions/upcase.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
index 4302b29..22eae3a 100644
--- a/lib/puppet/parser/functions/upcase.rb
+++ b/lib/puppet/parser/functions/upcase.rb
@@ -13,22 +13,27 @@ Converts a string or an array of strings to uppercase.
 Will return:
 
     ASDF
-    EOS
+  EOS
   ) do |arguments|
 
     raise(Puppet::ParseError, "upcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+                                "given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
-    unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'upcase(): Requires either ' +
-        'array or string to work with')
+    unless value.is_a?(Array) || value.is_a?(String) || value.is_a?(Hash)
+      raise(Puppet::ParseError, 'upcase(): Requires an ' +
+                                  'array, string or hash to work with')
     end
 
     if value.is_a?(Array)
       # Numbers in Puppet are often string-encoded which is troublesome ...
       result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
+    elsif value.is_a?(Hash)
+      result = {}
+      result << value.each_pair do |k, v|
+        return {k.upcase => v.collect! { |p| p.upcase }}
+      end
     else
       result = value.upcase
     end
-- 
cgit v1.2.3


From 419f51bdd9d2aa35a94fbabbfaaf1cbfd81920f4 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 26 Feb 2015 10:13:28 -0800
Subject: Fix issue with Ruby 1.8.7 which did not allow for the return in an
 each_pair of the hash

---
 lib/puppet/parser/functions/upcase.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
index 22eae3a..2b05db4 100644
--- a/lib/puppet/parser/functions/upcase.rb
+++ b/lib/puppet/parser/functions/upcase.rb
@@ -31,8 +31,8 @@ Will return:
       result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
     elsif value.is_a?(Hash)
       result = {}
-      result << value.each_pair do |k, v|
-        return {k.upcase => v.collect! { |p| p.upcase }}
+      value.each_pair do |k, v|
+        result.merge!({k.upcase => v.collect! { |p| p.upcase }})
       end
     else
       result = value.upcase
-- 
cgit v1.2.3


From 85e81f9bdf9d482338c504ff3c658993a24978a0 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Fri, 27 Feb 2015 17:40:32 -0800
Subject: Loosen the restrictions of upcase and allow for recursion of the
 objects and only worry if the object responds to upcase

---
 lib/puppet/parser/functions/upcase.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
index 2b05db4..0226a88 100644
--- a/lib/puppet/parser/functions/upcase.rb
+++ b/lib/puppet/parser/functions/upcase.rb
@@ -17,22 +17,22 @@ Will return:
   ) do |arguments|
 
     raise(Puppet::ParseError, "upcase(): Wrong number of arguments " +
-                                "given (#{arguments.size} for 1)") if arguments.size < 1
+                                "given (#{arguments.size} for 1)") if arguments.size != 1
 
     value = arguments[0]
 
-    unless value.is_a?(Array) || value.is_a?(String) || value.is_a?(Hash)
+    unless value.is_a?(Array) || value.is_a?(Hash) || value.respond_to?(:upcase)
       raise(Puppet::ParseError, 'upcase(): Requires an ' +
-                                  'array, string or hash to work with')
+                                  'array, hash or object that responds to upcase in order to work')
     end
 
     if value.is_a?(Array)
       # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
+      result = value.collect { |i| function_upcase([i]) }
     elsif value.is_a?(Hash)
       result = {}
       value.each_pair do |k, v|
-        result.merge!({k.upcase => v.collect! { |p| p.upcase }})
+        result[function_upcase([k])] = function_upcase([v])
       end
     else
       result = value.upcase
-- 
cgit v1.2.3


From 41baef8502eabd34dc4fe49f43c6ef7c61f8e6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryon=20Roch=C3=A9?= <kain@kain.org>
Date: Fri, 8 Aug 2014 16:59:37 -0700
Subject: URI.escape for the array case was incorrect.

The previous commit to uriescape() changed the implementation to use the ruby default escape list for URI.escape(), but did not change the call triggered when uriescape() was called on an array, triggering ruby errors.
---
 lib/puppet/parser/functions/uriescape.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/uriescape.rb b/lib/puppet/parser/functions/uriescape.rb
index a486eee..45bbed2 100644
--- a/lib/puppet/parser/functions/uriescape.rb
+++ b/lib/puppet/parser/functions/uriescape.rb
@@ -22,7 +22,7 @@ module Puppet::Parser::Functions
 
     if value.is_a?(Array)
       # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? URI.escape(i,unsafe) : i }
+      result = value.collect { |i| i.is_a?(String) ? URI.escape(i) : i }
     else
       result = URI.escape(value)
     end
-- 
cgit v1.2.3


From 0236cd51bc2724b4ac68b91dda01d1b58b572df8 Mon Sep 17 00:00:00 2001
From: Stefan Goethals <stefan@zipkid.eu>
Date: Wed, 4 Jun 2014 06:12:22 -0700
Subject: Add support for hashes in the prefix function

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
---
 lib/puppet/parser/functions/prefix.rb | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/prefix.rb b/lib/puppet/parser/functions/prefix.rb
index d02286a..ac1c58a 100644
--- a/lib/puppet/parser/functions/prefix.rb
+++ b/lib/puppet/parser/functions/prefix.rb
@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:prefix, :type => :rvalue, :doc => <<-EOS
-This function applies a prefix to all elements in an array.
+This function applies a prefix to all elements in an array or a hash.
 
 *Examples:*
 
@@ -18,10 +18,10 @@ Will return: ['pa','pb','pc']
     raise(Puppet::ParseError, "prefix(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
-    array = arguments[0]
+    enumerable = arguments[0]
 
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "prefix(): expected first argument to be an Array, got #{array.inspect}"
+    unless enumerable.is_a?(Array) or enumerable.is_a?(Hash)
+      raise Puppet::ParseError, "prefix(): expected first argument to be an Array or a Hash, got #{enumerable.inspect}"
     end
 
     prefix = arguments[1] if arguments[1]
@@ -32,10 +32,17 @@ Will return: ['pa','pb','pc']
       end
     end
 
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      prefix ? prefix + i : i
+    if enumerable.is_a?(Array)
+      # Turn everything into string same as join would do ...
+      result = enumerable.collect do |i|
+        i = i.to_s
+        prefix ? prefix + i : i
+      end
+    else
+      result = Hash[enumerable.map do |k,v|
+        k = k.to_s
+        [ prefix ? prefix + k : k, v ]
+      end]
     end
 
     return result
-- 
cgit v1.2.3


From 56d815bcfc5f57d8dff974fd8bba192c6b141f89 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 19 Dec 2014 12:25:21 +0100
Subject: Rename private() to assert_private()

As mentioned in #270, private is a reserved keyword in the future parser
which is to be released with Puppet 4. As it stands, this function is
not useable with the future parser so it needs to renamed.

This is a breaking change.
---
 lib/puppet/parser/functions/assert_private.rb | 29 +++++++++++++++++++++++++++
 lib/puppet/parser/functions/private.rb        | 29 ---------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 lib/puppet/parser/functions/assert_private.rb
 delete mode 100644 lib/puppet/parser/functions/private.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/assert_private.rb b/lib/puppet/parser/functions/assert_private.rb
new file mode 100644
index 0000000..66c79cc
--- /dev/null
+++ b/lib/puppet/parser/functions/assert_private.rb
@@ -0,0 +1,29 @@
+#
+# assert_private.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:assert_private, :doc => <<-'EOS'
+    Sets the current class or definition as private.
+    Calling the class or definition from outside the current module will fail.
+    EOS
+  ) do |args|
+
+    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments "+
+      "given (#{args.size}}) for 0 or 1)") if args.size > 1
+
+    scope = self
+    if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
+      message = nil
+      if args[0] and args[0].is_a? String
+        message = args[0]
+      else
+        manifest_name = scope.source.name
+        manifest_type = scope.source.type
+        message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
+        message += " #{manifest_name} is private"
+      end
+      raise(Puppet::ParseError, message)
+    end
+  end
+end
diff --git a/lib/puppet/parser/functions/private.rb b/lib/puppet/parser/functions/private.rb
deleted file mode 100644
index 60210d3..0000000
--- a/lib/puppet/parser/functions/private.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# private.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:private, :doc => <<-'EOS'
-    Sets the current class or definition as private.
-    Calling the class or definition from outside the current module will fail.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "private(): Wrong number of arguments "+
-      "given (#{args.size}}) for 0 or 1)") if args.size > 1
-
-    scope = self
-    if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
-      message = nil
-      if args[0] and args[0].is_a? String
-        message = args[0]
-      else
-        manifest_name = scope.source.name
-        manifest_type = scope.source.type
-        message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
-        message += " #{manifest_name} is private"
-      end
-      raise(Puppet::ParseError, message)
-    end
-  end
-end
-- 
cgit v1.2.3


From 4a68b224c4a4a986be6b4bf9580fc4f23251e3c6 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 5 Mar 2015 11:01:31 -0800
Subject: Add private function back and forward to assert_private with
 deprecation warning

---
 lib/puppet/parser/functions/private.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/puppet/parser/functions/private.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/private.rb b/lib/puppet/parser/functions/private.rb
new file mode 100644
index 0000000..3b00ba1
--- /dev/null
+++ b/lib/puppet/parser/functions/private.rb
@@ -0,0 +1,17 @@
+#
+# private.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:private, :doc => <<-'EOS'
+    DEPRECATED: Sets the current class or definition as private.
+    Calling the class or definition from outside the current module will fail.
+  EOS
+  ) do |args|
+    warning("private() DEPRECATED: This function will cease to function on Puppet 4; please use assert_private() before upgrading to puppet 4 for backwards-compatibility, or migrate to the new parser's typing system.")
+    if !Puppet::Parser::Functions.autoloader.loaded?(:assert_private)
+      Puppet::Parser::Functions.autoloader.load(:assert_private)
+    end
+    function_assert_private([(args[0] unless args.size < 1)])
+  end
+end
-- 
cgit v1.2.3


From ee13438d2a71cea8a07202eee1eeaa29553b2131 Mon Sep 17 00:00:00 2001
From: Rod Montgomery <rmontgomery@dealnews.com>
Date: Thu, 15 Jan 2015 15:10:33 -0600
Subject: If present, top-level domain must be alphabetic

See RFC 1123, Section 2.1
http://tools.ietf.org/html/rfc1123#section-2
---
 lib/puppet/parser/functions/is_domain_name.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_domain_name.rb b/lib/puppet/parser/functions/is_domain_name.rb
index 2860ded..90ede32 100644
--- a/lib/puppet/parser/functions/is_domain_name.rb
+++ b/lib/puppet/parser/functions/is_domain_name.rb
@@ -33,6 +33,10 @@ Returns true if the string passed to this function is a syntactically correct do
     return false if domain.empty?
     return false if domain.length > domain_max_length
 
+    # The top level domain must be alphabetic if there are multiple labels.
+    # See rfc1123, 2.1
+    return false if domain.include? '.' and not /\.[A-Za-z]+$/.match(domain)
+
     # Check each label in the domain
     labels = domain.split('.')
     vlabels = labels.each do |label|
-- 
cgit v1.2.3


From a82266c256784c4af229e026b00a4dcf9e779270 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Mon, 26 Jan 2015 19:17:53 -0800
Subject: (MODULES-1715) Add fqdn_rand string generators

---
 lib/puppet/parser/functions/fqdn_rand_string.rb | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 lib/puppet/parser/functions/fqdn_rand_string.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rand_string.rb b/lib/puppet/parser/functions/fqdn_rand_string.rb
new file mode 100644
index 0000000..785c9fd
--- /dev/null
+++ b/lib/puppet/parser/functions/fqdn_rand_string.rb
@@ -0,0 +1,34 @@
+Puppet::Parser::Functions::newfunction(
+  :fqdn_rand_string,
+  :arity => -2,
+  :type => :rvalue,
+  :doc => "Usage: `fqdn_rand_string(LENGTH, [CHARSET], [SEED])`. LENGTH is
+  required and must be a positive integer. CHARSET is optional and may be
+  `undef` or a string. SEED is optional and may be any number or string.
+
+  Generates a random string LENGTH characters long using the character set
+  provided by CHARSET, combining the `$fqdn` fact and the value of SEED for
+  repeatable randomness. (That is, each node will get a different random
+  string from this function, but a given node's result will be the same every
+  time unless its hostname changes.) Adding a SEED can be useful if you need
+  more than one unrelated string. CHARSET will default to alphanumeric if
+  `undef` or an empty string.") do |args|
+    raise(ArgumentError, "fqdn_rand_string(): wrong number of arguments (0 for 1)") if args.size == 0
+    Puppet::Parser::Functions.function('is_integer')
+    raise(ArgumentError, "fqdn_rand_base64(): first argument must be a positive integer") unless function_is_integer([args[0]]) and args[0].to_i > 0
+    raise(ArgumentError, "fqdn_rand_base64(): second argument must be undef or a string") unless args[1].nil? or args[1].is_a? String
+
+    Puppet::Parser::Functions.function('fqdn_rand')
+
+    length = args.shift.to_i
+    charset = args.shift.to_s.chars.to_a
+
+    charset = (0..9).map { |i| i.to_s } + ('A'..'Z').to_a + ('a'..'z').to_a if charset.empty?
+
+    rand_string = ''
+    for current in 1..length
+      rand_string << charset[function_fqdn_rand([charset.size, (args + [current.to_s]).join(':')]).to_i]
+    end
+
+    rand_string
+end
-- 
cgit v1.2.3


From 23be4020ddd4f95dc589ecebe57cd1b27d85248b Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Mon, 2 Feb 2015 16:41:38 -0800
Subject: (MODULES-1737) Add pw_hash() function

---
 lib/puppet/parser/functions/pw_hash.rb | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 lib/puppet/parser/functions/pw_hash.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/pw_hash.rb b/lib/puppet/parser/functions/pw_hash.rb
new file mode 100644
index 0000000..ad3e393
--- /dev/null
+++ b/lib/puppet/parser/functions/pw_hash.rb
@@ -0,0 +1,56 @@
+Puppet::Parser::Functions::newfunction(
+  :pw_hash,
+  :type => :rvalue,
+  :arity => 3,
+  :doc => "Hashes a password using the crypt function. Provides a hash
+  usable on most POSIX systems.
+
+  The first argument to this function is the password to hash. If it is
+  undef or an empty string, this function returns undef.
+
+  The second argument to this function is which type of hash to use. It
+  will be converted into the appropriate crypt(3) hash specifier. Valid
+  hash types are:
+
+  |Hash type            |Specifier|
+  |---------------------|---------|
+  |MD5                  |1        |
+  |SHA-256              |5        |
+  |SHA-512 (recommended)|6        |
+
+  The third argument to this function is the salt to use.
+
+  Note: this uses the Puppet Master's implementation of crypt(3). If your
+  environment contains several different operating systems, ensure that they
+  are compatible before using this function.") do |args|
+    raise ArgumentError, "pw_hash(): wrong number of arguments (#{args.size} for 3)" if args.size != 3
+    raise ArgumentError, "pw_hash(): first argument must be a string" unless args[0].is_a? String or args[0].nil?
+    raise ArgumentError, "pw_hash(): second argument must be a string" unless args[1].is_a? String
+    hashes = { 'md5'     => '1',
+               'sha-256' => '5',
+               'sha-512' => '6' }
+    hash_type = hashes[args[1].downcase]
+    raise ArgumentError, "pw_hash(): #{args[1]} is not a valid hash type" if hash_type.nil?
+    raise ArgumentError, "pw_hash(): third argument must be a string" unless args[2].is_a? String
+    raise ArgumentError, "pw_hash(): third argument must not be empty" if args[2].empty?
+    raise ArgumentError, "pw_hash(): characters in salt must be in the set [a-zA-Z0-9./]" unless args[2].match(/\A[a-zA-Z0-9.\/]+\z/)
+
+    password = args[0]
+    return nil if password.nil? or password.empty?
+
+    # handle weak implementations of String#crypt
+    if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
+      # JRuby < 1.7.17
+      if RUBY_PLATFORM == 'java'
+        # override String#crypt for password variable
+        def password.crypt(salt)
+          # puppetserver bundles Apache Commons Codec
+          org.apache.commons.codec.digest.Crypt.crypt(self.to_java_bytes, salt)
+        end
+      else
+        # MS Windows and other systems that don't support enhanced salts
+        raise Puppet::ParseError, 'system does not support enhanced salts'
+      end
+    end
+    password.crypt("$#{hash_type}$#{args[2]}")
+end
-- 
cgit v1.2.3


From ee2225b63c4356dafffedc16ec0376af58d42dad Mon Sep 17 00:00:00 2001
From: Gerrard Geldenhuis <gerrard@puppetlabs.com>
Date: Fri, 24 Oct 2014 15:41:58 +0100
Subject: Clarifying behaviour of attributes and adding an extra example.

---
 lib/puppet/type/file_line.rb | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index df263e6..29f9538 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -3,9 +3,9 @@ Puppet::Type.newtype(:file_line) do
   desc <<-EOT
     Ensures that a given line is contained within a file.  The implementation
     matches the full line, including whitespace at the beginning and end.  If
-    the line is not contained in the given file, Puppet will add the line to
-    ensure the desired state.  Multiple resources may be declared to manage
-    multiple lines in the same file.
+    the line is not contained in the given file, Puppet will append the line to
+    the end of the file to ensure the desired state.  Multiple resources may 
+    be declared to manage multiple lines in the same file.
 
     Example:
 
@@ -13,6 +13,7 @@ Puppet::Type.newtype(:file_line) do
           path => '/etc/sudoers',
           line => '%sudo ALL=(ALL) ALL',
         }
+
         file_line { 'sudo_rule_nopw':
           path => '/etc/sudoers',
           line => '%sudonopw ALL=(ALL) NOPASSWD: ALL',
@@ -21,6 +22,18 @@ Puppet::Type.newtype(:file_line) do
     In this example, Puppet will ensure both of the specified lines are
     contained in the file /etc/sudoers.
 
+    Match Example:
+
+        file_line { 'bashrc_proxy':
+          ensure => present,
+          path   => '/etc/bashrc',
+          line   => 'export HTTP_PROXY=http://squid.puppetlabs.vm:3128',
+          match  => '^export\ HTTP_PROXY\=',
+        }
+
+    In this code example match will look for a line beginning with export 
+    followed by HTTP_PROXY and replace it with the value in line.
+
     **Autorequires:** If Puppet is managing the file that will contain the line
     being managed, the file_line resource will autorequire that file.
 
@@ -36,12 +49,15 @@ Puppet::Type.newtype(:file_line) do
   end
 
   newparam(:match) do
-    desc 'An optional regular expression to run against existing lines in the file;\n' +
-        'if a match is found, we replace that line rather than adding a new line.'
+    desc 'An optional ruby regular expression to run against existing lines in the file.' + 
+         ' If a match is found, we replace that line rather than adding a new line.' +
+         ' A regex comparisson is performed against the line value and if it does not' +
+         ' match an exception will be raised. '
   end
 
   newparam(:multiple) do
-    desc 'An optional value to determine if match can change multiple lines.'
+    desc 'An optional value to determine if match can change multiple lines.' +
+         ' If set to false, an exception will be raised if more than one line matches'
     newvalues(true, false)
   end
 
@@ -50,7 +66,7 @@ Puppet::Type.newtype(:file_line) do
   end
 
   newparam(:line) do
-    desc 'The line to be appended to the file located by the path parameter.'
+    desc 'The line to be appended to the file or used to replace matches found by the match attribute.'
   end
 
   newparam(:path) do
-- 
cgit v1.2.3


From 35303ce0f7cf66feb7499d9671a7d2121a0f52b1 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Thu, 9 Apr 2015 11:30:22 -0700
Subject: file_line honors after if match not found.

---
 lib/puppet/provider/file_line/ruby.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index ae1a8b3..a1acab8 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -34,13 +34,22 @@ Puppet::Type.type(:file_line).provide(:ruby) do
 
   def handle_create_with_match()
     regex = resource[:match] ? Regexp.new(resource[:match]) : nil
+    regex_after = resource[:after] ? Regexp.new(resource[:after]) : nil
     match_count = count_matches(regex)
+
     if match_count > 1 && resource[:multiple].to_s != 'true'
      raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
     end
+
     File.open(resource[:path], 'w') do |fh|
       lines.each do |l|
         fh.puts(regex.match(l) ? resource[:line] : l)
+        if (match_count == 0 and regex_after)
+          if regex_after.match(l)
+            fh.puts(resource[:line])
+            match_count += 1 #Increment match_count to indicate that the new line has been inserted.
+          end
+        end
       end
 
       if (match_count == 0)
-- 
cgit v1.2.3


From 0af0d7e5392a69f0ed72fa1b0225fe2a61188319 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 9 Apr 2015 11:02:29 -0700
Subject: Add spec tests and pulled in PR #427 Changed append line to open in
 'w' mode and have to rewrite lines in order to append new line

---
 lib/puppet/provider/file_line/ruby.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index a1acab8..e7854f0 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -87,7 +87,10 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   #
   # @api private
   def append_line
-    File.open(resource[:path], 'a') do |fh|
+    File.open(resource[:path], 'w') do |fh|
+      lines.each do |l|
+        fh.puts(l)
+      end
       fh.puts resource[:line]
     end
   end
-- 
cgit v1.2.3


From c27513463d9b0a59cda1287273621fc4e158a486 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Fri, 17 Apr 2015 14:24:40 -0700
Subject: fqdn_rand_string: fix argument error message

---
 lib/puppet/parser/functions/fqdn_rand_string.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rand_string.rb b/lib/puppet/parser/functions/fqdn_rand_string.rb
index 785c9fd..2bb1287 100644
--- a/lib/puppet/parser/functions/fqdn_rand_string.rb
+++ b/lib/puppet/parser/functions/fqdn_rand_string.rb
@@ -15,8 +15,8 @@ Puppet::Parser::Functions::newfunction(
   `undef` or an empty string.") do |args|
     raise(ArgumentError, "fqdn_rand_string(): wrong number of arguments (0 for 1)") if args.size == 0
     Puppet::Parser::Functions.function('is_integer')
-    raise(ArgumentError, "fqdn_rand_base64(): first argument must be a positive integer") unless function_is_integer([args[0]]) and args[0].to_i > 0
-    raise(ArgumentError, "fqdn_rand_base64(): second argument must be undef or a string") unless args[1].nil? or args[1].is_a? String
+    raise(ArgumentError, "fqdn_rand_string(): first argument must be a positive integer") unless function_is_integer([args[0]]) and args[0].to_i > 0
+    raise(ArgumentError, "fqdn_rand_string(): second argument must be undef or a string") unless args[1].nil? or args[1].is_a? String
 
     Puppet::Parser::Functions.function('fqdn_rand')
 
-- 
cgit v1.2.3


From 9bae8356fded9d1c7aaea96cba246709bfe1a516 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 22 Apr 2015 16:04:00 -0700
Subject: pw_hash: avoid ruby magic when running on java

---
 lib/puppet/parser/functions/pw_hash.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/pw_hash.rb b/lib/puppet/parser/functions/pw_hash.rb
index ad3e393..4682a63 100644
--- a/lib/puppet/parser/functions/pw_hash.rb
+++ b/lib/puppet/parser/functions/pw_hash.rb
@@ -42,15 +42,13 @@ Puppet::Parser::Functions::newfunction(
     if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
       # JRuby < 1.7.17
       if RUBY_PLATFORM == 'java'
-        # override String#crypt for password variable
-        def password.crypt(salt)
-          # puppetserver bundles Apache Commons Codec
-          org.apache.commons.codec.digest.Crypt.crypt(self.to_java_bytes, salt)
-        end
+        # puppetserver bundles Apache Commons Codec
+        org.apache.commons.codec.digest.Crypt.crypt(password.to_java_bytes, salt)
       else
         # MS Windows and other systems that don't support enhanced salts
         raise Puppet::ParseError, 'system does not support enhanced salts'
       end
+    else
+      password.crypt("$#{hash_type}$#{args[2]}")
     end
-    password.crypt("$#{hash_type}$#{args[2]}")
 end
-- 
cgit v1.2.3


From 063c58a992c1b5441b7e7b2a2e4886531035bb25 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 22 Apr 2015 16:21:21 -0700
Subject: range: remove dead code

Since a ParseError is always thrown for zero arguments, the if and all
dependent code can be removed.
---
 lib/puppet/parser/functions/range.rb | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 49fba21..16d189f 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -41,29 +41,9 @@ Will return: [0,2,4,6,8]
     raise(Puppet::ParseError, "range(): Wrong number of " +
       "arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
-    if arguments.size > 1
-      start = arguments[0]
-      stop  = arguments[1]
-      step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
-
-      type = '..' # We select simplest type for Range available in Ruby ...
-
-    elsif arguments.size > 0
-      value = arguments[0]
-
-      if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
-        start = m[1]
-        stop  = m[3]
-
-        type = m[2]
-
-      elsif value.match(/^.+$/)
-        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
-          'from the value given')
-      else
-        raise(Puppet::ParseError, 'range(): Unknown format of range given')
-      end
-    end
+    start = arguments[0]
+    stop  = arguments[1]
+    step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
 
     # Check whether we have integer value if so then make it so ...
     if start.to_s.match(/^\d+$/)
@@ -74,14 +54,10 @@ Will return: [0,2,4,6,8]
       stop  = stop.to_s
     end
 
-    range = case type
-      when /^(\.\.|\-)$/ then (start .. stop)
-      when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-    end
-
-    result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
+    # We select simplest type for Range available in Ruby ...
+    range = (start .. stop)
 
-    return result
+    range.step(step).collect { |i| i } # Get them all ... Pokemon ...
   end
 end
 
-- 
cgit v1.2.3


From d4f3d57f1678ae03a58a17181f863c44c248f09b Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 29 Apr 2015 12:13:08 +0100
Subject: validate_augeas: fix URL to docs

---
 lib/puppet/parser/functions/validate_augeas.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_augeas.rb b/lib/puppet/parser/functions/validate_augeas.rb
index 4ea4fe0..2196c3e 100644
--- a/lib/puppet/parser/functions/validate_augeas.rb
+++ b/lib/puppet/parser/functions/validate_augeas.rb
@@ -31,7 +31,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
     unless Puppet.features.augeas?
-      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Augeas#Pre-requisites for how to activate it.")
+      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://docs.puppetlabs.com/guides/augeas.html#pre-requisites for how to activate it.")
     end
 
     if (args.length < 2) or (args.length > 4) then
-- 
cgit v1.2.3


From 7d7e905b543448f5d37d13c9e1a03d1e0be307fe Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Tue, 5 May 2015 15:16:35 -0700
Subject: pw_hash: Fix functionality on JRuby < 1.7.17

The previous change to this function broke it on JRuby before 1.7.17 by
attempting to use a variable that wasn't defined (`salt`). To fix this,
define `salt` ahead of time and use that instead of building the salt
later.

cf. https://github.com/puppetlabs/puppetlabs-stdlib/pull/443#discussion_r29718588
---
 lib/puppet/parser/functions/pw_hash.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/pw_hash.rb b/lib/puppet/parser/functions/pw_hash.rb
index 4682a63..41d4223 100644
--- a/lib/puppet/parser/functions/pw_hash.rb
+++ b/lib/puppet/parser/functions/pw_hash.rb
@@ -38,6 +38,8 @@ Puppet::Parser::Functions::newfunction(
     password = args[0]
     return nil if password.nil? or password.empty?
 
+    salt = "$#{hash_type}$#{args[2]}"
+
     # handle weak implementations of String#crypt
     if 'test'.crypt('$1$1') != '$1$1$Bp8CU9Oujr9SSEw53WV6G.'
       # JRuby < 1.7.17
@@ -49,6 +51,6 @@ Puppet::Parser::Functions::newfunction(
         raise Puppet::ParseError, 'system does not support enhanced salts'
       end
     else
-      password.crypt("$#{hash_type}$#{args[2]}")
+      password.crypt(salt)
     end
 end
-- 
cgit v1.2.3


From 8cf011d7a27d696ebfac728cafc4f26e6d009fdd Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Tue, 5 May 2015 15:44:08 -0700
Subject: Revert "range: remove dead code"

This reverts commit 063c58a992c1b5441b7e7b2a2e4886531035bb25, which
actually removed non-dead code. Specifically, it removed the ability to
make calls such as `range('2..3')`, `range('2...3')`, and
`range('2-3')`.

cf. https://github.com/puppetlabs/puppetlabs-stdlib/pull/443#commitcomment-11055565
---
 lib/puppet/parser/functions/range.rb | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 16d189f..49fba21 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -41,9 +41,29 @@ Will return: [0,2,4,6,8]
     raise(Puppet::ParseError, "range(): Wrong number of " +
       "arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
-    start = arguments[0]
-    stop  = arguments[1]
-    step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
+    if arguments.size > 1
+      start = arguments[0]
+      stop  = arguments[1]
+      step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
+
+      type = '..' # We select simplest type for Range available in Ruby ...
+
+    elsif arguments.size > 0
+      value = arguments[0]
+
+      if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
+        start = m[1]
+        stop  = m[3]
+
+        type = m[2]
+
+      elsif value.match(/^.+$/)
+        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
+          'from the value given')
+      else
+        raise(Puppet::ParseError, 'range(): Unknown format of range given')
+      end
+    end
 
     # Check whether we have integer value if so then make it so ...
     if start.to_s.match(/^\d+$/)
@@ -54,10 +74,14 @@ Will return: [0,2,4,6,8]
       stop  = stop.to_s
     end
 
-    # We select simplest type for Range available in Ruby ...
-    range = (start .. stop)
+    range = case type
+      when /^(\.\.|\-)$/ then (start .. stop)
+      when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
+    end
+
+    result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
 
-    range.step(step).collect { |i| i } # Get them all ... Pokemon ...
+    return result
   end
 end
 
-- 
cgit v1.2.3


From 25ed4b43c41324902e50d21eb98b5fa0db511b96 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Tue, 5 May 2015 15:52:31 -0700
Subject: range: Clean up and clarify function contents

---
 lib/puppet/parser/functions/range.rb | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 49fba21..c14f6e6 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -37,18 +37,17 @@ Will return: [0,2,4,6,8]
     EOS
   ) do |arguments|
 
-    # We support more than one argument but at least one is mandatory ...
-    raise(Puppet::ParseError, "range(): Wrong number of " +
-      "arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, 'range(): Wrong number of ' +
+      'arguments given (0 for 1)') if arguments.size == 0
 
     if arguments.size > 1
       start = arguments[0]
       stop  = arguments[1]
       step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
 
-      type = '..' # We select simplest type for Range available in Ruby ...
+      type = '..' # Use the simplest type of Range available in Ruby
 
-    elsif arguments.size > 0
+    else # arguments.size == 0
       value = arguments[0]
 
       if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
@@ -58,14 +57,14 @@ Will return: [0,2,4,6,8]
         type = m[2]
 
       elsif value.match(/^.+$/)
-        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
-          'from the value given')
+        raise(Puppet::ParseError, "range(): Unable to compute range " +
+          "from the value: #{value}")
       else
-        raise(Puppet::ParseError, 'range(): Unknown format of range given')
+        raise(Puppet::ParseError, "range(): Unknown range format: #{value}")
       end
     end
 
-    # Check whether we have integer value if so then make it so ...
+    # If we were given an integer, ensure we work with one
     if start.to_s.match(/^\d+$/)
       start = start.to_i
       stop  = stop.to_i
@@ -76,10 +75,10 @@ Will return: [0,2,4,6,8]
 
     range = case type
       when /^(\.\.|\-)$/ then (start .. stop)
-      when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
+      when '...'         then (start ... stop) # Exclusive of last element
     end
 
-    result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
+    result = range.step(step).collect { |i| i }
 
     return result
   end
-- 
cgit v1.2.3


From f49eb6b8e20a8517916d984d1606daaabbba9a23 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 6 May 2015 10:13:27 +0100
Subject: range(): fix TypeError(can't convert nil into Integer) when using
 range syntax

---
 lib/puppet/parser/functions/range.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index c14f6e6..2fc2113 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -47,7 +47,7 @@ Will return: [0,2,4,6,8]
 
       type = '..' # Use the simplest type of Range available in Ruby
 
-    else # arguments.size == 0
+    else # arguments.size == 1
       value = arguments[0]
 
       if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
@@ -55,7 +55,7 @@ Will return: [0,2,4,6,8]
         stop  = m[3]
 
         type = m[2]
-
+        step = 1
       elsif value.match(/^.+$/)
         raise(Puppet::ParseError, "range(): Unable to compute range " +
           "from the value: #{value}")
@@ -78,7 +78,7 @@ Will return: [0,2,4,6,8]
       when '...'         then (start ... stop) # Exclusive of last element
     end
 
-    result = range.step(step).collect { |i| i }
+    result = range.step(step).to_a
 
     return result
   end
-- 
cgit v1.2.3


From 3b8ded184d6b6b5c2823018a231deee9dcd7df83 Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Mon, 11 May 2015 11:12:15 -0700
Subject: (FM-2130) Document new location of facts.d cache

---
 lib/facter/facter_dot_d.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb
index b058437..d85940d 100644
--- a/lib/facter/facter_dot_d.rb
+++ b/lib/facter/facter_dot_d.rb
@@ -8,7 +8,7 @@
 # contains a cache TTL.  For foo.sh store the ttl as just
 # a number in foo.sh.ttl
 #
-# The cache is stored in /tmp/facts_cache.yaml as a mode
+# The cache is stored in $libdir/facts_dot_d.cache as a mode
 # 600 file and will have the end result of not calling your
 # fact scripts more often than is needed
 
-- 
cgit v1.2.3


From 0dc0e0dbcf9574ed1515cf6cfe2800f06d8c1d0e Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 12 May 2015 15:01:55 +0100
Subject: fqdn_rotate: reset srand seed correctly on old ruby versions

Without this, the global seed is reseeded on every use
of fqdn_rotate, which is a waste. Older rubies might even use a
time-base seed which adversly impacts the quality of the RNG.
---
 lib/puppet/parser/functions/fqdn_rotate.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rotate.rb b/lib/puppet/parser/functions/fqdn_rotate.rb
index cf22d36..d9741a0 100644
--- a/lib/puppet/parser/functions/fqdn_rotate.rb
+++ b/lib/puppet/parser/functions/fqdn_rotate.rb
@@ -39,9 +39,9 @@ Rotates an array a random number of times based on a nodes fqdn.
       if defined?(Random) == 'constant' && Random.class == Class
         offset = Random.new(seed).rand(elements)
       else
-        srand(seed)
+        old_seed = srand(seed)
         offset = rand(elements)
-        srand()
+        srand(old_seed)
       end
     end
     offset.times {
-- 
cgit v1.2.3


From cf9f7a6b7e4ede7edd612fde33f7149f9c7f3385 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Wed, 27 May 2015 20:05:01 +0100
Subject: validate_integer, validate_numeric: explicitely reject hashes in
 arrays

Without this patch, Ruby 1.8's Hash#to_s behaviour causes [{1=>2}] to be
treated as "12" when validating values.
---
 lib/puppet/parser/functions/validate_integer.rb | 1 +
 lib/puppet/parser/functions/validate_numeric.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
index 995f8db..95da0c4 100644
--- a/lib/puppet/parser/functions/validate_integer.rb
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -109,6 +109,7 @@ module Puppet::Parser::Functions
       # check every element of the array
       input.each_with_index do |arg, pos|
         begin
+          raise TypeError if arg.is_a?(Hash)
           arg = Integer(arg.to_s)
           validator.call(arg)
         rescue TypeError, ArgumentError
diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb
index d2e4d16..3a14443 100644
--- a/lib/puppet/parser/functions/validate_numeric.rb
+++ b/lib/puppet/parser/functions/validate_numeric.rb
@@ -71,6 +71,7 @@ module Puppet::Parser::Functions
       # check every element of the array
       input.each_with_index do |arg, pos|
         begin
+          raise TypeError if arg.is_a?(Hash)
           arg = Float(arg.to_s)
           validator.call(arg)
         rescue TypeError, ArgumentError
-- 
cgit v1.2.3


From 72089f3d134a00e64f0b3d81237a266131d40412 Mon Sep 17 00:00:00 2001
From: Raymond Maika <raymond.maika@cengn.ca>
Date: Fri, 29 May 2015 00:27:08 -0400
Subject:  (MODULES-2071) Refactor file_line provider to contain logic to
 handle parameter multiple in function handle_create_with_after

Without this, file_line resource without the `match` parameter but with the `after` param will throw an error if there are multiple matches for the after expression. This patch creates the handling for the `multiple` parameter in handle_create_with_after. This allows you to add a line after the `after` expression if it appears at multiple points in a file.

Updated reference to `file_line` in the README to reflect that the multiple parameter can be set when using `after` and/or `match` as the matching regex.
---
 lib/puppet/provider/file_line/ruby.rb | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index e7854f0..c58e27e 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -61,20 +61,22 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   def handle_create_with_after
     regex = Regexp.new(resource[:after])
     count = count_matches(regex)
-    case count
-    when 1 # find the line to put our line after
-      File.open(resource[:path], 'w') do |fh|
-        lines.each do |l|
-          fh.puts(l)
-          if regex.match(l) then
-            fh.puts(resource[:line])
-          end
+
+    if count > 1 && resource[:multiple].to_s != 'true'
+      raise Puppet::Error, "#{count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'.  One or no line must match the pattern."
+    end
+
+    File.open(resource[:path], 'w') do |fh|
+      lines.each do |l|
+        fh.puts(l)
+        if regex.match(l) then
+          fh.puts(resource[:line])
         end
       end
-    when 0 # append the line to the end of the file
+    end
+
+    if (count == 0) # append the line to the end of the file
       append_line
-    else
-      raise Puppet::Error, "#{count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'.  One or no line must match the pattern."
     end
   end
 
-- 
cgit v1.2.3


From 687600c30cb4279c36215517c02ee8e5e7c0d3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gali=C4=87?= <i.galic@brainsware.org>
Date: Fri, 29 May 2015 20:13:21 +0200
Subject: simplify mac address regex

let the computer do the counting and repetition and case
---
 lib/puppet/parser/functions/is_mac_address.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_mac_address.rb b/lib/puppet/parser/functions/is_mac_address.rb
index 1b3088a..2619d44 100644
--- a/lib/puppet/parser/functions/is_mac_address.rb
+++ b/lib/puppet/parser/functions/is_mac_address.rb
@@ -15,7 +15,7 @@ Returns true if the string passed to this function is a valid mac address.
 
     mac = arguments[0]
 
-    if /^[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}$/.match(mac) then
+    if /^[a-f0-9]{1,2}(:[a-f0-9]{1,2}){5}$/i.match(mac) then
       return true
     else
       return false
-- 
cgit v1.2.3


From f3e79ddcd56a221c7799b35efde7e9803a5c7923 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Mon, 1 Jun 2015 12:21:59 +0100
Subject: Convert tests to use plain rspec-puppet

Tests in the new style produces the following documentation output:

abs
  should not eq nil
  should run abs() and raise an Puppet::ParseError
  should run abs(-34) and return 34
  should run abs("-34") and return 34
  should run abs(34) and return 34
  should run abs("34") and return 34
---
 lib/puppet/parser/functions/member.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/member.rb b/lib/puppet/parser/functions/member.rb
index 88609ce..1e5b3de 100644
--- a/lib/puppet/parser/functions/member.rb
+++ b/lib/puppet/parser/functions/member.rb
@@ -44,7 +44,7 @@ would return: false
     end
 
     if arguments[1].is_a? String or arguments[1].is_a? Fixnum
-      item = Array(arguments[1])
+      item = [arguments[1]]
     else
       item = arguments[1]
     end
-- 
cgit v1.2.3


From 601f681787c8d6c02bb3566b8cefde289377be0e Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Thu, 28 May 2015 18:15:05 -0700
Subject: fqdn_rotate: Don't use the value itself as part of the random seed

Previously, the random number generator was seeded with the array or
string to be rotated in addition to any values specifically provided for
seeding. This behavior is potentially insecure in that it allows an
attacker who can modify the source data to choose the post-shuffle
order.
---
 lib/puppet/parser/functions/fqdn_rotate.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rotate.rb b/lib/puppet/parser/functions/fqdn_rotate.rb
index d9741a0..e1a50e6 100644
--- a/lib/puppet/parser/functions/fqdn_rotate.rb
+++ b/lib/puppet/parser/functions/fqdn_rotate.rb
@@ -11,7 +11,7 @@ Rotates an array a random number of times based on a nodes fqdn.
     raise(Puppet::ParseError, "fqdn_rotate(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
-    value = arguments[0]
+    value = arguments.shift
     require 'digest/md5'
 
     unless value.is_a?(Array) || value.is_a?(String)
-- 
cgit v1.2.3


From d7c846035321774e824e3424f59cb24703fcfb2a Mon Sep 17 00:00:00 2001
From: Eli Young <elyscape@gmail.com>
Date: Mon, 1 Jun 2015 16:09:47 -0700
Subject: fqdn_rotate: Improve documentation

---
 lib/puppet/parser/functions/fqdn_rotate.rb | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_rotate.rb b/lib/puppet/parser/functions/fqdn_rotate.rb
index e1a50e6..b66431d 100644
--- a/lib/puppet/parser/functions/fqdn_rotate.rb
+++ b/lib/puppet/parser/functions/fqdn_rotate.rb
@@ -2,16 +2,23 @@
 # fqdn_rotate.rb
 #
 
-module Puppet::Parser::Functions
-  newfunction(:fqdn_rotate, :type => :rvalue, :doc => <<-EOS
-Rotates an array a random number of times based on a nodes fqdn.
-    EOS
-  ) do |arguments|
+Puppet::Parser::Functions.newfunction(
+  :fqdn_rotate,
+  :type => :rvalue,
+  :doc => "Usage: `fqdn_rotate(VALUE, [SEED])`. VALUE is required and
+  must be an array or a string. SEED is optional and may be any number
+  or string.
+
+  Rotates VALUE a random number of times, combining the `$fqdn` fact and
+  the value of SEED for repeatable randomness. (That is, each node will
+  get a different random rotation from this function, but a given node's
+  result will be the same every time unless its hostname changes.) Adding
+  a SEED can be useful if you need more than one unrelated rotation.") do |args|
 
     raise(Puppet::ParseError, "fqdn_rotate(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+      "given (#{args.size} for 1)") if args.size < 1
 
-    value = arguments.shift
+    value = args.shift
     require 'digest/md5'
 
     unless value.is_a?(Array) || value.is_a?(String)
@@ -31,7 +38,7 @@ Rotates an array a random number of times based on a nodes fqdn.
 
     elements = result.size
 
-    seed = Digest::MD5.hexdigest([lookupvar('::fqdn'),arguments].join(':')).hex
+    seed = Digest::MD5.hexdigest([lookupvar('::fqdn'),args].join(':')).hex
     # deterministic_rand() was added in Puppet 3.2.0; reimplement if necessary
     if Puppet::Util.respond_to?(:deterministic_rand)
       offset = Puppet::Util.deterministic_rand(seed, elements).to_i
@@ -51,7 +58,6 @@ Rotates an array a random number of times based on a nodes fqdn.
     result = string ? result.join : result
 
     return result
-  end
 end
 
 # vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From ad4ca4cc3486b0eaaa813595907521ce35c970ce Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Thu, 4 Jun 2015 09:40:52 -0700
Subject: Fix time() on 1.8.7

The time() function takes an argument of a timezone, and always returns
time in epoch format. The epoch format is the number of seconds that
have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
seconds. This means that it is universally the same regardless of
timezones.

I don't know what the timezone argument is supposed to do, and it is not
documented. So lets just make 1.8.7 work like > 1.8.7
---
 lib/puppet/parser/functions/time.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/time.rb b/lib/puppet/parser/functions/time.rb
index 0cddaf8..c574747 100644
--- a/lib/puppet/parser/functions/time.rb
+++ b/lib/puppet/parser/functions/time.rb
@@ -33,13 +33,14 @@ Will return something like: 1311972653
 
       ENV['TZ'] = time_zone
 
-      time = local_time.localtime
+      result = local_time.localtime.strftime('%s')
 
       ENV['TZ'] = original_zone
+    else
+      result = time.localtime.strftime('%s')
     end
 
     # Calling Time#to_i on a receiver changes it.  Trust me I am the Doctor.
-    result = time.strftime('%s')
     result = result.to_i
 
     return result
-- 
cgit v1.2.3


From 212c498df32bf14879deac77b2ae7dca927a3c39 Mon Sep 17 00:00:00 2001
From: Tomas Doran <tdoran@yelp.com>
Date: Fri, 5 Jun 2015 12:40:46 +0100
Subject: Also catch :undefined_variable as thrown by future parser

---
 lib/puppet/parser/functions/getvar.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/getvar.rb b/lib/puppet/parser/functions/getvar.rb
index fb336b6..ae9c869 100644
--- a/lib/puppet/parser/functions/getvar.rb
+++ b/lib/puppet/parser/functions/getvar.rb
@@ -20,7 +20,9 @@ module Puppet::Parser::Functions
     end
 
     begin
-      self.lookupvar("#{args[0]}")
+      catch(:undefined_variable) do
+        self.lookupvar("#{args[0]}")
+      end
     rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end
 
-- 
cgit v1.2.3


From e96a818782c944b4b1af5417d0bcffc08e95aadc Mon Sep 17 00:00:00 2001
From: Mathias Klette <mathias.klette@magicinternet.de>
Date: Wed, 24 Jun 2015 14:58:48 +0200
Subject: catch and rescue from looking up non-existent facts when looking for
 'kind'

facter (2.x) only provides facts without interface suffix for
 * ipaddress
 * netmask

'macaddress' and 'network' facts will always have the related interface
name appended. in turns lookupvar throws errors when strict_variables is
enabled.
---
 lib/puppet/parser/functions/has_interface_with.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/has_interface_with.rb b/lib/puppet/parser/functions/has_interface_with.rb
index 3691524..e762798 100644
--- a/lib/puppet/parser/functions/has_interface_with.rb
+++ b/lib/puppet/parser/functions/has_interface_with.rb
@@ -38,8 +38,11 @@ has_interface_with("lo")                        => true
     # Bug with 3.7.1 - 3.7.3  when using future parser throws :undefined_variable
     # https://tickets.puppetlabs.com/browse/PUP-3597
     factval = nil
-    catch :undefined_variable do
-      factval = lookupvar(kind)
+    begin
+      catch :undefined_variable do
+        factval = lookupvar(kind)
+      end
+    rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end
     if factval == value
       return true
-- 
cgit v1.2.3


From c64ecfb0c39b633675269ab02f323f7eb486dad4 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Mon, 6 Jul 2015 17:03:49 +0100
Subject: Add validate_slength's optional 3rd arg to README

---
 lib/puppet/parser/functions/validate_slength.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_slength.rb b/lib/puppet/parser/functions/validate_slength.rb
index 7d534f3..47c7d4a 100644
--- a/lib/puppet/parser/functions/validate_slength.rb
+++ b/lib/puppet/parser/functions/validate_slength.rb
@@ -3,7 +3,7 @@ module Puppet::Parser::Functions
   newfunction(:validate_slength, :doc => <<-'ENDHEREDOC') do |args|
     Validate that the first argument is a string (or an array of strings), and
     less/equal to than the length of the second argument. An optional third
-    parameter can be given a the minimum length. It fails if the first
+    parameter can be given the minimum length. It fails if the first
     argument is not a string or array of strings, and if arg 2 and arg 3 are
     not convertable to a number.
 
@@ -43,9 +43,7 @@ module Puppet::Parser::Functions
       min_length = 0
     end
 
-    if min_length > max_length
-      raise Puppet::ParseError, "validate_slength(): Expected second argument to be larger than third argument"
-    end
+    raise Puppet::ParseError, "validate_slength(): Expected second argument to be equal to or larger than third argument" unless max_length >= min_length
 
     validator = lambda do |str|
       unless str.length <= max_length and str.length >= min_length
-- 
cgit v1.2.3


From 939aceffad5c9eafbab336e4e5e7477a97154e41 Mon Sep 17 00:00:00 2001
From: Dan Offord <dan.offord@multiplay.co.uk>
Date: Mon, 20 Jul 2015 17:55:52 +0100
Subject: Fix documentation error in upcase

The documentation example shows an incorrect response when using the
function, this PR corrects the example to agree with what the function
actually does.
---
 lib/puppet/parser/functions/upcase.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
index 0226a88..44b3bcd 100644
--- a/lib/puppet/parser/functions/upcase.rb
+++ b/lib/puppet/parser/functions/upcase.rb
@@ -12,7 +12,7 @@ Converts a string or an array of strings to uppercase.
 
 Will return:
 
-    ASDF
+    ABCD
   EOS
   ) do |arguments|
 
-- 
cgit v1.2.3


From 5c79107863a42a9d347637146f0c0f728f9b92ad Mon Sep 17 00:00:00 2001
From: gcmalloc <gcmalloc@gmail.com>
Date: Tue, 21 Jul 2015 19:25:27 +0200
Subject: adding support for hash in the size function

---
 lib/puppet/parser/functions/size.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/size.rb b/lib/puppet/parser/functions/size.rb
index cc207e3..0d6cc96 100644
--- a/lib/puppet/parser/functions/size.rb
+++ b/lib/puppet/parser/functions/size.rb
@@ -2,11 +2,9 @@
 # size.rb
 #
 
-# TODO(Krzysztof Wilczynski): Support for hashes would be nice too ...
-
 module Puppet::Parser::Functions
   newfunction(:size, :type => :rvalue, :doc => <<-EOS
-Returns the number of elements in a string or array.
+Returns the number of elements in a string, an array or a hash
     EOS
   ) do |arguments|
 
@@ -29,13 +27,13 @@ Returns the number of elements in a string or array.
         Float(item)
 
         raise(Puppet::ParseError, 'size(): Requires either ' +
-          'string or array to work with')
+          'string, array or hash to work with')
 
       rescue ArgumentError
         result = item.size
       end
 
-    elsif item.is_a?(Array)
+    elsif item.is_a?(Array) || item.is_a?(Hash)
       result = item.size
     else
       raise(Puppet::ParseError, 'size(): Unknown type given')
-- 
cgit v1.2.3


From 35e92645f727f02ef9ace8948154079bc0fff05a Mon Sep 17 00:00:00 2001
From: Raymond Maika <rmaika@patientway.com>
Date: Thu, 30 Jul 2015 14:05:39 -0400
Subject: (MODULES-2024) Adding replace attribute to file_line

---
 lib/puppet/provider/file_line/ruby.rb | 31 ++++++++++++++++++++-----------
 lib/puppet/type/file_line.rb          |  6 ++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index c58e27e..ea1d44d 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -1,17 +1,23 @@
 Puppet::Type.type(:file_line).provide(:ruby) do
   def exists?
-    lines.find do |line|
-      line.chomp == resource[:line].chomp
+    if !resource[:replace] and count_matches(match_regex) > 0
+      true
+    else
+      lines.find do |line|
+        line.chomp == resource[:line].chomp
+      end
     end
   end
 
   def create
-    if resource[:match]
-      handle_create_with_match
-    elsif resource[:after]
-      handle_create_with_after
-    else
-      append_line
+    unless !resource[:replace] and count_matches(match_regex) > 0
+      if resource[:match]
+        handle_create_with_match
+      elsif resource[:after]
+        handle_create_with_after
+      else
+        append_line
+      end
     end
   end
 
@@ -32,10 +38,13 @@ Puppet::Type.type(:file_line).provide(:ruby) do
     @lines ||= File.readlines(resource[:path])
   end
 
+  def match_regex
+    resource[:match] ? Regexp.new(resource[:match]) : nil
+  end
+
   def handle_create_with_match()
-    regex = resource[:match] ? Regexp.new(resource[:match]) : nil
     regex_after = resource[:after] ? Regexp.new(resource[:after]) : nil
-    match_count = count_matches(regex)
+    match_count = count_matches(match_regex)
 
     if match_count > 1 && resource[:multiple].to_s != 'true'
      raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
@@ -43,7 +52,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
 
     File.open(resource[:path], 'w') do |fh|
       lines.each do |l|
-        fh.puts(regex.match(l) ? resource[:line] : l)
+        fh.puts(match_regex.match(l) ? resource[:line] : l)
         if (match_count == 0 and regex_after)
           if regex_after.match(l)
             fh.puts(resource[:line])
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 29f9538..190105c 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -1,3 +1,4 @@
+require 'puppet/parameter/boolean'
 Puppet::Type.newtype(:file_line) do
 
   desc <<-EOT
@@ -78,6 +79,11 @@ Puppet::Type.newtype(:file_line) do
     end
   end
 
+  newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do
+    desc 'If true, replace line that matches. If false, do not write line if a match is found'
+    defaultto true
+  end
+
   # Autorequire the file resource if it's being managed
   autorequire(:file) do
     self[:path]
-- 
cgit v1.2.3


From aca29129cb0fada02cd4590eba30b560dc08ac64 Mon Sep 17 00:00:00 2001
From: Zee Alexander <zee@zee.space>
Date: Thu, 30 Jul 2015 15:11:26 -0700
Subject: Remove colorful language from module.

---
 lib/puppet/parser/functions/validate_integer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
index 95da0c4..a950916 100644
--- a/lib/puppet/parser/functions/validate_integer.rb
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -49,7 +49,7 @@ module Puppet::Parser::Functions
 
     Plus all of the above, but any combination of values passed as strings ('false' or "false").
     Plus all of the above, but with incorrect combinations of negative integer values.
-    Plus all of the above, but with non-integer crap in arrays or maximum / minimum argument.
+    Plus all of the above, but with non-integer items in arrays or maximum / minimum argument.
 
     ENDHEREDOC
 
-- 
cgit v1.2.3


From f411ee7119cab1277baffee2fe2b2f978f402072 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Thu, 9 Jul 2015 10:53:56 -0700
Subject: Add load_metadata_json function

This function loads the metadata.json into a puppet variable. This enables a number of neat things such as:

* Which version of the module am I using? 2.x? 3.x?
* Which author of the module am I using? puppetlabs? example42?
---
 lib/puppet/parser/functions/load_module_metadata.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 lib/puppet/parser/functions/load_module_metadata.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/load_module_metadata.rb b/lib/puppet/parser/functions/load_module_metadata.rb
new file mode 100644
index 0000000..0664a23
--- /dev/null
+++ b/lib/puppet/parser/functions/load_module_metadata.rb
@@ -0,0 +1,16 @@
+module Puppet::Parser::Functions
+  newfunction(:load_module_metadata, :type => :rvalue, :doc => <<-EOT
+  EOT
+  ) do |args|
+    raise(Puppet::ParseError, "load_module_metadata(): Wrong number of arguments, expects one") unless args.size == 1
+    mod = args[0]
+    module_path = function_get_module_path([mod])
+    metadata_json = File.join(module_path, 'metadata.json')
+
+    raise(Puppet::ParseError, "load_module_metadata(): No metadata.json file for module #{mod}") unless File.exists?(metadata_json)
+
+    metadata = PSON.load(File.read(metadata_json))
+
+    return metadata
+  end
+end
-- 
cgit v1.2.3


From a7adcda803abe82e6a16e2410c10d58abedbd82d Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal@redhat.com>
Date: Tue, 4 Aug 2015 09:59:53 +0100
Subject: (MODULES-2316) Change file_type boolean parameter to symbols

Puppet's boolean parameter type is only available in Puppet 3.3 and
higher, so change file_type's new "replace" parameter to a regular
parameter with true and false as possible values.  This matches the
existing "multiple" parameter.
---
 lib/puppet/provider/file_line/ruby.rb | 4 ++--
 lib/puppet/type/file_line.rb          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index ea1d44d..d4cdfec 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -1,6 +1,6 @@
 Puppet::Type.type(:file_line).provide(:ruby) do
   def exists?
-    if !resource[:replace] and count_matches(match_regex) > 0
+    if resource[:replace].to_s != 'true' and count_matches(match_regex) > 0
       true
     else
       lines.find do |line|
@@ -10,7 +10,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   end
 
   def create
-    unless !resource[:replace] and count_matches(match_regex) > 0
+    unless resource[:replace].to_s != 'true' and count_matches(match_regex) > 0
       if resource[:match]
         handle_create_with_match
       elsif resource[:after]
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 190105c..4a96ba7 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -1,4 +1,3 @@
-require 'puppet/parameter/boolean'
 Puppet::Type.newtype(:file_line) do
 
   desc <<-EOT
@@ -79,8 +78,9 @@ Puppet::Type.newtype(:file_line) do
     end
   end
 
-  newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do
+  newparam(:replace) do
     desc 'If true, replace line that matches. If false, do not write line if a match is found'
+    newvalues(true, false)
     defaultto true
   end
 
-- 
cgit v1.2.3


From 9bacf14ca24283a94883523064603babcd7046d3 Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@oracle.com>
Date: Thu, 6 Aug 2015 13:00:11 -0700
Subject: allow `match` parameter to influence `ensure => absent` behavior.

Split the `destroy` method of the file_type::ruby provider into two
private methods:  `handle_destroy_line` which is the same as the previous
`destroy` method, and `handle_destroy_with_match` which will destroy any
line which matches the `match` parameter, raising an error if multiple
lines match and the `multiple` parameter is not `true`.  This new
behavior is only used if the new boolean parameter `match_for_absence`
is `true` (it defaults to `false`).
---
 lib/puppet/provider/file_line/ruby.rb | 26 +++++++++++++++++++++++---
 lib/puppet/type/file_line.rb          | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index d4cdfec..aab6fe2 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -22,9 +22,10 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   end
 
   def destroy
-    local_lines = lines
-    File.open(resource[:path],'w') do |fh|
-      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
+    if resource[:match_for_absence].to_s == 'true' and resource[:match]
+      handle_destroy_with_match
+    else
+      handle_destroy_line
     end
   end
 
@@ -93,6 +94,25 @@ Puppet::Type.type(:file_line).provide(:ruby) do
     lines.select{|l| l.match(regex)}.size
   end
 
+  def handle_destroy_with_match
+    match_count = count_matches(match_regex)
+    if match_count > 1 && resource[:multiple].to_s != 'true'
+     raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
+    end
+
+    local_lines = lines
+    File.open(resource[:path],'w') do |fh|
+      fh.write(local_lines.reject{|l| match_regex.match(l) }.join(''))
+    end
+  end
+
+  def handle_destroy_line
+    local_lines = lines
+    File.open(resource[:path],'w') do |fh|
+      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
+    end
+  end
+
   ##
   # append the line to the file.
   #
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 4a96ba7..446f103 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -34,6 +34,20 @@ Puppet::Type.newtype(:file_line) do
     In this code example match will look for a line beginning with export 
     followed by HTTP_PROXY and replace it with the value in line.
 
+    Match Example With `ensure => absent`:
+
+        file_line { 'bashrc_proxy':
+          ensure            => absent,
+          path              => '/etc/bashrc',
+          line              => 'export HTTP_PROXY=http://squid.puppetlabs.vm:3128',
+          match             => '^export\ HTTP_PROXY\=',
+          match_for_absence => true,
+        }
+
+    In this code example match will look for a line beginning with export
+    followed by HTTP_PROXY and delete it.  If multiple lines match, an
+    error will be raised unless the `multiple => true` parameter is set.
+
     **Autorequires:** If Puppet is managing the file that will contain the line
     being managed, the file_line resource will autorequire that file.
 
@@ -55,6 +69,14 @@ Puppet::Type.newtype(:file_line) do
          ' match an exception will be raised. '
   end
 
+  newparam(:match_for_absence) do
+    desc 'An optional value to determine if match should be applied when ensure => absent.' +
+         ' If set to true and match is set, the line that matches match will be deleted.' +
+         ' If set to false (the default), match is ignored when ensure => absent.'
+    newvalues(true, false)
+    defaultto false
+  end
+
   newparam(:multiple) do
     desc 'An optional value to determine if match can change multiple lines.' +
          ' If set to false, an exception will be raised if more than one line matches'
-- 
cgit v1.2.3


From 4cbe846750c40dec57c55dbe6382dfa57c4d79af Mon Sep 17 00:00:00 2001
From: Nigel Gibbs <ngibbs@ucas.ac.uk>
Date: Fri, 14 Aug 2015 09:33:46 +0100
Subject: (MODULES-2410) Add new functions dos2unix and unix2dos

---
 lib/puppet/parser/functions/dos2unix.rb | 15 +++++++++++++++
 lib/puppet/parser/functions/unix2dos.rb | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 lib/puppet/parser/functions/dos2unix.rb
 create mode 100644 lib/puppet/parser/functions/unix2dos.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dos2unix.rb b/lib/puppet/parser/functions/dos2unix.rb
new file mode 100644
index 0000000..ccac899
--- /dev/null
+++ b/lib/puppet/parser/functions/dos2unix.rb
@@ -0,0 +1,15 @@
+# Custom Puppet function to convert dos to unix format
+module Puppet::Parser::Functions
+  newfunction(:dos2unix, :type => :rvalue, :arity => 1, :doc => <<-EOS
+    Returns the Unix version of the given string.
+    Takes a single string argument.
+    EOS
+  ) do |arguments|
+
+    unless arguments[0].is_a?(String)
+      raise(Puppet::ParseError, 'dos2unix(): Requires string as argument')
+    end
+
+    arguments[0].gsub(/\r\n/, "\n")
+  end
+end
diff --git a/lib/puppet/parser/functions/unix2dos.rb b/lib/puppet/parser/functions/unix2dos.rb
new file mode 100644
index 0000000..0bd9cd1
--- /dev/null
+++ b/lib/puppet/parser/functions/unix2dos.rb
@@ -0,0 +1,15 @@
+# Custom Puppet function to convert unix to dos format
+module Puppet::Parser::Functions
+  newfunction(:unix2dos, :type => :rvalue, :arity => 1, :doc => <<-EOS
+    Returns the DOS version of the given string.
+    Takes a single string argument.
+    EOS
+  ) do |arguments|
+
+    unless arguments[0].is_a?(String)
+      raise(Puppet::ParseError, 'unix2dos(): Requires string as argument')
+    end
+
+    arguments[0].gsub(/\r*\n/, "\r\n")
+  end
+end
-- 
cgit v1.2.3


From 66e118a92aa480739f62e4675ed80c79ef80619c Mon Sep 17 00:00:00 2001
From: Ben Ford <ben.ford@puppetlabs.com>
Date: Wed, 19 Aug 2015 08:31:36 -0700
Subject: Add a service_provider fact

This returns the default provider Puppet will choose to manage services
on this system by instantiating a dummy service resource type and
returning the provider chosen.

Co-Authored-By: Simon Fraser University <asa188@sfu.ca>
---
 lib/facter/service_provider.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lib/facter/service_provider.rb

(limited to 'lib')

diff --git a/lib/facter/service_provider.rb b/lib/facter/service_provider.rb
new file mode 100644
index 0000000..54db937
--- /dev/null
+++ b/lib/facter/service_provider.rb
@@ -0,0 +1,14 @@
+# Fact: service_provider
+#
+# Purpose: Returns the default provider Puppet will choose to manage services
+#   on this system
+#
+# Resolution: Instantiates a dummy service resource and return the provider
+#
+# Caveats:
+#
+Facter.add(:service_provider) do
+  setcode do
+    Puppet::Type.type(:service).newservice(:name => 'dummy')[:provider].to_s
+  end
+end
-- 
cgit v1.2.3


From 1d9189d860f28067b72093cbe4027cf49b7d612c Mon Sep 17 00:00:00 2001
From: Jetroid <holtjet@gmail.com>
Date: Mon, 24 Aug 2015 12:01:29 +0100
Subject: (MODULE-2456) Modify union to accept more than two arrays

Add spec tests to test the new functionality:
 *Case for 3 arrays.
 *Case for 4 arrays.
Modify README to note new functionality.

This is for issue MODULE-2456, follow the precedent of MODULE-444.

This change allows union to be much more useful, unioning many arrays
in one line rather than in n lines. Additionally, as this is only added
functionality, and does not affect the 2 array case that all modules
currently using array are using, it should not affect any existing
modules utilizing union.

This is now useful, for example, for merging many arrays of resources
(eg: packages.) to generate just one list with no duplicates, to avoid
duplicate resource declarations.
---
 lib/puppet/parser/functions/union.rb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/union.rb b/lib/puppet/parser/functions/union.rb
index c91bb80..6c5bb83 100644
--- a/lib/puppet/parser/functions/union.rb
+++ b/lib/puppet/parser/functions/union.rb
@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:union, :type => :rvalue, :doc => <<-EOS
-This function returns a union of two arrays.
+This function returns a union of two or more arrays.
 
 *Examples:*
 
@@ -14,20 +14,15 @@ Would return: ["a","b","c","d"]
     EOS
   ) do |arguments|
 
-    # Two arguments are required
+    # Check that 2 or more arguments have been given ...
     raise(Puppet::ParseError, "union(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
+      "given (#{arguments.size} for < 2)") if arguments.size < 2
 
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'union(): Requires 2 arrays')
+    arguments.each do |argument|
+      raise(Puppet::ParseError, 'union(): Every parameter must be an array') unless argument.is_a?(Array)
     end
 
-    result = first | second
-
-    return result
+    arguments.reduce(:|)
   end
 end
 
-- 
cgit v1.2.3


From eb948c4a0dc36790c5444fc236b0154c3d716c58 Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dilyin@mirantis.com>
Date: Mon, 24 Aug 2015 22:00:18 +0300
Subject: [MODULES-2462] Improve parseyaml function

* Add default value support
  Second argument will be returned if yaml cannot be parsed
  instead of false value
* Update tests
---
 lib/puppet/parser/functions/parsejson.rb | 23 ++++++++++++-----------
 lib/puppet/parser/functions/parseyaml.rb | 20 +++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb
index a9a16a4..f822fc4 100644
--- a/lib/puppet/parser/functions/parsejson.rb
+++ b/lib/puppet/parser/functions/parsejson.rb
@@ -3,21 +3,22 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
-    EOS
+  newfunction(:parsejson, :type => :rvalue, :arity => -2, :doc => <<-EOS
+This function accepts JSON as a string and converts it into the correct
+Puppet structure.
+
+The optional second argument can be used to pass a default value that will
+be returned if the parsing of YAML string have failed.
+  EOS
   ) do |arguments|
+    raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
 
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parsejson(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
+    begin
+      PSON::load(arguments[0]) || arguments[1]
+    rescue Exception
+      arguments[1]
     end
 
-    json = arguments[0]
-
-    # PSON is natively available in puppet
-    PSON.load(json)
   end
 end
 
diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb
index 53d54fa..d38b3ef 100644
--- a/lib/puppet/parser/functions/parseyaml.rb
+++ b/lib/puppet/parser/functions/parseyaml.rb
@@ -3,20 +3,22 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
+  newfunction(:parseyaml, :type => :rvalue, :arity => -2, :doc => <<-EOS
 This function accepts YAML as a string and converts it into the correct
 Puppet structure.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parseyaml(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
 
+The optional second argument can be used to pass a default value that will
+be returned if the parsing of YAML string have failed.
+  EOS
+  ) do |arguments|
+    raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
     require 'yaml'
 
-    YAML::load(arguments[0])
+    begin
+      YAML::load(arguments[0]) || arguments[1]
+    rescue Exception
+      arguments[1]
+    end
 
   end
 end
-- 
cgit v1.2.3


From 2d4f5aa4d943e27ffeae524469f9c6eb18ce64d8 Mon Sep 17 00:00:00 2001
From: fhats <fhats@yelp.com>
Date: Thu, 27 Aug 2015 10:40:20 +0100
Subject: Adds a convert_base function, which can convert numbers between bases

Squashed, improved docs, updated error handling and unit tests by David S.
---
 lib/puppet/parser/functions/convert_base.rb | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 lib/puppet/parser/functions/convert_base.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/convert_base.rb b/lib/puppet/parser/functions/convert_base.rb
new file mode 100644
index 0000000..0fcbafe
--- /dev/null
+++ b/lib/puppet/parser/functions/convert_base.rb
@@ -0,0 +1,35 @@
+module Puppet::Parser::Functions
+
+  newfunction(:convert_base, :type => :rvalue, :arity => 2, :doc => <<-'ENDHEREDOC') do |args|
+
+    Converts a given integer or base 10 string representing an integer to a specified base, as a string.
+
+    Usage:
+
+      $binary_repr = convert_base(5, 2)  # $binary_repr is now set to "101"
+      $hex_repr = convert_base("254", "16")  # $hex_repr is now set to "fe"
+
+    ENDHEREDOC
+
+    raise Puppet::ParseError, ("convert_base(): First argument must be either a string or an integer") unless (args[0].is_a?(Integer) or args[0].is_a?(String))
+    raise Puppet::ParseError, ("convert_base(): Second argument must be either a string or an integer") unless (args[1].is_a?(Integer) or args[1].is_a?(String))
+
+    if args[0].is_a?(String)
+      raise Puppet::ParseError, ("convert_base(): First argument must be an integer or a string corresponding to an integer in base 10") unless args[0] =~ /^[0-9]+$/
+    end
+
+    if args[1].is_a?(String)
+      raise Puppet::ParseError, ("convert_base(): First argument must be an integer or a string corresponding to an integer in base 10") unless args[1] =~ /^[0-9]+$/
+    end
+
+    number_to_convert = args[0]
+    new_base = args[1]
+
+    number_to_convert = number_to_convert.to_i()
+    new_base = new_base.to_i()
+
+    raise Puppet::ParseError, ("convert_base(): base must be at least 2 and must not be greater than 36") unless new_base >= 2 and new_base <= 36
+
+    return number_to_convert.to_s(new_base)
+  end
+end
-- 
cgit v1.2.3


From 6c2a003f2139a482f92f245ce1d49830be13c5f1 Mon Sep 17 00:00:00 2001
From: Jon Fautley <jon@dead.li>
Date: Thu, 27 Aug 2015 14:53:02 +0100
Subject: (MODULES-2478) Support root_home fact on AIX through "lsuser" command

Squashed, and amended test for comment lines.
---
 lib/facter/root_home.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'lib')

diff --git a/lib/facter/root_home.rb b/lib/facter/root_home.rb
index b4f87ff..ee3ffa8 100644
--- a/lib/facter/root_home.rb
+++ b/lib/facter/root_home.rb
@@ -30,3 +30,16 @@ Facter.add(:root_home) do
     hash['dir'].strip
   end
 end
+
+Facter.add(:root_home) do
+  confine :kernel => :aix
+  root_home = nil
+  setcode do
+    str = Facter::Util::Resolution.exec("lsuser -C -a home root")
+    str && str.split("\n").each do |line|
+      next if line =~ /^#/
+      root_home = line.split(/:/)[1]
+    end
+    root_home
+  end
+end
-- 
cgit v1.2.3


From 823a352f0f47d4481844bb6b6a6c00224ed556b8 Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dilyin@mirantis.com>
Date: Tue, 1 Sep 2015 21:39:16 +0300
Subject: Add a new function "try_get_value"

* Extracts a value from a deeply-nested data structure
* Returns default if a value could not be extracted
---
 lib/puppet/parser/functions/try_get_value.rb | 77 ++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lib/puppet/parser/functions/try_get_value.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/try_get_value.rb b/lib/puppet/parser/functions/try_get_value.rb
new file mode 100644
index 0000000..0c19fd9
--- /dev/null
+++ b/lib/puppet/parser/functions/try_get_value.rb
@@ -0,0 +1,77 @@
+module Puppet::Parser::Functions
+  newfunction(
+      :try_get_value,
+      :type => :rvalue,
+      :arity => -2,
+      :doc => <<-eos
+Looks up into a complex structure of arrays and hashes and returns a value
+or the default value if nothing was found.
+
+Key can contain slashes to describe path components. The function will go down
+the structure and try to extract the required value.
+
+$data = {
+  'a' => {
+    'b' => [
+      'b1',
+      'b2',
+      'b3',
+    ]
+  }
+}
+
+$value = try_get_value($data, 'a/b/2', 'not_found', '/')
+=> $value = 'b3'
+
+a -> first hash key
+b -> second hash key
+2 -> array index starting with 0
+
+not_found -> (optional) will be returned if there is no value or the path did not match. Defaults to nil.
+/ -> (optional) path delimiter. Defaults to '/'.
+
+In addition to the required "key" argument, "try_get_value" accepts default
+argument. It will be returned if no value was found or a path component is
+missing. And the fourth argument can set a variable path separator.
+  eos
+  ) do |args|
+    path_lookup = lambda do |data, path, default|
+      debug "Try_get_value: #{path.inspect} from: #{data.inspect}"
+      if data.nil?
+        debug "Try_get_value: no data, return default: #{default.inspect}"
+        break default
+      end
+      unless path.is_a? Array
+        debug "Try_get_value: wrong path, return default: #{default.inspect}"
+        break default
+      end
+      unless path.any?
+        debug "Try_get_value: value found, return data: #{data.inspect}"
+        break data
+      end
+      unless data.is_a? Hash or data.is_a? Array
+        debug "Try_get_value: incorrect data, return default: #{default.inspect}"
+        break default
+      end
+
+      key = path.shift
+      if data.is_a? Array
+        begin
+          key = Integer key
+        rescue ArgumentError
+          debug "Try_get_value: non-numeric path for an array, return default: #{default.inspect}"
+          break default
+        end
+      end
+      path_lookup.call data[key], path, default
+    end
+
+    data = args[0]
+    path = args[1] || ''
+    default = args[2]
+    separator = args[3] || '/'
+
+    path = path.split separator
+    path_lookup.call data, path, default
+  end
+end
-- 
cgit v1.2.3


From f2f2db4795fc0e3b9387e1e6c003e8e75efde903 Mon Sep 17 00:00:00 2001
From: Corey Osman <corey@logicminds.biz>
Date: Thu, 3 Sep 2015 10:31:51 -0700
Subject: accept any case of boolean strings

  * previously the str2bool function did not accept 'TRUE' as a bool
    type.  This causes the function to now accept TRUE, FALSE strings
    as a boolean type in order to be converted to a proper boolean.
  * This would also cause Y,N, YES, NO to be accepted as boolean types
    as well.
---
 lib/puppet/parser/functions/str2bool.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/str2bool.rb b/lib/puppet/parser/functions/str2bool.rb
index 446732e..8def131 100644
--- a/lib/puppet/parser/functions/str2bool.rb
+++ b/lib/puppet/parser/functions/str2bool.rb
@@ -5,8 +5,8 @@
 module Puppet::Parser::Functions
   newfunction(:str2bool, :type => :rvalue, :doc => <<-EOS
 This converts a string to a boolean. This attempt to convert strings that
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
+contain things like: Y,y, 1, T,t, TRUE,true to 'true' and strings that contain things
+like: 0, F,f, N,n, false, FALSE, no to 'false'.
     EOS
   ) do |arguments|
 
@@ -32,8 +32,8 @@ like: 0, f, n, false, no to 'false'.
       # We yield false in this case.
       #
       when /^$/, '' then false # Empty string will be false ...
-      when /^(1|t|y|true|yes)$/  then true
-      when /^(0|f|n|false|no)$/  then false
+      when /^(1|t|y|true|yes)$/i  then true
+      when /^(0|f|n|false|no)$/i  then false
       when /^(undef|undefined)$/ then false # This is not likely to happen ...
       else
         raise(Puppet::ParseError, 'str2bool(): Unknown type of boolean given')
-- 
cgit v1.2.3


From 00c881d0dabe77fd2401beb0d39c7386b50bb791 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Mon, 14 Sep 2015 18:26:25 +0100
Subject: (MODULES-2516) Adds an is_a() function

The data type system is very hard to understand. Many people don't
understand why

    type_of([1,2,3]) == Array

will fail, but

    type_of([1,2,3]) <= Array

passes. This does a simpler validation that doesn't rely on explicit
data types. Instead, use

    $foo = [1,2,3]
    if $foo.is_a(Array) {
      notify { 'This is an array': }
    }

This is based on code by Ben Ford <ben.ford@puppetlabs.com>.

  * Added acceptance tests
  * Added dispatch
  * Improved unit tests
  * Added docs to README
---
 lib/puppet/functions/is_a.rb | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lib/puppet/functions/is_a.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/is_a.rb b/lib/puppet/functions/is_a.rb
new file mode 100644
index 0000000..da98b03
--- /dev/null
+++ b/lib/puppet/functions/is_a.rb
@@ -0,0 +1,32 @@
+# Boolean check to determine whether a variable is of a given data type. This is equivalent to the `=~` type checks.
+#
+# @example how to check a data type
+#   # check a data type
+#       foo = 3
+#       $bar = [1,2,3]
+#       $baz = 'A string!'
+#
+#       if $foo.is_a(Integer) {
+#         notify  { 'foo!': }
+#       }
+#       if $bar.is_a(Array) {
+#         notify { 'bar!': }
+#       }
+#       if $baz.is_a(String) {
+#         notify { 'baz!': }
+#       }
+#
+# See the documentation for "The Puppet Type System" for more information about types.
+# See the `assert_type()` function for flexible ways to assert the type of a value.
+#
+Puppet::Functions.create_function(:is_a) do
+  dispatch :is_a do
+    param 'Any', :value
+    param 'Type', :type
+  end
+
+  def is_a(value, type)
+    # See puppet's lib/puppet/pops/evaluator/evaluator_impl.rb eval_MatchExpression
+    Puppet::Pops::Types::TypeCalculator.instance?(type, value)
+  end
+end
-- 
cgit v1.2.3


From 169f8af506d4cd8299e847236632fd8511928a03 Mon Sep 17 00:00:00 2001
From: Ben Ford <ben.ford@puppetlabs.com>
Date: Mon, 14 Sep 2015 11:25:38 -0700
Subject: Clarify what an empty intersection looks like.

---
 lib/puppet/parser/functions/intersection.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/intersection.rb b/lib/puppet/parser/functions/intersection.rb
index 48f02e9..bfbb4ba 100644
--- a/lib/puppet/parser/functions/intersection.rb
+++ b/lib/puppet/parser/functions/intersection.rb
@@ -4,13 +4,13 @@
 
 module Puppet::Parser::Functions
   newfunction(:intersection, :type => :rvalue, :doc => <<-EOS
-This function returns an array an intersection of two.
+This function returns an array of the intersection of two.
 
 *Examples:*
 
-    intersection(["a","b","c"],["b","c","d"])
+    intersection(["a","b","c"],["b","c","d"])  # returns ["b","c"]
+    intersection(["a","b","c"],[1,2,3,4])      # returns [] (true, when evaluated as a Boolean)
 
-Would return: ["b","c"]
     EOS
   ) do |arguments|
 
-- 
cgit v1.2.3


From 55ece7815a8718507ef096db53a1e186102f1c8a Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 17 Sep 2015 18:48:32 +0100
Subject: (MAINT) validate_re: Clarify docs and error message

---
 lib/puppet/parser/functions/validate_re.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_re.rb b/lib/puppet/parser/functions/validate_re.rb
index ca25a70..efee7f8 100644
--- a/lib/puppet/parser/functions/validate_re.rb
+++ b/lib/puppet/parser/functions/validate_re.rb
@@ -23,16 +23,23 @@ module Puppet::Parser::Functions
 
         validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7')
 
+    Note: Compilation will also abort, if the first argument is not a String. Always use
+    quotes to force stringification:
+
+        validate_re("${::operatingsystemmajrelease}", '^[57]$')
+
     ENDHEREDOC
     if (args.length < 2) or (args.length > 3) then
-      raise Puppet::ParseError, ("validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)")
+      raise Puppet::ParseError, "validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)"
     end
 
+    raise Puppet::ParseError, "validate_re(): input needs to be a String, not a #{args[0].class}" unless args[0].is_a? String
+
     msg = args[2] || "validate_re(): #{args[0].inspect} does not match #{args[1].inspect}"
 
     # We're using a flattened array here because we can't call String#any? in
     # Ruby 1.9 like we can in Ruby 1.8
-    raise Puppet::ParseError, (msg) unless [args[1]].flatten.any? do |re_str|
+    raise Puppet::ParseError, msg unless [args[1]].flatten.any? do |re_str|
       args[0] =~ Regexp.compile(re_str)
     end
 
-- 
cgit v1.2.3


From 799c38e14e1583e676e2b25a9c1782fd40e29fff Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 21 Sep 2015 10:56:08 -0700
Subject: Fix backwards compatibility from #511

Maintain the old behavior in the case where the optional second
parameter isn't passed. Also, adding arity is backwards incompatible since
stdlib still supports 2.7, so remove that.
---
 lib/puppet/parser/functions/parsejson.rb | 10 +++++++---
 lib/puppet/parser/functions/parseyaml.rb | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb
index f822fc4..b4af40e 100644
--- a/lib/puppet/parser/functions/parsejson.rb
+++ b/lib/puppet/parser/functions/parsejson.rb
@@ -3,7 +3,7 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :arity => -2, :doc => <<-EOS
+  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
 This function accepts JSON as a string and converts it into the correct
 Puppet structure.
 
@@ -15,8 +15,12 @@ be returned if the parsing of YAML string have failed.
 
     begin
       PSON::load(arguments[0]) || arguments[1]
-    rescue Exception
-      arguments[1]
+    rescue Exception => e
+      if arguments[1]
+        arguments[1]
+      else
+        raise e
+      end
     end
 
   end
diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb
index d38b3ef..66d0413 100644
--- a/lib/puppet/parser/functions/parseyaml.rb
+++ b/lib/puppet/parser/functions/parseyaml.rb
@@ -3,7 +3,7 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:parseyaml, :type => :rvalue, :arity => -2, :doc => <<-EOS
+  newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
 This function accepts YAML as a string and converts it into the correct
 Puppet structure.
 
@@ -16,8 +16,12 @@ be returned if the parsing of YAML string have failed.
 
     begin
       YAML::load(arguments[0]) || arguments[1]
-    rescue Exception
-      arguments[1]
+    rescue Exception => e
+      if arguments[1]
+        arguments[1]
+      else
+        raise e
+      end
     end
 
   end
-- 
cgit v1.2.3


From ce6e8679b68f984415adc90d74083fd787234709 Mon Sep 17 00:00:00 2001
From: Adam S <asa188@sfu.ca>
Date: Fri, 25 Sep 2015 17:55:21 -0700
Subject: Add package_provider fact

This adds a package_provider fact for situations where we need to be
able to know the client's package provider in a simple way.  Situations
such as: package { 'name': install_options => [] }  As those tend to be
package provider specific options.
---
 lib/facter/package_provider.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/facter/package_provider.rb

(limited to 'lib')

diff --git a/lib/facter/package_provider.rb b/lib/facter/package_provider.rb
new file mode 100644
index 0000000..9a4ec65
--- /dev/null
+++ b/lib/facter/package_provider.rb
@@ -0,0 +1,17 @@
+# Fact: package_provider
+#
+# Purpose: Returns the default provider Puppet will choose to manage packages
+#   on this system
+#
+# Resolution: Instantiates a dummy package resource and return the provider
+#
+# Caveats:
+#
+require 'puppet/type'
+require 'puppet/type/package'
+
+Facter.add(:package_provider) do
+  setcode do
+    Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
+  end
+end
-- 
cgit v1.2.3


From 440245d40d90f5f5cd9d7db0131371969216e55c Mon Sep 17 00:00:00 2001
From: Adam S <asa188@sfu.ca>
Date: Fri, 25 Sep 2015 17:58:05 -0700
Subject: fixup-PR#506 Speed improvements in facter resolution

This is to improve speed on Facter resolution of service_provider fact
that was just introduced in PR# 506.  The improvements go from 280ms
resolution time approx. down to 2ms resolution time approx. by adding
requires statements.
---
 lib/facter/service_provider.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

diff --git a/lib/facter/service_provider.rb b/lib/facter/service_provider.rb
index 54db937..a117921 100644
--- a/lib/facter/service_provider.rb
+++ b/lib/facter/service_provider.rb
@@ -7,6 +7,9 @@
 #
 # Caveats:
 #
+require 'puppet/type'
+require 'puppet/type/service'
+
 Facter.add(:service_provider) do
   setcode do
     Puppet::Type.type(:service).newservice(:name => 'dummy')[:provider].to_s
-- 
cgit v1.2.3


From 6f1d164da6fca26d41d5962c575900dfc792f004 Mon Sep 17 00:00:00 2001
From: Roman Mueller <roman.mueller@gmail.com>
Date: Tue, 22 Sep 2015 18:05:37 +0200
Subject: Check for numeric values as empty fails on those

---
 lib/puppet/parser/functions/empty.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/empty.rb b/lib/puppet/parser/functions/empty.rb
index cca620f..b5a3cde 100644
--- a/lib/puppet/parser/functions/empty.rb
+++ b/lib/puppet/parser/functions/empty.rb
@@ -13,14 +13,18 @@ Returns true if the variable is empty.
 
     value = arguments[0]
 
-    unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String)
+    unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String) || value.is_a?(Numeric)
       raise(Puppet::ParseError, 'empty(): Requires either ' +
-        'array, hash or string to work with')
+        'array, hash, string or integer to work with')
     end
 
-    result = value.empty?
+    if value.is_a?(Numeric)
+      return false
+    else
+      result = value.empty?
 
-    return result
+      return result
+    end
   end
 end
 
-- 
cgit v1.2.3


From d73fd3c5efcdf9a60178ddf96914ab75c9214260 Mon Sep 17 00:00:00 2001
From: Martin Pfeifer <martin.pfeifer@dm.de>
Date: Tue, 13 Oct 2015 10:08:01 +0200
Subject: prevent deprecation warning about the allow_virtual parameter

---
 lib/facter/package_provider.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/package_provider.rb b/lib/facter/package_provider.rb
index 9a4ec65..65a2da0 100644
--- a/lib/facter/package_provider.rb
+++ b/lib/facter/package_provider.rb
@@ -12,6 +12,10 @@ require 'puppet/type/package'
 
 Facter.add(:package_provider) do
   setcode do
-    Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
+    if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
+      Puppet::Type.type(:package).newpackage(:name => 'dummy', :allow_virtual => 'true')[:provider].to_s
+    else
+      Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
+    end
   end
 end
-- 
cgit v1.2.3


From ad173f2d0552ad9ed42950aea7df8d2b22677904 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 13 Oct 2015 15:02:04 +0100
Subject: (MODULES-2421) improve description of file_line

This mostly needed extraction of the existing doc strings from
the type.
---
 lib/puppet/type/file_line.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 446f103..77d3be2 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -4,7 +4,7 @@ Puppet::Type.newtype(:file_line) do
     Ensures that a given line is contained within a file.  The implementation
     matches the full line, including whitespace at the beginning and end.  If
     the line is not contained in the given file, Puppet will append the line to
-    the end of the file to ensure the desired state.  Multiple resources may 
+    the end of the file to ensure the desired state.  Multiple resources may
     be declared to manage multiple lines in the same file.
 
     Example:
@@ -31,7 +31,7 @@ Puppet::Type.newtype(:file_line) do
           match  => '^export\ HTTP_PROXY\=',
         }
 
-    In this code example match will look for a line beginning with export 
+    In this code example match will look for a line beginning with export
     followed by HTTP_PROXY and replace it with the value in line.
 
     Match Example With `ensure => absent`:
@@ -50,7 +50,6 @@ Puppet::Type.newtype(:file_line) do
 
     **Autorequires:** If Puppet is managing the file that will contain the line
     being managed, the file_line resource will autorequire that file.
-
   EOT
 
   ensurable do
@@ -63,10 +62,10 @@ Puppet::Type.newtype(:file_line) do
   end
 
   newparam(:match) do
-    desc 'An optional ruby regular expression to run against existing lines in the file.' + 
+    desc 'An optional ruby regular expression to run against existing lines in the file.' +
          ' If a match is found, we replace that line rather than adding a new line.' +
-         ' A regex comparisson is performed against the line value and if it does not' +
-         ' match an exception will be raised. '
+         ' A regex comparison is performed against the line value and if it does not' +
+         ' match an exception will be raised.'
   end
 
   newparam(:match_for_absence) do
-- 
cgit v1.2.3


From 25410c4598d3c0029fcd05adc2e305dbf5f8d902 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Wed, 14 Oct 2015 16:09:05 -0700
Subject: Let load_module_metadata succeed on empty file

Some modules or module versions don't have a metadata.json file, but we
might still want to use the load_module_metadata function on them. The
lack of a file can still give us important information. For example, it
might tell us that the version of the module installed is "very old"
even if we can't read the version number directly. This patch adds a
parameter to let the user specify if an empty file is acceptable. To
preserve backwards compatibility it does not change the current default
behavior, which is to raise an error if metadata.json does not exist.
---
 lib/puppet/parser/functions/load_module_metadata.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/load_module_metadata.rb b/lib/puppet/parser/functions/load_module_metadata.rb
index 0664a23..c9b8488 100644
--- a/lib/puppet/parser/functions/load_module_metadata.rb
+++ b/lib/puppet/parser/functions/load_module_metadata.rb
@@ -2,14 +2,22 @@ module Puppet::Parser::Functions
   newfunction(:load_module_metadata, :type => :rvalue, :doc => <<-EOT
   EOT
   ) do |args|
-    raise(Puppet::ParseError, "load_module_metadata(): Wrong number of arguments, expects one") unless args.size == 1
+    raise(Puppet::ParseError, "load_module_metadata(): Wrong number of arguments, expects one or two") unless [1,2].include?(args.size)
     mod = args[0]
+    allow_empty_metadata = args[1]
     module_path = function_get_module_path([mod])
     metadata_json = File.join(module_path, 'metadata.json')
 
-    raise(Puppet::ParseError, "load_module_metadata(): No metadata.json file for module #{mod}") unless File.exists?(metadata_json)
-
-    metadata = PSON.load(File.read(metadata_json))
+    metadata_exists = File.exists?(metadata_json)
+    if metadata_exists
+      metadata = PSON.load(File.read(metadata_json))
+    else
+      if allow_empty_metadata
+        metadata = {}
+      else
+        raise(Puppet::ParseError, "load_module_metadata(): No metadata.json file for module #{mod}")
+      end
+    end
 
     return metadata
   end
-- 
cgit v1.2.3


From 6aa7f2db9953d81afb75a3591358ba9e0dbc6935 Mon Sep 17 00:00:00 2001
From: Jesse Lovelace <jesse.lovelace@gmail.com>
Date: Thu, 15 Oct 2015 11:25:57 -0500
Subject: Add check to ensure regex does not throw for none type.

Add a quick check to ensure puppetversion value is not nil and supporting test.
---
 lib/facter/pe_version.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/facter/pe_version.rb b/lib/facter/pe_version.rb
index 0cc0f64..c9f2181 100644
--- a/lib/facter/pe_version.rb
+++ b/lib/facter/pe_version.rb
@@ -10,8 +10,13 @@
 #
 Facter.add("pe_version") do
   setcode do
-    pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
-    pe_ver[1] if pe_ver
+    puppet_ver = Facter.value("puppetversion")
+    if puppet_ver != nil
+      pe_ver = puppet_ver.match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
+      pe_ver[1] if pe_ver
+    else
+      nil
+    end
   end
 end
 
-- 
cgit v1.2.3


From 6de1a6e0622f69ec22c64e72fd53ec12ae8c9111 Mon Sep 17 00:00:00 2001
From: Mark McKinstry <mmckinst@umich.edu>
Date: Thu, 15 Oct 2015 22:22:10 -0400
Subject: add functionality to bool2str to return strings of your choice for a
 boolean

---
 lib/puppet/parser/functions/bool2str.rb | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/bool2str.rb b/lib/puppet/parser/functions/bool2str.rb
index fcd3791..7e36474 100644
--- a/lib/puppet/parser/functions/bool2str.rb
+++ b/lib/puppet/parser/functions/bool2str.rb
@@ -4,15 +4,29 @@
 
 module Puppet::Parser::Functions
   newfunction(:bool2str, :type => :rvalue, :doc => <<-EOS
-    Converts a boolean to a string.
+    Converts a boolean to a string using optionally supplied arguments. The
+    optional second and third arguments represent what true and false will be
+    converted to respectively. If only one argument is given, it will be
+    converted from a boolean to a string containing 'true' or 'false'.
+
+    *Examples:*
+
+    bool2str(true)                    => 'true'
+    bool2str(true, 'yes', 'no')       => 'yes'
+    bool2str(false, 't', 'f')         => 'f'
+
     Requires a single boolean as an input.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "bool2str(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    unless arguments.size == 1 or arguments.size == 3
+      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments " +
+                                "given (#{arguments.size} for 3)")
+    end
 
     value = arguments[0]
+    true_string = arguments[1] || 'true'
+    false_string = arguments[2] || 'false'
     klass = value.class
 
     # We can have either true or false, and nothing else
@@ -20,7 +34,11 @@ module Puppet::Parser::Functions
       raise(Puppet::ParseError, 'bool2str(): Requires a boolean to work with')
     end
 
-    return value.to_s
+    unless [true_string, false_string].all?{|x| x.kind_of?(String)}
+      raise(Puppet::ParseError, "bool2str(): Requires strings to convert to" )
+    end
+
+    return value ? true_string : false_string
   end
 end
 
-- 
cgit v1.2.3


From 13e5d467c97deb530f99e4a82c73b1aff97c9787 Mon Sep 17 00:00:00 2001
From: Reid Vandewiele <reid@puppetlabs.com>
Date: Thu, 19 Nov 2015 15:29:06 -0800
Subject: (FM-3773) Fix root_home fact on AIX 5.x

The -C (capital C) flag to lsuser is incorrect. It should be -c
(lowercase).

this commit updates the aix root_home fact to use `lsuser -c`, rather
than `lsuser -C`.
---
 lib/facter/root_home.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/root_home.rb b/lib/facter/root_home.rb
index ee3ffa8..87c7657 100644
--- a/lib/facter/root_home.rb
+++ b/lib/facter/root_home.rb
@@ -35,7 +35,7 @@ Facter.add(:root_home) do
   confine :kernel => :aix
   root_home = nil
   setcode do
-    str = Facter::Util::Resolution.exec("lsuser -C -a home root")
+    str = Facter::Util::Resolution.exec("lsuser -c -a home root")
     str && str.split("\n").each do |line|
       next if line =~ /^#/
       root_home = line.split(/:/)[1]
-- 
cgit v1.2.3


From 7b068781a506bf7f7a78a32adbe60eec292b9326 Mon Sep 17 00:00:00 2001
From: Matt Bostock <matt@mattbostock.com>
Date: Mon, 23 Nov 2015 23:45:55 +0000
Subject: Fix reference to validate_bool in IP4 function

The documentation in `validate_ipv4_address` references `validate_bool`,
but I believe this should read `validate_ipv4_address` instead, which
makes more sense.
---
 lib/puppet/parser/functions/validate_ipv4_address.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_ipv4_address.rb b/lib/puppet/parser/functions/validate_ipv4_address.rb
index fc02748..97faa57 100644
--- a/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ b/lib/puppet/parser/functions/validate_ipv4_address.rb
@@ -8,7 +8,7 @@ module Puppet::Parser::Functions
 
     $my_ip = "1.2.3.4"
     validate_ipv4_address($my_ip)
-    validate_bool("8.8.8.8", "172.16.0.1", $my_ip)
+    validate_ipv4_address("8.8.8.8", "172.16.0.1", $my_ip)
 
     The following values will fail, causing compilation to abort:
 
-- 
cgit v1.2.3


From fe23e01a4b8b0cc0d9ea1a958e2be5a947fb7aed Mon Sep 17 00:00:00 2001
From: Jaume Devesa <devvesa@gmail.com>
Date: Thu, 19 Nov 2015 12:47:01 +0100
Subject: Add validator for any IP address

Provide a validator for IP addresses, regardless they are IPv4 or IPv6,
and its documentation.
---
 lib/puppet/parser/functions/validate_ip_address.rb | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 lib/puppet/parser/functions/validate_ip_address.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_ip_address.rb b/lib/puppet/parser/functions/validate_ip_address.rb
new file mode 100644
index 0000000..c0baf82
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_ip_address.rb
@@ -0,0 +1,50 @@
+module Puppet::Parser::Functions
+
+  newfunction(:validate_ip_address, :doc => <<-ENDHEREDOC
+    Validate that all values passed are valid IP addresses,
+    regardless they are IPv4 or IPv6
+    Fail compilation if any value fails this check.
+    The following values will pass:
+    $my_ip = "1.2.3.4"
+    validate_ip_address($my_ip)
+    validate_bool("8.8.8.8", "172.16.0.1", $my_ip)
+    
+    $my_ip = "3ffe:505:2"
+    validate_ip_address(1)
+    validate_ip_address($my_ip)
+    validate_bool("fe80::baf6:b1ff:fe19:7507", $my_ip)
+   
+    The following values will fail, causing compilation to abort:
+    $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
+    validate_ip_address($some_array)
+    ENDHEREDOC
+  ) do |args|
+
+    require "ipaddr"
+    rescuable_exceptions = [ ArgumentError ]
+
+    if defined?(IPAddr::InvalidAddressError)
+      rescuable_exceptions << IPAddr::InvalidAddressError
+    end
+
+    unless args.length > 0 then
+      raise Puppet::ParseError, ("validate_ip_address(): wrong number of arguments (#{args.length}; must be > 0)")
+    end
+
+    args.each do |arg|
+      unless arg.is_a?(String)
+        raise Puppet::ParseError, "#{arg.inspect} is not a string."
+      end
+
+      begin
+        unless IPAddr.new(arg).ipv4? or IPAddr.new(arg).ipv6?
+          raise Puppet::ParseError, "#{arg.inspect} is not a valid IP address."
+        end
+      rescue *rescuable_exceptions
+        raise Puppet::ParseError, "#{arg.inspect} is not a valid IP address."
+      end
+    end
+
+  end
+
+end
-- 
cgit v1.2.3


From 8aecd63378f6dc3aeafe71d91212f613aa0bb829 Mon Sep 17 00:00:00 2001
From: Kjetil Torgrim Homme <kjetil.homme@redpill-linpro.com>
Date: Tue, 8 Dec 2015 14:59:12 +0100
Subject: (#2886) seeded_rand: new function

seeded_rand is needed for repeatable randomness across nodes in a cluster
---
 lib/puppet/parser/functions/seeded_rand.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 lib/puppet/parser/functions/seeded_rand.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/seeded_rand.rb b/lib/puppet/parser/functions/seeded_rand.rb
new file mode 100644
index 0000000..44e27b8
--- /dev/null
+++ b/lib/puppet/parser/functions/seeded_rand.rb
@@ -0,0 +1,22 @@
+Puppet::Parser::Functions::newfunction(
+  :seeded_rand,
+  :arity => 2,
+  :type => :rvalue,
+  :doc => <<-EOS
+Usage: `seeded_rand(MAX, SEED)`. MAX must be a positive integer; SEED is any string.
+
+Generates a random whole number greater than or equal to 0 and less
+than MAX, using the value of SEED for repeatable randomness.  If SEED
+starts with "$fqdn:", this is behaves the same as `fqdn_rand`.
+
+EOS
+) do |args|
+  require 'digest/md5'
+
+  raise(ArgumentError, "seeded_rand(): first argument must be a positive integer") unless function_is_integer([args[0]]) and args[0].to_i > 0
+  raise(ArgumentError, "seeded_rand(): second argument must be a string") unless args[1].is_a? String
+
+  max = args[0].to_i
+  seed = Digest::MD5.hexdigest(args[1]).hex
+  Puppet::Util.deterministic_rand(seed,max)
+end
-- 
cgit v1.2.3


From 1b048ff9d689fcd0ff8e67640598cb0a1aa00887 Mon Sep 17 00:00:00 2001
From: Corey Osman <corey@logicminds.biz>
Date: Mon, 7 Dec 2015 16:38:26 -0800
Subject: adds new parser called is_absolute_path

  * is_absolute_path returns boolean true if the given path
    is absolute, returns false otherwise.
  * works for windows and unix
---
 lib/puppet/parser/functions/is_absolute_path.rb | 50 +++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 lib/puppet/parser/functions/is_absolute_path.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_absolute_path.rb b/lib/puppet/parser/functions/is_absolute_path.rb
new file mode 100644
index 0000000..53a5445
--- /dev/null
+++ b/lib/puppet/parser/functions/is_absolute_path.rb
@@ -0,0 +1,50 @@
+module Puppet::Parser::Functions
+  newfunction(:is_absolute_path, :type => :rvalue, :arity => 1, :doc => <<-'ENDHEREDOC') do |args|
+    Returns boolean true if the string represents an absolute path in the filesystem.  This function works
+    for windows and unix style paths.
+
+    The following values will return true:
+
+        $my_path = 'C:/Program Files (x86)/Puppet Labs/Puppet'
+        is_absolute_path($my_path)
+        $my_path2 = '/var/lib/puppet'
+        is_absolute_path($my_path2)
+        $my_path3 = ['C:/Program Files (x86)/Puppet Labs/Puppet']
+        is_absolute_path($my_path3)
+        $my_path4 = ['/var/lib/puppet']
+        is_absolute_path($my_path4)
+
+    The following values will return false:
+
+        is_absolute_path(true)
+        is_absolute_path('../var/lib/puppet')
+        is_absolute_path('var/lib/puppet')
+        $undefined = undef
+        is_absolute_path($undefined)
+
+  ENDHEREDOC
+
+    require 'puppet/util'
+
+    path = args[0]
+    # This logic was borrowed from
+    # [lib/puppet/file_serving/base.rb](https://github.com/puppetlabs/puppet/blob/master/lib/puppet/file_serving/base.rb)
+    # Puppet 2.7 and beyond will have Puppet::Util.absolute_path? Fall back to a back-ported implementation otherwise.
+    if Puppet::Util.respond_to?(:absolute_path?) then
+      value = (Puppet::Util.absolute_path?(path, :posix) or Puppet::Util.absolute_path?(path, :windows))
+    else
+      # This code back-ported from 2.7.x's lib/puppet/util.rb Puppet::Util.absolute_path?
+      # Determine in a platform-specific way whether a path is absolute. This
+      # defaults to the local platform if none is specified.
+      # Escape once for the string literal, and once for the regex.
+      slash = '[\\\\/]'
+      name = '[^\\\\/]+'
+      regexes = {
+        :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
+        :posix => %r!^/!
+      }
+      value = (!!(path =~ regexes[:posix])) || (!!(path =~ regexes[:windows]))
+    end
+    value
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 1da820e61e08e72cf69d8833c37ecb9446fcd142 Mon Sep 17 00:00:00 2001
From: Corey Osman <corey@logicminds.biz>
Date: Tue, 15 Dec 2015 23:15:36 -0800
Subject: refactors the validate_absolute_path to utilize the is_absolute_path

---
 .../parser/functions/validate_absolute_path.rb     | 24 +++-------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb
index b696680..5f85f72 100644
--- a/lib/puppet/parser/functions/validate_absolute_path.rb
+++ b/lib/puppet/parser/functions/validate_absolute_path.rb
@@ -40,28 +40,10 @@ module Puppet::Parser::Functions
       unless arg.is_a?(Array) then
         candidates = Array.new(1,arg)
       end
-      # iterate over all pathes within the candidates array
+      # iterate over all paths within the candidates array
       candidates.each do |path|
-        # This logic was borrowed from
-        # [lib/puppet/file_serving/base.rb](https://github.com/puppetlabs/puppet/blob/master/lib/puppet/file_serving/base.rb)
-        # Puppet 2.7 and beyond will have Puppet::Util.absolute_path? Fall back to a back-ported implementation otherwise.
-        if Puppet::Util.respond_to?(:absolute_path?) then
-          unless Puppet::Util.absolute_path?(path, :posix) or Puppet::Util.absolute_path?(path, :windows)
-            raise Puppet::ParseError, ("#{path.inspect} is not an absolute path.")
-          end
-        else
-          # This code back-ported from 2.7.x's lib/puppet/util.rb Puppet::Util.absolute_path?
-          # Determine in a platform-specific way whether a path is absolute. This
-          # defaults to the local platform if none is specified.
-          # Escape once for the string literal, and once for the regex.
-          slash = '[\\\\/]'
-          name = '[^\\\\/]+'
-          regexes = {
-            :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
-            :posix => %r!^/!,
-          }
-          rval = (!!(path =~ regexes[:posix])) || (!!(path =~ regexes[:windows]))
-          rval or raise Puppet::ParseError, ("#{path.inspect} is not an absolute path.")
+        unless function_is_absolute_path([path])
+          raise Puppet::ParseError, ("#{path.inspect} is not an absolute path.")
         end
       end
     end
-- 
cgit v1.2.3


From 35b5d6bcc1c0d306eab50280b115e1e3a11671e0 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Fri, 18 Dec 2015 17:38:04 +0000
Subject: Allow package_provider fact to resolve on PE 3.x

PE 3.x emits a puppetversion fact in the format "3.x.x (Puppet Enterprise 3.x.x)". This fact causes an error when invoked on PE 3.x: Could not retrieve fact='package_provider', resolution='<anonymous>': Malformed version number string 3.8.1 (Puppet Enterprise 3.8.1

This fix has been tested on PE 3.8.2 and should work for PE 3.3, 3.7, and 3.8.

Original-fix-by: Alex Harden <aharden@gmail.com>
---
 lib/facter/package_provider.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/package_provider.rb b/lib/facter/package_provider.rb
index 65a2da0..1a0bac9 100644
--- a/lib/facter/package_provider.rb
+++ b/lib/facter/package_provider.rb
@@ -12,7 +12,7 @@ require 'puppet/type/package'
 
 Facter.add(:package_provider) do
   setcode do
-    if Gem::Version.new(Facter.value(:puppetversion)) >= Gem::Version.new('3.6')
+    if Gem::Version.new(Facter.value(:puppetversion).split(' ')[0]) >= Gem::Version.new('3.6')
       Puppet::Type.type(:package).newpackage(:name => 'dummy', :allow_virtual => 'true')[:provider].to_s
     else
       Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
-- 
cgit v1.2.3


From 27782242bc27dced7bed316a01c21fffd94e34f8 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 18 Nov 2015 14:32:24 +0300
Subject: Add clamp function

Clamp keeps value within the range.
Employ of soft() makes the whole thing is independant of order.
---
 lib/puppet/parser/functions/clamp.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 lib/puppet/parser/functions/clamp.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/clamp.rb b/lib/puppet/parser/functions/clamp.rb
new file mode 100644
index 0000000..432c7c1
--- /dev/null
+++ b/lib/puppet/parser/functions/clamp.rb
@@ -0,0 +1,30 @@
+#
+# clamp.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:clamp, :type => :rvalue, :arity => -2, :doc => <<-EOS
+    Clamps value to a range.
+    EOS
+  ) do |args|
+
+    args.flatten!
+
+    raise(Puppet::ParseError, 'clamp(): Wrong number of arguments, ' +
+          'need three to clamp') if args.size != 3
+
+    # check values out
+    args.each do |value|
+      case [value.class]
+        when [String]
+          raise(Puppet::ParseError, "clamp(): Required explicit numeric (#{value}:String)") unless value =~ /^\d+$/
+        when [Hash]
+          raise(Puppet::ParseError, "clamp(): The Hash type is not allowed (#{value})")
+      end
+    end
+
+    # convert to numeric each element
+    # then sort them and get a middle value
+    args.map{ |n| n.to_i }.sort[1]
+  end
+end
-- 
cgit v1.2.3


From 97320ab42121a10b76c642b8378c82a888148e4b Mon Sep 17 00:00:00 2001
From: Matt Bostock <matt@mattbostock.com>
Date: Mon, 23 Nov 2015 23:45:23 +0000
Subject: Add a function to validate an x509 RSA key pair

Add a function to validate an x509 RSA certificate and key pair, as
commonly used for TLS certificates.

The rationale behind this is that we store our TLS certificates and
private keys in Hiera YAML files, and poor indentation or formatting in
the YAML file could cause a valid certificate to be considered invalid.

Will cause the Puppet run to fail if:

- an invalid certificate is detected
- an invalid RSA key is detected
- the certificate does not match the key, i.e. the certificate
  has not been signed by the supplied key

The test certificates I've used in the spec tests were generated using
the Go standard library:

    $ go run $GOROOT/src/crypto/tls/generate_cert.go -host localhost

Example output:

    ==> cache-1.router: Error: Not a valid RSA key: Neither PUB key nor PRIV key:: nested asn1 error at /var/govuk/puppet/modules/nginx/manifests/config/ssl.pp:30 on node cache-1.router.dev.gov.uk
---
 .../parser/functions/validate_x509_rsa_key_pair.rb | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 lib/puppet/parser/functions/validate_x509_rsa_key_pair.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_x509_rsa_key_pair.rb b/lib/puppet/parser/functions/validate_x509_rsa_key_pair.rb
new file mode 100644
index 0000000..fc9f23f
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_x509_rsa_key_pair.rb
@@ -0,0 +1,47 @@
+module Puppet::Parser::Functions
+
+  newfunction(:validate_x509_rsa_key_pair, :doc => <<-ENDHEREDOC
+    Validates a PEM-formatted X.509 certificate and RSA private key using
+    OpenSSL. Verifies that the certficate's signature was created from the
+    supplied key.
+
+    Fail compilation if any value fails this check.
+
+    validate_x509_rsa_key_pair($cert, $key)
+
+    ENDHEREDOC
+  ) do |args|
+
+    require 'openssl'
+
+    NUM_ARGS = 2 unless defined? NUM_ARGS
+
+    unless args.length == NUM_ARGS then
+      raise Puppet::ParseError,
+        ("validate_x509_rsa_key_pair(): wrong number of arguments (#{args.length}; must be #{NUM_ARGS})")
+    end
+
+    args.each do |arg|
+      unless arg.is_a?(String)
+        raise Puppet::ParseError, "#{arg.inspect} is not a string."
+      end
+    end
+
+    begin
+      cert = OpenSSL::X509::Certificate.new(args[0])
+    rescue OpenSSL::X509::CertificateError => e
+      raise Puppet::ParseError, "Not a valid x509 certificate: #{e}"
+    end
+
+    begin
+      key = OpenSSL::PKey::RSA.new(args[1])
+    rescue OpenSSL::PKey::RSAError => e
+      raise Puppet::ParseError, "Not a valid RSA key: #{e}"
+    end
+
+    unless cert.verify(key)
+      raise Puppet::ParseError, "Certificate signature does not match supplied key"
+    end
+  end
+
+end
-- 
cgit v1.2.3


From b7df76cf7acf5924f169e1458f0a53248fc81c08 Mon Sep 17 00:00:00 2001
From: Matt Bostock <matt@mattbostock.com>
Date: Tue, 19 Jan 2016 16:22:01 +0000
Subject: Fix reference to validate_bool in function

The documentation in `validate_ip_address` references `validate_bool`,
but I believe this should read `validate_ip_address` instead, which
makes more sense.

Looks like this was copied from `validate_ipv4_address`, which I fixed
in 7b068781.
---
 lib/puppet/parser/functions/validate_ip_address.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_ip_address.rb b/lib/puppet/parser/functions/validate_ip_address.rb
index c0baf82..64fbd75 100644
--- a/lib/puppet/parser/functions/validate_ip_address.rb
+++ b/lib/puppet/parser/functions/validate_ip_address.rb
@@ -7,12 +7,12 @@ module Puppet::Parser::Functions
     The following values will pass:
     $my_ip = "1.2.3.4"
     validate_ip_address($my_ip)
-    validate_bool("8.8.8.8", "172.16.0.1", $my_ip)
+    validate_ip_address("8.8.8.8", "172.16.0.1", $my_ip)
     
     $my_ip = "3ffe:505:2"
     validate_ip_address(1)
     validate_ip_address($my_ip)
-    validate_bool("fe80::baf6:b1ff:fe19:7507", $my_ip)
+    validate_ip_address("fe80::baf6:b1ff:fe19:7507", $my_ip)
    
     The following values will fail, causing compilation to abort:
     $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
-- 
cgit v1.2.3


From d85aec41a3b57a13f16086cc1ff7ed2fe09602b8 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 22 Jan 2016 17:55:03 +0100
Subject: Add is_ipv4_address and is_ipv6_address functions

These are useful when making decisions based on the type of IP
address received.
---
 lib/puppet/parser/functions/is_ipv4_address.rb | 28 ++++++++++++++++++++++++++
 lib/puppet/parser/functions/is_ipv6_address.rb | 28 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 lib/puppet/parser/functions/is_ipv4_address.rb
 create mode 100644 lib/puppet/parser/functions/is_ipv6_address.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_ipv4_address.rb b/lib/puppet/parser/functions/is_ipv4_address.rb
new file mode 100644
index 0000000..b4861d5
--- /dev/null
+++ b/lib/puppet/parser/functions/is_ipv4_address.rb
@@ -0,0 +1,28 @@
+#
+# is_ipv4_address.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:is_ipv4_address, :type => :rvalue, :doc => <<-EOS
+Returns true if the string passed to this function is a valid IPv4 address.
+    EOS
+  ) do |arguments|
+
+    require 'ipaddr'
+
+    if (arguments.size != 1) then
+      raise(Puppet::ParseError, "is_ipv4_address(): Wrong number of arguments "+
+        "given #{arguments.size} for 1")
+    end
+
+    begin
+      ip = IPAddr.new(arguments[0])
+    rescue ArgumentError
+      return false
+    end
+
+    return ip.ipv4?
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/is_ipv6_address.rb b/lib/puppet/parser/functions/is_ipv6_address.rb
new file mode 100644
index 0000000..475ad50
--- /dev/null
+++ b/lib/puppet/parser/functions/is_ipv6_address.rb
@@ -0,0 +1,28 @@
+#
+# is_ipv6_address.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:is_ipv6_address, :type => :rvalue, :doc => <<-EOS
+Returns true if the string passed to this function is a valid IPv6 address.
+    EOS
+  ) do |arguments|
+
+    require 'ipaddr'
+
+    if (arguments.size != 1) then
+      raise(Puppet::ParseError, "is_ipv6_address(): Wrong number of arguments "+
+        "given #{arguments.size} for 1")
+    end
+
+    begin
+      ip = IPAddr.new(arguments[0])
+    rescue ArgumentError
+      return false
+    end
+
+    return ip.ipv6?
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From 3169a43f4c24d01c64c90ab9537da284f587c726 Mon Sep 17 00:00:00 2001
From: Maksym Melnychok <maksym@yelp.com>
Date: Mon, 8 Feb 2016 07:50:35 -0800
Subject: Add dig() function

Deprecates #try_get_value()
---
 lib/puppet/parser/functions/dig.rb           | 54 ++++++++++++++++++++++++++++
 lib/puppet/parser/functions/try_get_value.rb | 44 ++++++-----------------
 2 files changed, 64 insertions(+), 34 deletions(-)
 create mode 100644 lib/puppet/parser/functions/dig.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dig.rb b/lib/puppet/parser/functions/dig.rb
new file mode 100644
index 0000000..a9aa770
--- /dev/null
+++ b/lib/puppet/parser/functions/dig.rb
@@ -0,0 +1,54 @@
+#
+# dig.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:dig, :type => :rvalue, :doc => <<-EOS
+Looks up into a complex structure of arrays and hashes and returns nil
+or the default value if nothing was found.
+
+Path is an array of keys to be looked up in data argument. The function
+will go down the structure and try to extract the required value.
+
+$data = {
+  'a' => {
+    'b' => [
+      'b1',
+      'b2',
+      'b3' ]}}
+
+$value = dig($data, ['a', 'b', '2'], 'not_found')
+=> $value = 'b3'
+
+a -> first hash key
+b -> second hash key
+2 -> array index starting with 0
+
+not_found -> (optional) will be returned if there is no value or the path
+did not match. Defaults to nil.
+
+In addition to the required "path" argument, "dig" accepts default
+argument. It will be returned if no value was found or a path component is
+missing. And the fourth argument can set a variable path separator.
+    EOS
+             ) do |arguments|
+    # Two arguments are required
+    raise(Puppet::ParseError, "dig(): Wrong number of arguments " +
+                              "given (#{arguments.size} for at least 2)") if arguments.size < 2
+
+    data, path, default = *arguments
+
+    if !(data.is_a?(Hash) || data.is_a?(Array))
+      raise(Puppet::ParseError, "dig(): first argument must be a hash or an array, " <<
+                                "given #{data.class.name}")
+    end
+
+    unless path.is_a? Array
+      raise(Puppet::ParseError, "dig(): second argument must be an array, " <<
+                                "given #{path.class.name}")
+    end
+
+    value = path.reduce(data) { |h, k| (h.is_a?(Hash) || h.is_a?(Array)) ? h[k] : break }
+    value.nil? ? default : value
+  end
+end
diff --git a/lib/puppet/parser/functions/try_get_value.rb b/lib/puppet/parser/functions/try_get_value.rb
index 0c19fd9..fc19a23 100644
--- a/lib/puppet/parser/functions/try_get_value.rb
+++ b/lib/puppet/parser/functions/try_get_value.rb
@@ -4,6 +4,8 @@ module Puppet::Parser::Functions
       :type => :rvalue,
       :arity => -2,
       :doc => <<-eos
+DEPRECATED: this function is deprecated, please use dig() instead.
+
 Looks up into a complex structure of arrays and hashes and returns a value
 or the default value if nothing was found.
 
@@ -35,43 +37,17 @@ argument. It will be returned if no value was found or a path component is
 missing. And the fourth argument can set a variable path separator.
   eos
   ) do |args|
-    path_lookup = lambda do |data, path, default|
-      debug "Try_get_value: #{path.inspect} from: #{data.inspect}"
-      if data.nil?
-        debug "Try_get_value: no data, return default: #{default.inspect}"
-        break default
-      end
-      unless path.is_a? Array
-        debug "Try_get_value: wrong path, return default: #{default.inspect}"
-        break default
-      end
-      unless path.any?
-        debug "Try_get_value: value found, return data: #{data.inspect}"
-        break data
-      end
-      unless data.is_a? Hash or data.is_a? Array
-        debug "Try_get_value: incorrect data, return default: #{default.inspect}"
-        break default
-      end
-
-      key = path.shift
-      if data.is_a? Array
-        begin
-          key = Integer key
-        rescue ArgumentError
-          debug "Try_get_value: non-numeric path for an array, return default: #{default.inspect}"
-          break default
-        end
-      end
-      path_lookup.call data[key], path, default
-    end
-
+    warning("try_get_value() DEPRECATED: this function is deprecated, please use dig() instead.")
     data = args[0]
     path = args[1] || ''
     default = args[2]
-    separator = args[3] || '/'
 
-    path = path.split separator
-    path_lookup.call data, path, default
+    if !(data.is_a?(Hash) || data.is_a?(Array)) || path == ''
+      return default || data
+    end
+
+    separator = args[3] || '/'
+    path = path.split(separator).map{ |key| key =~ /^\d+$/ ? key.to_i : key }
+    function_dig([data, path, default])
   end
 end
-- 
cgit v1.2.3


From dc64e721ee0e5e49dd3b446aa3c90dab19654c21 Mon Sep 17 00:00:00 2001
From: guessi <guessi@gmail.com>
Date: Wed, 17 Feb 2016 17:00:41 +0800
Subject: Extend Base64() function support

---
 lib/puppet/parser/functions/base64.rb | 41 ++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/base64.rb b/lib/puppet/parser/functions/base64.rb
index 617ba31..a8998f2 100644
--- a/lib/puppet/parser/functions/base64.rb
+++ b/lib/puppet/parser/functions/base64.rb
@@ -6,14 +6,19 @@ module Puppet::Parser::Functions
 
     Usage:
 
-      $encodestring = base64('encode','thestring')
-      $decodestring = base64('decode','dGhlc3RyaW5n')
+      $encodestring = base64('encode', 'thestring')
+      $decodestring = base64('decode', 'dGhlc3RyaW5n')
+
+      # explicitly define encode/decode method: default, strict, urlsafe
+      $method = 'default'
+      $encodestring = base64('encode', 'thestring', $method)
+      $decodestring = base64('decode', 'dGhlc3RyaW5n', $method)
 
     ENDHEREDOC
 
     require 'base64'
 
-    raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be = 2)") unless args.length == 2
+    raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be >= 2)") unless args.length >= 2
 
     actions = ['encode','decode']
 
@@ -25,11 +30,37 @@ module Puppet::Parser::Functions
       raise Puppet::ParseError, ("base64(): the second argument must be a string to base64")
     end
 
+    method = ['default','strict','urlsafe']
+
+    if args.length <= 2
+      chosenMethod = 'default'
+    else
+      chosenMethod = args[2]
+    end
+
+    unless method.include?(chosenMethod)
+      raise Puppet::ParseError, ("base64(): the third argument must be one of 'default', 'strict', or 'urlsafe'")
+    end
+
     case args[0]
       when 'encode'
-        result = Base64.encode64(args[1])
+        case chosenMethod
+          when 'default'
+            result = Base64.encode64(args[1])
+          when 'strict'
+            result = Base64.strict_encode64(args[1])
+          when 'urlsafe'
+            result = Base64.urlsafe_encode64(args[1])
+        end
       when 'decode'
-        result = Base64.decode64(args[1])
+        case chosenMethod
+          when 'default'
+            result = Base64.decode64(args[1])
+          when 'strict'
+            result = Base64.strict_decode64(args[1])
+          when 'urlsafe'
+            result = Base64.urlsafe_decode64(args[1])
+        end
     end
 
     return result
-- 
cgit v1.2.3


From 0378336f9cefea65675d03f1d7107c75cb950fb6 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Sun, 13 Mar 2016 18:20:49 -0400
Subject: Add enclose_ipv6 function

Copy a function from puppetlabs/apache, created by Benedikt Bock by
55cc3b4e8f4bc859a1255cb57be2c7923005d822 .

This function enclose IPv6 addresses in square brackets.
It takes an array of ip addresses and encloses the ipv6 addresses with
square brackets.

Co-Authored-By: Benedikt Bock <benedikt_bock@web.de>
---
 lib/puppet/parser/functions/enclose_ipv6.rb | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 lib/puppet/parser/functions/enclose_ipv6.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/enclose_ipv6.rb b/lib/puppet/parser/functions/enclose_ipv6.rb
new file mode 100644
index 0000000..80ffc3a
--- /dev/null
+++ b/lib/puppet/parser/functions/enclose_ipv6.rb
@@ -0,0 +1,45 @@
+#
+# enclose_ipv6.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:enclose_ipv6, :type => :rvalue, :doc => <<-EOS
+Takes an array of ip addresses and encloses the ipv6 addresses with square brackets.
+    EOS
+  ) do |arguments|
+
+    require 'ipaddr'
+
+    rescuable_exceptions = [ ArgumentError ]
+    if defined?(IPAddr::InvalidAddressError)
+	    rescuable_exceptions << IPAddr::InvalidAddressError
+    end
+
+    if (arguments.size != 1) then
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
+        "given #{arguments.size} for 1")
+    end
+    unless arguments[0].is_a?(String) or arguments[0].is_a?(Array) then
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type "+
+        "given #{arguments[0].class} expected String or Array")
+    end
+
+    input = [arguments[0]].flatten.compact
+    result = []
+
+    input.each do |val|
+      unless val == '*'
+        begin
+          ip = IPAddr.new(val)
+        rescue *rescuable_exceptions
+          raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
+                "given #{val} is not an ip address.")
+        end
+        val = "[#{ip.to_s}]" if ip.ipv6?
+      end
+      result << val
+    end
+
+    return result.uniq
+  end
+end
-- 
cgit v1.2.3


From 0da9ca7e4a78df49c08873f55caf7c88cdd9bc32 Mon Sep 17 00:00:00 2001
From: Nikhil Yadav <nikhil.yadav@amdocs.com>
Date: Thu, 10 Mar 2016 10:33:35 +0530
Subject: Add ensure_resources() function

New function "ensure_resources()" to support passing hash as parameter OR from hiera backend

This new function is extension of ensure_resource() which will now support to pass multiple values as hash/array OR from hiera backend variables in title argument with additional parameters needed.

It will
process multiple values for a resource type from the passed argument & pass each entry (type, title, params) to ensure_resource() in required format for further processing.
Now user can have duplicate resource check functionality extended to multiple entries with this new function.

Use:
For multiple resources using
hash:
ensure_resources('user', {'dan' => { gid => 'mygroup', uid =>'600' } ,  'alex' => { gid => 'mygroup' }}, {'ensure' =>'present'})

From Hiera Backend:

userlist:
  dan:
    gid: 'mygroup'

uid: '600'
  alex:
 gid: 'mygroup'

Call:
ensure_resources('user',hiera_hash('userlist'), {'ensure' => 'present'})

ensure_packages()
Modified to also support Hash type argument for packages

This modification will call newly added ensure_resources() for processing Hash as second argument.
The original functionality remains same for Array type arguments.

Use:
hiera:

packagelist:
  ksh:
    ensure: latest
  mlocate: {}
  myrpm:
    provider: rpm
    source: "/tmp/myrpm-1.0.0.x86_64.rpm"
    install_options:
      --prefix:
        /users/home
  openssl:
    provider: rpm
    source: "/tmp/openssl-1.0.1e-42.el7.x86_64.rpm"

Call:
ensure_packages($packagelist)
---
 lib/puppet/parser/functions/ensure_packages.rb  | 27 +++++++++----
 lib/puppet/parser/functions/ensure_resources.rb | 54 +++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 lib/puppet/parser/functions/ensure_resources.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/ensure_packages.rb b/lib/puppet/parser/functions/ensure_packages.rb
index f1da4aa..532b702 100644
--- a/lib/puppet/parser/functions/ensure_packages.rb
+++ b/lib/puppet/parser/functions/ensure_packages.rb
@@ -17,18 +17,29 @@ third argument to the ensure_resource() function.
       raise(Puppet::ParseError, 'ensure_packages(): Requires second argument to be a Hash')
     end
 
-    packages = Array(arguments[0])
+    if arguments[0].is_a?(Hash)
+      if arguments[1]
+        defaults = { 'ensure' => 'present' }.merge(arguments[1])
+      else
+        defaults = { 'ensure' => 'present' }
+      end
 
-    if arguments[1]
-      defaults = { 'ensure' => 'present' }.merge(arguments[1])
+      Puppet::Parser::Functions.function(:ensure_resources)
+      function_ensure_resources(['package', Hash(arguments[0]), defaults ])
     else
-      defaults = { 'ensure' => 'present' }
-    end
+      packages = Array(arguments[0])
+
+      if arguments[1]
+        defaults = { 'ensure' => 'present' }.merge(arguments[1])
+      else
+        defaults = { 'ensure' => 'present' }
+      end
 
-    Puppet::Parser::Functions.function(:ensure_resource)
-    packages.each { |package_name|
-      function_ensure_resource(['package', package_name, defaults ])
+      Puppet::Parser::Functions.function(:ensure_resource)
+      packages.each { |package_name|
+        function_ensure_resource(['package', package_name, defaults ])
     }
+    end
   end
 end
 
diff --git a/lib/puppet/parser/functions/ensure_resources.rb b/lib/puppet/parser/functions/ensure_resources.rb
new file mode 100644
index 0000000..30d57a8
--- /dev/null
+++ b/lib/puppet/parser/functions/ensure_resources.rb
@@ -0,0 +1,54 @@
+require 'puppet/parser/functions'
+
+Puppet::Parser::Functions.newfunction(:ensure_resources,
+                                      :type => :statement,
+                                      :doc => <<-'ENDOFDOC'
+Takes a resource type, title (only hash), and a list of attributes that describe a
+resource.
+
+    user { 'dan':
+      gid => 'mygroup',
+      ensure => present,
+    }
+
+An hash of resources should be passed in and each will be created with
+the type and parameters specified if it doesn't already exist.
+
+    ensure_resources('user', {'dan' => { gid => 'mygroup', uid => '600' } ,  'alex' => { gid => 'mygroup' }}, {'ensure' => 'present'})
+
+From Hiera Backend:
+
+userlist:
+  dan:
+    gid: 'mygroup'
+ uid: '600'
+  alex:
+ gid: 'mygroup'
+
+Call:
+ensure_resources('user', hiera_hash('userlist'), {'ensure' => 'present'})
+
+ENDOFDOC
+) do |vals|
+  type, title, params = vals
+  raise(ArgumentError, 'Must specify a type') unless type
+  raise(ArgumentError, 'Must specify a title') unless title
+  params ||= {}
+
+  if title.is_a?(Hash)
+    resource_hash = Hash(title)
+    resources = resource_hash.keys
+
+    Puppet::Parser::Functions.function(:ensure_resource)
+    resources.each { |resource_name|
+    if resource_hash[resource_name]
+        params_merged = params.merge(resource_hash[resource_name])
+    else
+        params_merged = params
+    end
+    function_ensure_resource([ type, resource_name, params_merged ])
+    }
+  else
+       raise(Puppet::ParseError, 'ensure_resources(): Requires second argument to be a Hash')
+  end
+end
-- 
cgit v1.2.3


From be6d4d2ffb461a131cdeba6014ca9ac02bddc9d5 Mon Sep 17 00:00:00 2001
From: Sledge Sulaweyo <sledge.sulaweyo@gmail.com>
Date: Thu, 17 Mar 2016 07:36:44 +0100
Subject: Add check if Gem is defined

On e.g. Ubuntu 12.04 LTS Gem is not there by default so i added a check to not fail in that fact if this is the case.
---
 lib/facter/package_provider.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/facter/package_provider.rb b/lib/facter/package_provider.rb
index 1a0bac9..3a9117f 100644
--- a/lib/facter/package_provider.rb
+++ b/lib/facter/package_provider.rb
@@ -12,7 +12,7 @@ require 'puppet/type/package'
 
 Facter.add(:package_provider) do
   setcode do
-    if Gem::Version.new(Facter.value(:puppetversion).split(' ')[0]) >= Gem::Version.new('3.6')
+    if defined? Gem and Gem::Version.new(Facter.value(:puppetversion).split(' ')[0]) >= Gem::Version.new('3.6')
       Puppet::Type.type(:package).newpackage(:name => 'dummy', :allow_virtual => 'true')[:provider].to_s
     else
       Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
-- 
cgit v1.2.3


From 85ff2a28a83984c827985181d58c55ca8c524ed6 Mon Sep 17 00:00:00 2001
From: Reinhard Vicinus <r.vicinus@metaways.de>
Date: Tue, 22 Mar 2016 15:06:31 +0100
Subject: improve suffix function to support the same feature set as prefix

---
 lib/puppet/parser/functions/suffix.rb | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/suffix.rb b/lib/puppet/parser/functions/suffix.rb
index f7792d6..2908434 100644
--- a/lib/puppet/parser/functions/suffix.rb
+++ b/lib/puppet/parser/functions/suffix.rb
@@ -4,7 +4,8 @@
 
 module Puppet::Parser::Functions
   newfunction(:suffix, :type => :rvalue, :doc => <<-EOS
-This function applies a suffix to all elements in an array.
+This function applies a suffix to all elements in an array, or to the keys
+in a hash.
 
 *Examples:*
 
@@ -18,10 +19,10 @@ Will return: ['ap','bp','cp']
     raise(Puppet::ParseError, "suffix(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
-    array = arguments[0]
+    enumerable = arguments[0]
 
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "suffix(): expected first argument to be an Array, got #{array.inspect}"
+    unless enumerable.is_a?(Array) or enumerable.is_a?(Hash)
+      raise Puppet::ParseError, "suffix(): expected first argument to be an Array or a Hash, got #{enumerable.inspect}"
     end
 
     suffix = arguments[1] if arguments[1]
@@ -32,10 +33,17 @@ Will return: ['ap','bp','cp']
       end
     end
 
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      suffix ? i + suffix : i
+    if enumerable.is_a?(Array)
+      # Turn everything into string same as join would do ...
+      result = enumerable.collect do |i|
+        i = i.to_s
+        suffix ? i + suffix : i
+      end
+    else
+      result = Hash[enumerable.map do |k,v|
+        k = k.to_s
+        [ suffix ? k + suffix : k, v ]
+      end]
     end
 
     return result
-- 
cgit v1.2.3


From 7e408ca7970fd172822db02227935798f9ff282f Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@oracle.com>
Date: Mon, 28 Mar 2016 20:59:27 +0000
Subject: [MODULES-2370] file_line.rb: Fix `line` attribute validation

`file_line` type: During validation, do not require `line` attribute if:
* `ensure` is `absent`,
* `match` is not empty,
* and `match_for_absence` is `true`.

Also update `spec` tests to reflect this.
---
 lib/puppet/type/file_line.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 77d3be2..f2c6937 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -111,8 +111,13 @@ Puppet::Type.newtype(:file_line) do
   end
 
   validate do
-    unless self[:line] and self[:path]
-      raise(Puppet::Error, "Both line and path are required attributes")
+    unless self[:line]
+      unless (self[:ensure].to_s == 'absent') and (self[:match_for_absence].to_s == 'true') and self[:match]
+        raise(Puppet::Error, "line is a required attribute")
+      end
+    end
+    unless self[:path]
+      raise(Puppet::Error, "path is a required attribute")
     end
   end
 end
-- 
cgit v1.2.3


From 0cea94a82ef277092897a03446f6e6fccba90d53 Mon Sep 17 00:00:00 2001
From: Felix Frank <Felix.Frank@Alumni.TU-Berlin.de>
Date: Tue, 29 Mar 2016 01:59:54 +0200
Subject: catch StandardError rather than the gratuitous Exception

---
 lib/facter/facter_dot_d.rb                  | 8 ++++----
 lib/puppet/parser/functions/hash.rb         | 2 +-
 lib/puppet/parser/functions/parsejson.rb    | 2 +-
 lib/puppet/parser/functions/parseyaml.rb    | 2 +-
 lib/puppet/parser/functions/validate_cmd.rb | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb
index d85940d..5c5fb1f 100644
--- a/lib/facter/facter_dot_d.rb
+++ b/lib/facter/facter_dot_d.rb
@@ -48,7 +48,7 @@ class Facter::Util::DotD
         end
       end
     end
-  rescue Exception => e
+  rescue StandardError => e
     Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
   end
 
@@ -65,7 +65,7 @@ class Facter::Util::DotD
         setcode { v }
       end
     end
-  rescue Exception => e
+  rescue StandardError => e
     Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
   end
 
@@ -77,7 +77,7 @@ class Facter::Util::DotD
         setcode { v }
       end
     end
-  rescue Exception => e
+  rescue StandardError => e
     Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
   end
 
@@ -106,7 +106,7 @@ class Facter::Util::DotD
         end
       end
     end
-  rescue Exception => e
+  rescue StandardError => e
     Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
     Facter.debug(e.backtrace.join("\n\t"))
   end
diff --git a/lib/puppet/parser/functions/hash.rb b/lib/puppet/parser/functions/hash.rb
index 8cc4823..89d0e07 100644
--- a/lib/puppet/parser/functions/hash.rb
+++ b/lib/puppet/parser/functions/hash.rb
@@ -29,7 +29,7 @@ Would return: {'a'=>1,'b'=>2,'c'=>3}
       # This is to make it compatible with older version of Ruby ...
       array  = array.flatten
       result = Hash[*array]
-    rescue Exception
+    rescue StandardError
       raise(Puppet::ParseError, 'hash(): Unable to compute ' +
         'hash from array given')
     end
diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb
index b4af40e..f7c2896 100644
--- a/lib/puppet/parser/functions/parsejson.rb
+++ b/lib/puppet/parser/functions/parsejson.rb
@@ -15,7 +15,7 @@ be returned if the parsing of YAML string have failed.
 
     begin
       PSON::load(arguments[0]) || arguments[1]
-    rescue Exception => e
+    rescue StandardError => e
       if arguments[1]
         arguments[1]
       else
diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb
index 66d0413..9e84055 100644
--- a/lib/puppet/parser/functions/parseyaml.rb
+++ b/lib/puppet/parser/functions/parseyaml.rb
@@ -16,7 +16,7 @@ be returned if the parsing of YAML string have failed.
 
     begin
       YAML::load(arguments[0]) || arguments[1]
-    rescue Exception => e
+    rescue StandardError => e
       if arguments[1]
         arguments[1]
       else
diff --git a/lib/puppet/parser/functions/validate_cmd.rb b/lib/puppet/parser/functions/validate_cmd.rb
index 5df3c60..685162b 100644
--- a/lib/puppet/parser/functions/validate_cmd.rb
+++ b/lib/puppet/parser/functions/validate_cmd.rb
@@ -53,7 +53,7 @@ module Puppet::Parser::Functions
     rescue Puppet::ExecutionFailure => detail
       msg += "\n#{detail}"
       raise Puppet::ParseError, msg
-    rescue Exception => detail
+    rescue StandardError => detail
       msg += "\n#{detail.class.name} #{detail}"
       raise Puppet::ParseError, msg
     ensure
-- 
cgit v1.2.3


From 5639828bffd1beb0e44e59554e17c1a891924145 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Thu, 7 Apr 2016 11:47:42 +0100
Subject: (maint) also catch Psych::SyntaxError

Psych::SyntaxError is a RuntimeException. This still needs to
catch that. This was uncovered by the recent move to catch StandardError
rather than the catchall Exception that was here before.
---
 lib/puppet/parser/functions/parseyaml.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/parseyaml.rb b/lib/puppet/parser/functions/parseyaml.rb
index 9e84055..ba9d98a 100644
--- a/lib/puppet/parser/functions/parseyaml.rb
+++ b/lib/puppet/parser/functions/parseyaml.rb
@@ -16,7 +16,10 @@ be returned if the parsing of YAML string have failed.
 
     begin
       YAML::load(arguments[0]) || arguments[1]
-    rescue StandardError => e
+      # in ruby 1.9.3 Psych::SyntaxError is a RuntimeException
+      # this still needs to catch that and work also on rubies that
+      # do not have Psych available.
+    rescue StandardError, Psych::SyntaxError => e
       if arguments[1]
         arguments[1]
       else
-- 
cgit v1.2.3


From 44596e73da1b157ea931d5111f842e108ca203bb Mon Sep 17 00:00:00 2001
From: Alex Tomlins <alex@tomlins.org.uk>
Date: Thu, 7 Apr 2016 22:22:17 +0100
Subject: (MODULES-3246) Fix concat with Hash arguments.

85d5ead Updated the concat function so that it wouldn't modify the
original array. A side-effect of this change is that it now always calls
`Array()` on the second argument. If thit is a Hash, this results in
`to_a` being called on the hash, which converts it to an array or
tuples. This is undesired.

Update the behaviour so that it doesn't (indirectly) call `to_a` on
anything, instead test for the type of the argument, wrapping it in an
array if it's not already an array.
---
 lib/puppet/parser/functions/concat.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/concat.rb b/lib/puppet/parser/functions/concat.rb
index 618e62d..91edb4e 100644
--- a/lib/puppet/parser/functions/concat.rb
+++ b/lib/puppet/parser/functions/concat.rb
@@ -31,7 +31,7 @@ Would result in:
     arguments.shift
 
     arguments.each do |x|
-      result = result + Array(x)
+      result = result + (x.is_a?(Array) ? x : [x])
     end
 
     return result
-- 
cgit v1.2.3


From bfe6cf68b3b09f5927ec8f12f6661f45e9c1be58 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Mon, 28 Mar 2016 13:18:28 -0400
Subject: Add validate_email_address function

---
 lib/puppet/parser/functions/is_email_address.rb    | 21 +++++++++++++++
 .../parser/functions/validate_email_address.rb     | 31 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 lib/puppet/parser/functions/is_email_address.rb
 create mode 100644 lib/puppet/parser/functions/validate_email_address.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_email_address.rb b/lib/puppet/parser/functions/is_email_address.rb
new file mode 100644
index 0000000..ab8d075
--- /dev/null
+++ b/lib/puppet/parser/functions/is_email_address.rb
@@ -0,0 +1,21 @@
+#
+# is_email_address.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:is_email_address, type: :rvalue, doc: <<-EOS
+Returns true if the string passed to this function is a valid email address.
+    EOS
+             ) do |arguments|
+    if arguments.size != 1
+      raise(Puppet::ParseError, 'is_email_address(): Wrong number of arguments '\
+        "given #{arguments.size} for 1")
+    end
+
+    # Taken from http://emailregex.com/ (simpler regex)
+    valid_email_regex = %r{\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z}
+    return (arguments[0] =~ valid_email_regex) == 0
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/validate_email_address.rb b/lib/puppet/parser/functions/validate_email_address.rb
new file mode 100644
index 0000000..63f59a7
--- /dev/null
+++ b/lib/puppet/parser/functions/validate_email_address.rb
@@ -0,0 +1,31 @@
+module Puppet::Parser::Functions
+  newfunction(:validate_email_address, doc: <<-ENDHEREDOC
+    Validate that all values passed are valid email addresses.
+    Fail compilation if any value fails this check.
+    The following values will pass:
+    $my_email = "waldo@gmail.com"
+    validate_email_address($my_email)
+    validate_email_address("bob@gmail.com", "alice@gmail.com", $my_email)
+
+    The following values will fail, causing compilation to abort:
+    $some_array = [ 'bad_email@/d/efdf.com' ]
+    validate_email_address($some_array)
+    ENDHEREDOC
+             ) do |args|
+    rescuable_exceptions = [ArgumentError]
+
+    if args.empty?
+      raise Puppet::ParseError, "validate_email_address(): wrong number of arguments (#{args.length}; must be > 0)"
+    end
+
+    args.each do |arg|
+      raise Puppet::ParseError, "#{arg.inspect} is not a string." unless arg.is_a?(String)
+
+      begin
+        raise Puppet::ParseError, "#{arg.inspect} is not a valid email address" unless function_is_email_address([arg])
+      rescue *rescuable_exceptions
+        raise Puppet::ParseError, "#{arg.inspect} is not a valid email address"
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 0d46515b57cea60d4d5f1e4d81a75a448a7a73a8 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Mon, 11 Apr 2016 22:09:24 -0400
Subject: Add support for regular expressions to delete

---
 lib/puppet/parser/functions/delete.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index f548b44..8435163 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,8 +2,6 @@
 # delete.rb
 #
 
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -34,7 +32,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete item
+          collection.delete_if { |coll_item| coll_item =~ %r{#{item}} }
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From 79c871322f92bd03206ab392f9f2972f3ace97ea Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Mon, 18 Apr 2016 09:46:30 +0100
Subject: (MODULES-3271) Ensure that is_email_address works on unsupported
 rubies

---
 lib/puppet/parser/functions/is_email_address.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_email_address.rb b/lib/puppet/parser/functions/is_email_address.rb
index ab8d075..4fb0229 100644
--- a/lib/puppet/parser/functions/is_email_address.rb
+++ b/lib/puppet/parser/functions/is_email_address.rb
@@ -3,7 +3,7 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:is_email_address, type: :rvalue, doc: <<-EOS
+  newfunction(:is_email_address, :type => :rvalue, :doc => <<-EOS
 Returns true if the string passed to this function is a valid email address.
     EOS
              ) do |arguments|
-- 
cgit v1.2.3


From 232de137f1018060b256b1f3f649be0b6d7d9952 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 25 Apr 2016 14:33:43 -0700
Subject: Revert "Add support for regular expressions to delete"

This reverts commit 0d46515b57cea60d4d5f1e4d81a75a448a7a73a8.

It introduced backwards-incompatible functionality.
---
 lib/puppet/parser/functions/delete.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index 8435163..f548b44 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,6 +2,8 @@
 # delete.rb
 #
 
+# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
+
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -32,7 +34,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete_if { |coll_item| coll_item =~ %r{#{item}} }
+          collection.delete item
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From 870a272cee6889934d60c4bfd7a814bcf47011f1 Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <dilyin@mirantis.com>
Date: Tue, 26 Apr 2016 21:51:43 +0300
Subject: Add the default value to the "loadyaml" function

This value will be returned if the is no file
to load or a file could not be parsed.
It's similar to the "parseyaml" function's
default value.

Add the "loadjson" function too
---
 lib/puppet/parser/functions/loadjson.rb | 34 ++++++++++++++++++++++++++++++
 lib/puppet/parser/functions/loadyaml.rb | 37 ++++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 lib/puppet/parser/functions/loadjson.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/loadjson.rb b/lib/puppet/parser/functions/loadjson.rb
new file mode 100644
index 0000000..3a3372b
--- /dev/null
+++ b/lib/puppet/parser/functions/loadjson.rb
@@ -0,0 +1,34 @@
+module Puppet::Parser::Functions
+  newfunction(:loadjson, :type => :rvalue, :arity => -2, :doc => <<-'ENDHEREDOC') do |args|
+Load a JSON file containing an array, string, or hash, and return the data
+in the corresponding native data type.
+The second parameter is the default value. It will be returned if the file
+was not found or could not be parsed.
+
+For example:
+
+    $myhash = loadjson('/etc/puppet/data/myhash.json')
+    $myhash = loadjson('no-file.json', {'default' => 'value'})
+  ENDHEREDOC
+
+    raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless args.length >= 1
+
+    if File.exists?(args[0])
+      begin
+        content = File.read(args[0])
+        PSON::load(content) || args[1]
+      rescue Exception => e
+        if args[1]
+          args[1]
+        else
+          raise e
+        end
+      end
+    else
+      warning("Can't load '#{args[0]}' File does not exist!")
+      args[1]
+    end
+
+  end
+
+end
diff --git a/lib/puppet/parser/functions/loadyaml.rb b/lib/puppet/parser/functions/loadyaml.rb
index ca655f6..9696362 100644
--- a/lib/puppet/parser/functions/loadyaml.rb
+++ b/lib/puppet/parser/functions/loadyaml.rb
@@ -1,23 +1,32 @@
 module Puppet::Parser::Functions
+  newfunction(:loadyaml, :type => :rvalue, :arity => -2, :doc => <<-'ENDHEREDOC') do |args|
+Load a YAML file containing an array, string, or hash, and return the data
+in the corresponding native data type.
+The second parameter is the default value. It will be returned if the file
+was not found or could not be parsed.
 
-  newfunction(:loadyaml, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Load a YAML file containing an array, string, or hash, and return the data
-    in the corresponding native data type.
+For example:
 
-    For example:
+    $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
+    $myhash = loadyaml('no-file.yaml', {'default' => 'value'})
+  ENDHEREDOC
 
-        $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
-    ENDHEREDOC
+    raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless args.length >= 1
+    require 'yaml'
 
-    unless args.length == 1
-      raise Puppet::ParseError, ("loadyaml(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    if File.exists?(args[0]) then
-      YAML.load_file(args[0])
+    if File.exists?(args[0])
+      begin
+        YAML::load_file(args[0]) || args[1]
+      rescue Exception => e
+        if args[1]
+          args[1]
+        else
+          raise e
+        end
+      end
     else
-      warning("Can't load " + args[0] + ". File does not exist!")
-      nil
+      warning("Can't load '#{args[0]}' File does not exist!")
+      args[1]
     end
 
   end
-- 
cgit v1.2.3


From 9e1f74f3fcac4aeaccade3ea92e6cafbaf71a64f Mon Sep 17 00:00:00 2001
From: Joris <joris@jorisvanderwel.com>
Date: Thu, 28 Apr 2016 19:44:30 +0200
Subject: Expose the functions of ruby's built-in Shellwords module (#580)

* Add shell_escape function, shell_join function & shell_split function
---
 lib/puppet/parser/functions/shell_escape.rb | 30 ++++++++++++++++++++++++++++
 lib/puppet/parser/functions/shell_join.rb   | 31 +++++++++++++++++++++++++++++
 lib/puppet/parser/functions/shell_split.rb  | 26 ++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 lib/puppet/parser/functions/shell_escape.rb
 create mode 100644 lib/puppet/parser/functions/shell_join.rb
 create mode 100644 lib/puppet/parser/functions/shell_split.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/shell_escape.rb b/lib/puppet/parser/functions/shell_escape.rb
new file mode 100644
index 0000000..447fe35
--- /dev/null
+++ b/lib/puppet/parser/functions/shell_escape.rb
@@ -0,0 +1,30 @@
+#
+# shell_escape.rb
+#
+
+require 'shellwords'
+
+module Puppet::Parser::Functions
+  newfunction(:shell_escape, :type => :rvalue, :doc => <<-EOS
+Escapes a string so that it can be safely used in a Bourne shell command line.
+
+Note that the resulting string should be used unquoted and is not intended for use in double quotes nor in single
+quotes.
+
+This function behaves the same as ruby's Shellwords.shellescape() function.
+  EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "shell_escape(): Wrong number of arguments " +
+        "given (#{arguments.size} for 1)") if arguments.size != 1
+
+    # explicit conversion to string is required for ruby 1.9
+    string = arguments[0].to_s
+
+    result = Shellwords.shellescape(string)
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/shell_join.rb b/lib/puppet/parser/functions/shell_join.rb
new file mode 100644
index 0000000..05aeb95
--- /dev/null
+++ b/lib/puppet/parser/functions/shell_join.rb
@@ -0,0 +1,31 @@
+#
+# shell_join.rb
+#
+
+require 'shellwords'
+
+module Puppet::Parser::Functions
+  newfunction(:shell_join, :type => :rvalue, :doc => <<-EOS
+Builds a command line string from the given array of strings. Each array item is escaped for Bourne shell. All items are
+then joined together, with a single space in between.
+
+This function behaves the same as ruby's Shellwords.shelljoin() function
+  EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "shell_join(): Wrong number of arguments " +
+        "given (#{arguments.size} for 1)") if arguments.size != 1
+
+    array = arguments[0]
+
+    raise Puppet::ParseError, ("First argument is not an Array: #{array.inspect}") unless array.is_a?(Array)
+
+    # explicit conversion to string is required for ruby 1.9
+    array = array.map { |item| item.to_s }
+    result = Shellwords.shelljoin(array)
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/shell_split.rb b/lib/puppet/parser/functions/shell_split.rb
new file mode 100644
index 0000000..0446448
--- /dev/null
+++ b/lib/puppet/parser/functions/shell_split.rb
@@ -0,0 +1,26 @@
+#
+# shell_split.rb
+#
+
+require 'shellwords'
+
+module Puppet::Parser::Functions
+  newfunction(:shell_split, :type => :rvalue, :doc => <<-EOS
+Splits a string into an array of tokens in the same way the Bourne shell does.
+
+This function behaves the same as ruby's Shellwords.shellsplit() function
+  EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "shell_split(): Wrong number of arguments " +
+        "given (#{arguments.size} for 1)") if arguments.size != 1
+
+    string = arguments[0].to_s
+
+    result = Shellwords.shellsplit(string)
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From 420f76d8dcb307d363d30bef7cc963bff4f776fc Mon Sep 17 00:00:00 2001
From: Peter Souter <p.morsou@gmail.com>
Date: Wed, 27 Apr 2016 14:06:22 +0100
Subject: (MODULES-1439) Adds any2bool function

* Basically a combination of `string2bool` and `num2bool`
---
 lib/puppet/parser/functions/any2bool.rb | 55 +++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 lib/puppet/parser/functions/any2bool.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/any2bool.rb b/lib/puppet/parser/functions/any2bool.rb
new file mode 100644
index 0000000..f0f8f83
--- /dev/null
+++ b/lib/puppet/parser/functions/any2bool.rb
@@ -0,0 +1,55 @@
+#
+# any2bool.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:any2bool, :type => :rvalue, :doc => <<-EOS
+This converts 'anything' to a boolean. In practise it does the following:
+
+* Strings such as Y,y,1,T,t,TRUE,yes,'true' will return true
+* Strings such as 0,F,f,N,n,FALSE,no,'false' will return false
+* Booleans will just return their original value
+* Number (or a string representation of a number) > 0 will return true, otherwise false
+* undef will return false
+* Anything else will return true
+    EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments " +
+      "given (#{arguments.size} for 1)") if arguments.size < 1
+
+    # If argument is already Boolean, return it
+    if !!arguments[0] == arguments[0]
+      return arguments[0]
+    end
+
+    arg = arguments[0]
+
+    if arg == nil
+      return false
+    end
+
+    if arg == :undef
+      return false
+    end
+
+    valid_float = !!Float(arg) rescue false
+
+    if arg.is_a?(Numeric)
+      return function_num2bool( [ arguments[0] ] )
+    end
+
+    if arg.is_a?(String)
+      if valid_float
+        return function_num2bool( [ arguments[0] ] )
+      else
+        return function_str2bool( [ arguments[0] ] )
+      end
+    end
+
+    return true
+
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From 540546b9b41745bbc4821f9966ae301dc0b5056a Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Tue, 12 Apr 2016 16:53:07 -0400
Subject: Use reject instead of delete_if

---
 lib/puppet/parser/functions/delete.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index f548b44..814e1ad 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,8 +2,6 @@
 # delete.rb
 #
 
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -22,19 +20,23 @@ string, or key from a hash.
 
     delete('abracadabra', 'bra')
     Would return: 'acada'
+
+    delete(['abracadabra'], '^.*bra.*$')
+    Would return: []
+
+    delete(['abracadabra'], '^.*jimbob.*$')
+    Would return: ['abracadabra']
   EOS
   ) do |arguments|
 
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-                                  "given #{arguments.size} for 2.")
-    end
+    raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
+                              "given #{arguments.size} for 2") unless arguments.size == 2
 
     collection = arguments[0].dup
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete item
+          collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From f47df3b4b56c789fe406f23a42aa240d510a1244 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Wed, 11 May 2016 15:52:50 -0400
Subject: (MODULES-3354) Use 1.8.7 hash in validate_email_address function

---
 lib/puppet/parser/functions/validate_email_address.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_email_address.rb b/lib/puppet/parser/functions/validate_email_address.rb
index 63f59a7..ddd0d25 100644
--- a/lib/puppet/parser/functions/validate_email_address.rb
+++ b/lib/puppet/parser/functions/validate_email_address.rb
@@ -1,5 +1,5 @@
 module Puppet::Parser::Functions
-  newfunction(:validate_email_address, doc: <<-ENDHEREDOC
+  newfunction(:validate_email_address, :doc => <<-ENDHEREDOC
     Validate that all values passed are valid email addresses.
     Fail compilation if any value fails this check.
     The following values will pass:
-- 
cgit v1.2.3


From dd71c0288052dd3a96e730ff198f5c0a8d640946 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Wed, 11 May 2016 13:21:24 -0400
Subject: Add a delete_regex function

To maintain backwards compatibility, add a delete_regex function instead
of modifying delete itself.
---
 lib/puppet/parser/functions/delete.rb       |  8 +----
 lib/puppet/parser/functions/delete_regex.rb | 45 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 lib/puppet/parser/functions/delete_regex.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index 814e1ad..466c55c 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -20,12 +20,6 @@ string, or key from a hash.
 
     delete('abracadabra', 'bra')
     Would return: 'acada'
-
-    delete(['abracadabra'], '^.*bra.*$')
-    Would return: []
-
-    delete(['abracadabra'], '^.*jimbob.*$')
-    Would return: ['abracadabra']
   EOS
   ) do |arguments|
 
@@ -36,7 +30,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
+          collection.delete item
         when String
           collection.gsub! item, ''
         else
diff --git a/lib/puppet/parser/functions/delete_regex.rb b/lib/puppet/parser/functions/delete_regex.rb
new file mode 100644
index 0000000..d72b3e9
--- /dev/null
+++ b/lib/puppet/parser/functions/delete_regex.rb
@@ -0,0 +1,45 @@
+#
+# delete_regex.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:delete_regex, :type => :rvalue, :doc => <<-EOS
+deletes all instances of a given element that match a regular expression
+from an array or key from a hash. Multiple regular expressions are assumed
+to be matched as an OR.
+
+*Examples:*
+
+    delete_regex(['a','b','c','b'], 'b')
+    Would return: ['a','c']
+    
+    delete_regex(['a','b','c','b'], ['b', 'c'])
+    Would return: ['a']
+
+    delete_regex({'a'=>1,'b'=>2,'c'=>3}, 'b')
+    Would return: {'a'=>1,'c'=>3}
+
+    delete_regex({'a'=>1,'b'=>2,'c'=>3}, '^a$')
+    Would return: {'b'=>2,'c'=>3}
+
+  EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "delete_regex(): Wrong number of arguments "+
+                              "given #{arguments.size} for 2") unless arguments.size == 2
+
+    collection = arguments[0].dup
+    Array(arguments[1]).each do |item|
+      case collection
+        when Array, Hash, String
+          collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
+        else
+          raise(TypeError, "delete_regex(): First argument must be an Array, " +
+                             "Hash, or String. Given an argument of class #{collection.class}.")
+      end
+    end
+    collection
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From 7b1250478c513a3c02c463ec7cdd62d427957400 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Tue, 28 Jun 2016 16:45:56 -0700
Subject: (MODULES-3507) Updates file_line path validation

---
 lib/puppet/type/file_line.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index f2c6937..a02b514 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -93,8 +93,8 @@ Puppet::Type.newtype(:file_line) do
   newparam(:path) do
     desc 'The file Puppet will ensure contains the line specified by the line parameter.'
     validate do |value|
-      unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/))
-        raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'")
+      unless Puppet::Util.absolute_path?(value)
+        raise Puppet::Error, "File paths must be fully qualified, not '#{value}'"
       end
     end
   end
-- 
cgit v1.2.3


From af875b11ff284cfe2ea95d208a614576a4342b2c Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Wed, 29 Jun 2016 21:33:00 +0100
Subject: (MODULES-3543) Fix define_with_params to handle undef properly

As described in PUP-6422,

	ensure_resources('File[/tmp/a]', { owner => undef })

would not actually create the file. This fixes it, and adds tests to prove
it.
---
 lib/puppet/parser/functions/defined_with_params.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb
index d7df306..ffc7241 100644
--- a/lib/puppet/parser/functions/defined_with_params.rb
+++ b/lib/puppet/parser/functions/defined_with_params.rb
@@ -26,7 +26,7 @@ ENDOFDOC
   ret = false
   if resource = findresource(reference.to_s)
     matches = params.collect do |key, value|
-      resource[key] == value
+      resource[key] == (value.eql?(:undef) ? nil : value)  # eql? avoids bugs caused by monkeypatching in puppet
     end
     ret = params.empty? || !matches.include?(false)
   end
-- 
cgit v1.2.3


From 3f86e3a731b9e1be943a55fa12bd5e32716a20ef Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Thu, 30 Jun 2016 11:06:56 +0100
Subject: (MODULES-3543) Fixup defined_with_params to work on all puppet
 versions

---
 lib/puppet/parser/functions/defined_with_params.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb
index ffc7241..99687ae 100644
--- a/lib/puppet/parser/functions/defined_with_params.rb
+++ b/lib/puppet/parser/functions/defined_with_params.rb
@@ -26,7 +26,10 @@ ENDOFDOC
   ret = false
   if resource = findresource(reference.to_s)
     matches = params.collect do |key, value|
-      resource[key] == (value.eql?(:undef) ? nil : value)  # eql? avoids bugs caused by monkeypatching in puppet
+      # eql? avoids bugs caused by monkeypatching in puppet
+      resource_is_undef = resource[key].eql?(:undef) || resource[key].nil?
+      value_is_undef = value.eql?(:undef) || value.nil?
+      (resource_is_undef && value_is_undef) || (resource[key] == value)
     end
     ret = params.empty? || !matches.include?(false)
   end
-- 
cgit v1.2.3


From a2f980d44d6703561769c5e0ef25a7f531417643 Mon Sep 17 00:00:00 2001
From: Nate Potter <ntpttr@gmail.com>
Date: Thu, 7 Jul 2016 21:10:22 -0700
Subject: (MODULES-3568) Move dig to dig44 and deprecate dig

A new version of dig was introduced in Puppet 4.5.0 that
isn't compatible with the stdlib version of dig. To maintain
backwards compatibility and ensure that tests for stdlib aren't
broken, this patch renames dig to dig44 and adds a deprecation
warning to the stdlib dig function.
---
 lib/puppet/parser/functions/dig.rb   | 50 ++++----------------------------
 lib/puppet/parser/functions/dig44.rb | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 44 deletions(-)
 create mode 100644 lib/puppet/parser/functions/dig44.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dig.rb b/lib/puppet/parser/functions/dig.rb
index a9aa770..34fa701 100644
--- a/lib/puppet/parser/functions/dig.rb
+++ b/lib/puppet/parser/functions/dig.rb
@@ -4,51 +4,13 @@
 
 module Puppet::Parser::Functions
   newfunction(:dig, :type => :rvalue, :doc => <<-EOS
-Looks up into a complex structure of arrays and hashes and returns nil
-or the default value if nothing was found.
-
-Path is an array of keys to be looked up in data argument. The function
-will go down the structure and try to extract the required value.
-
-$data = {
-  'a' => {
-    'b' => [
-      'b1',
-      'b2',
-      'b3' ]}}
-
-$value = dig($data, ['a', 'b', '2'], 'not_found')
-=> $value = 'b3'
-
-a -> first hash key
-b -> second hash key
-2 -> array index starting with 0
-
-not_found -> (optional) will be returned if there is no value or the path
-did not match. Defaults to nil.
-
-In addition to the required "path" argument, "dig" accepts default
-argument. It will be returned if no value was found or a path component is
-missing. And the fourth argument can set a variable path separator.
+    DEPRECATED: This function has been replaced in Puppet 4.5.0, please use dig44() for backwards compatibility or use the new version.
     EOS
-             ) do |arguments|
-    # Two arguments are required
-    raise(Puppet::ParseError, "dig(): Wrong number of arguments " +
-                              "given (#{arguments.size} for at least 2)") if arguments.size < 2
-
-    data, path, default = *arguments
-
-    if !(data.is_a?(Hash) || data.is_a?(Array))
-      raise(Puppet::ParseError, "dig(): first argument must be a hash or an array, " <<
-                                "given #{data.class.name}")
+  ) do |arguments|
+    warning("dig() DEPRECATED: This function has been replaced in Puppet 4.5.0, please use dig44() for backwards compatibility or use the new version.")
+    if ! Puppet::Parser::Functions.autoloader.loaded?(:dig44)
+      Puppet::Parser::Functions.autoloader.load(:dig44)
     end
-
-    unless path.is_a? Array
-      raise(Puppet::ParseError, "dig(): second argument must be an array, " <<
-                                "given #{path.class.name}")
-    end
-
-    value = path.reduce(data) { |h, k| (h.is_a?(Hash) || h.is_a?(Array)) ? h[k] : break }
-    value.nil? ? default : value
+    function_dig44(arguments)
   end
 end
diff --git a/lib/puppet/parser/functions/dig44.rb b/lib/puppet/parser/functions/dig44.rb
new file mode 100644
index 0000000..a7de363
--- /dev/null
+++ b/lib/puppet/parser/functions/dig44.rb
@@ -0,0 +1,56 @@
+#
+# dig44.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:dig44, :type => :rvalue, :doc => <<-EOS
+DEPRECATED: This function has been replaced in puppet 4.5.0.
+
+Looks up into a complex structure of arrays and hashes and returns nil
+or the default value if nothing was found.
+
+Path is an array of keys to be looked up in data argument. The function
+will go down the structure and try to extract the required value.
+
+$data = {
+  'a' => {
+    'b' => [
+      'b1',
+      'b2',
+      'b3' ]}}
+
+$value = dig44($data, ['a', 'b', '2'], 'not_found')
+=> $value = 'b3'
+
+a -> first hash key
+b -> second hash key
+2 -> array index starting with 0
+
+not_found -> (optional) will be returned if there is no value or the path
+did not match. Defaults to nil.
+
+In addition to the required "path" argument, "dig44" accepts default
+argument. It will be returned if no value was found or a path component is
+missing. And the fourth argument can set a variable path separator.
+    EOS
+             ) do |arguments|
+    # Two arguments are required
+    raise(Puppet::ParseError, "dig44(): Wrong number of arguments " +
+                              "given (#{arguments.size} for at least 2)") if arguments.size < 2
+
+    data, path, default = *arguments
+
+    if !(data.is_a?(Hash) || data.is_a?(Array))
+      raise(Puppet::ParseError, "dig44(): first argument must be a hash or an array, " <<
+                                "given #{data.class.name}")
+    end
+
+    unless path.is_a? Array
+      raise(Puppet::ParseError, "dig44(): second argument must be an array, " <<
+                                "given #{path.class.name}")
+    end
+
+    value = path.reduce(data) { |h, k| (h.is_a?(Hash) || h.is_a?(Array)) ? h[k] : break }
+    value.nil? ? default : value
+  end
+end
-- 
cgit v1.2.3


From 72d23659513517389880ba13663a1d6380d538ca Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 5 Jul 2016 09:56:42 +0100
Subject: (MODULES-3529)add deprecation function

---
 lib/puppet/functions/deprecation.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/puppet/functions/deprecation.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
new file mode 100644
index 0000000..3b84ae5
--- /dev/null
+++ b/lib/puppet/functions/deprecation.rb
@@ -0,0 +1,21 @@
+# Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method  It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning)  *Type*: String, String.
+#
+
+Puppet::Functions.create_function(:deprecation) do
+  dispatch :deprecation do
+    param 'String', :key
+    param 'String', :message
+  end
+
+  def deprecation(key, message)
+    # depending on configuration setting of strict
+    case Puppet.settings[:strict]
+    when :off
+      # do nothing
+    when :error
+      fail("deprecation. #{key}. #{message}")
+    else
+      Puppet.warn_once('deprecation', key, message)
+    end
+  end
+end
-- 
cgit v1.2.3


From ef935bb287c54ac615f7f538a6f89190b4d2c4d7 Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 19 Jul 2016 11:42:47 +0100
Subject: (MODULES-2143) document edge behaviour of range.

---
 lib/puppet/parser/functions/range.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/range.rb b/lib/puppet/parser/functions/range.rb
index 2fc2113..d690df7 100644
--- a/lib/puppet/parser/functions/range.rb
+++ b/lib/puppet/parser/functions/range.rb
@@ -25,8 +25,8 @@ integers automatically)
 Will return: ["a","b","c"]
 
     range("host01", "host10")
-
 Will return: ["host01", "host02", ..., "host09", "host10"]
+NB Be explicit in including trailing zeros. Otherwise the underlying ruby function will fail.
 
 Passing a third argument will cause the generated range to step by that
 interval, e.g.
-- 
cgit v1.2.3


From 1b36d540fde3f149bd2738384ad9065bd7f6c4bb Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Tue, 19 Jul 2016 17:02:42 +0100
Subject: (modules-3407) documenting after can take a regex

---
 lib/puppet/type/file_line.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index a02b514..6f5c188 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -83,7 +83,8 @@ Puppet::Type.newtype(:file_line) do
   end
 
   newparam(:after) do
-    desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)'
+    desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)' +
+         ' This is also takes a regex.'
   end
 
   newparam(:line) do
-- 
cgit v1.2.3


From 4cc560486974f00846981dbb64f5faeeec3b982f Mon Sep 17 00:00:00 2001
From: Steve Moore <mooresm@miamioh.edu>
Date: Fri, 22 Jul 2016 15:40:22 -0400
Subject: Added the regexpescape function.

---
 lib/puppet/parser/functions/regexpescape.rb | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 lib/puppet/parser/functions/regexpescape.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/regexpescape.rb b/lib/puppet/parser/functions/regexpescape.rb
new file mode 100644
index 0000000..477ee87
--- /dev/null
+++ b/lib/puppet/parser/functions/regexpescape.rb
@@ -0,0 +1,31 @@
+#
+#  regexpescape.rb
+#
+module Puppet::Parser::Functions
+  newfunction(:regexpescape, :type => :rvalue, :doc => <<-EOS
+    Regexp escape a string or array of strings.
+    Requires either a single string or an array as an input.
+    EOS
+  ) do |arguments| # rubocop:disable Style/ClosingParenthesisIndentation
+    raise(Puppet::ParseError, 'regexpescape(): Wrong number of arguments ' \
+      "given (#{arguments.size} for 1)") if arguments.empty?
+
+    value = arguments[0]
+
+    unless value.is_a?(Array) || value.is_a?(String)
+      raise(Puppet::ParseError, 'regexpescape(): Requires either ' \
+        'array or string to work with')
+    end
+
+    result = if value.is_a?(Array)
+               # Numbers in Puppet are often string-encoded which is troublesome ...
+               value.collect { |i| i.is_a?(String) ? Regexp.escape(i) : i }
+             else
+               Regexp.escape(value)
+             end
+
+    return result
+  end
+end
+
+# vim: set ts=2 sw=2 et :
-- 
cgit v1.2.3


From fded0af0c687bf4f219564dc4dfcd890f4563523 Mon Sep 17 00:00:00 2001
From: Loic Antoine-Gombeaud <l.antoine-gombeaud@foodpanda.com>
Date: Wed, 27 Jul 2016 12:59:23 +0200
Subject: Fix str2bool error message

---
 lib/puppet/parser/functions/str2bool.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/str2bool.rb b/lib/puppet/parser/functions/str2bool.rb
index 8def131..472506d 100644
--- a/lib/puppet/parser/functions/str2bool.rb
+++ b/lib/puppet/parser/functions/str2bool.rb
@@ -21,7 +21,7 @@ like: 0, F,f, N,n, false, FALSE, no to 'false'.
     end
 
     unless string.is_a?(String)
-      raise(Puppet::ParseError, 'str2bool(): Requires either ' +
+      raise(Puppet::ParseError, 'str2bool(): Requires ' +
         'string to work with')
     end
 
-- 
cgit v1.2.3


From 17a49baae33a78d6aa781aaaadafc08b43def040 Mon Sep 17 00:00:00 2001
From: Chris Edester <edestecd@miamioh.edu>
Date: Fri, 5 Aug 2016 15:38:59 -0400
Subject: Handle array values in join_keys_to_values function

---
 lib/puppet/parser/functions/join_keys_to_values.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/join_keys_to_values.rb b/lib/puppet/parser/functions/join_keys_to_values.rb
index e9924fe..e3baf9f 100644
--- a/lib/puppet/parser/functions/join_keys_to_values.rb
+++ b/lib/puppet/parser/functions/join_keys_to_values.rb
@@ -5,7 +5,8 @@
 module Puppet::Parser::Functions
   newfunction(:join_keys_to_values, :type => :rvalue, :doc => <<-EOS
 This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
+separator. Keys are cast to strings. If values are arrays, multiple keys
+are added for each element. The return value is an array in
 which each element is one joined key/value pair.
 
 *Examples:*
@@ -13,6 +14,10 @@ which each element is one joined key/value pair.
     join_keys_to_values({'a'=>1,'b'=>2}, " is ")
 
 Would result in: ["a is 1","b is 2"]
+
+    join_keys_to_values({'a'=>1,'b'=>[2,3]}, " is ")
+
+Would result in: ["a is 1","b is 2","b is 3"]
     EOS
   ) do |arguments|
 
@@ -38,8 +43,12 @@ Would result in: ["a is 1","b is 2"]
 
     # Join the keys to their values.
     hash.map do |k,v|
-      String(k) + separator + String(v)
-    end
+      if v.is_a?(Array)
+        v.map { |va| String(k) + separator + String(va) }
+      else
+        String(k) + separator + String(v)
+      end
+    end.flatten
 
   end
 end
-- 
cgit v1.2.3


From 6e7e69fe203e042b28aacb01301c338d55448c5f Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Wed, 3 Aug 2016 17:06:25 +0100
Subject: (modules-3533) deprecation for 3.x number function

---
 lib/puppet/parser/functions/deprecation.rb      | 15 +++++++++++++++
 lib/puppet/parser/functions/is_float.rb         |  2 ++
 lib/puppet/parser/functions/is_integer.rb       |  2 ++
 lib/puppet/parser/functions/is_numeric.rb       |  4 ++--
 lib/puppet/parser/functions/validate_integer.rb |  2 ++
 lib/puppet/parser/functions/validate_numeric.rb |  2 ++
 6 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 lib/puppet/parser/functions/deprecation.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
new file mode 100644
index 0000000..5d74984
--- /dev/null
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -0,0 +1,15 @@
+module Puppet::Parser::Functions
+  newfunction(:deprecation, :type => :rvalue, :doc => <<-EOS
+  Function to print deprecation warnings (this is the 3.X version of it), The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method.).
+EOS
+  ) do |arguments|
+
+    raise(Puppet::ParseError, "deprecation: Wrong number of arguments " +
+      "given (#{arguments.size} for 2)") unless arguments.size == 2
+
+    key = arguments[0]
+    message = arguments[1]
+
+    warn("deprecation. #{key}. #{message}")
+  end
+end
diff --git a/lib/puppet/parser/functions/is_float.rb b/lib/puppet/parser/functions/is_float.rb
index a2da943..5233e40 100644
--- a/lib/puppet/parser/functions/is_float.rb
+++ b/lib/puppet/parser/functions/is_float.rb
@@ -8,6 +8,8 @@ Returns true if the variable passed to this function is a float.
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Float. There is further documentation for validate_legacy function in the README.'])
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_float(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
diff --git a/lib/puppet/parser/functions/is_integer.rb b/lib/puppet/parser/functions/is_integer.rb
index c03d28d..e04fd1f 100644
--- a/lib/puppet/parser/functions/is_integer.rb
+++ b/lib/puppet/parser/functions/is_integer.rb
@@ -13,6 +13,8 @@ If given any other argument `false` is returned.
     EOS
   ) do |arguments|
 
+    function_deprecation([:is_integer, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.'])
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_integer(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
diff --git a/lib/puppet/parser/functions/is_numeric.rb b/lib/puppet/parser/functions/is_numeric.rb
index e7e1d2a..2bdd353 100644
--- a/lib/puppet/parser/functions/is_numeric.rb
+++ b/lib/puppet/parser/functions/is_numeric.rb
@@ -24,6 +24,8 @@ Valid examples:
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_numeric(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
@@ -71,5 +73,3 @@ Valid examples:
     end
   end
 end
-
-# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
index a950916..f52e053 100644
--- a/lib/puppet/parser/functions/validate_integer.rb
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -53,6 +53,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.'])
+
     # tell the user we need at least one, and optionally up to two other parameters
     raise Puppet::ParseError, "validate_integer(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
 
diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb
index 3a14443..6b55f49 100644
--- a/lib/puppet/parser/functions/validate_numeric.rb
+++ b/lib/puppet/parser/functions/validate_numeric.rb
@@ -15,6 +15,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
+
     # tell the user we need at least one, and optionally up to two other parameters
     raise Puppet::ParseError, "validate_numeric(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
 
-- 
cgit v1.2.3


From 22fbe723acd22ae3491c41beeacbc76853c6820e Mon Sep 17 00:00:00 2001
From: tphoney <tp@puppet.com>
Date: Mon, 8 Aug 2016 17:35:13 +0100
Subject: (modules-3532) deprecate string type checks

---
 lib/puppet/parser/functions/is_absolute_path.rb       | 4 ++--
 lib/puppet/parser/functions/is_array.rb               | 4 ++--
 lib/puppet/parser/functions/is_bool.rb                | 4 ++--
 lib/puppet/parser/functions/is_string.rb              | 2 ++
 lib/puppet/parser/functions/validate_absolute_path.rb | 2 ++
 lib/puppet/parser/functions/validate_array.rb         | 2 ++
 lib/puppet/parser/functions/validate_bool.rb          | 2 ++
 lib/puppet/parser/functions/validate_re.rb            | 3 +++
 lib/puppet/parser/functions/validate_string.rb        | 2 ++
 9 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_absolute_path.rb b/lib/puppet/parser/functions/is_absolute_path.rb
index 53a5445..2e37414 100644
--- a/lib/puppet/parser/functions/is_absolute_path.rb
+++ b/lib/puppet/parser/functions/is_absolute_path.rb
@@ -23,7 +23,7 @@ module Puppet::Parser::Functions
         is_absolute_path($undefined)
 
   ENDHEREDOC
-
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
     require 'puppet/util'
 
     path = args[0]
@@ -47,4 +47,4 @@ module Puppet::Parser::Functions
     end
     value
   end
-end
\ No newline at end of file
+end
diff --git a/lib/puppet/parser/functions/is_array.rb b/lib/puppet/parser/functions/is_array.rb
index b39e184..d1bb58a 100644
--- a/lib/puppet/parser/functions/is_array.rb
+++ b/lib/puppet/parser/functions/is_array.rb
@@ -8,6 +8,8 @@ Returns true if the variable passed to this function is an array.
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
+
     raise(Puppet::ParseError, "is_array(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
@@ -18,5 +20,3 @@ Returns true if the variable passed to this function is an array.
     return result
   end
 end
-
-# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/is_bool.rb b/lib/puppet/parser/functions/is_bool.rb
index 8bbdbc8..48aaa08 100644
--- a/lib/puppet/parser/functions/is_bool.rb
+++ b/lib/puppet/parser/functions/is_bool.rb
@@ -8,6 +8,8 @@ Returns true if the variable passed to this function is a boolean.
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+
     raise(Puppet::ParseError, "is_bool(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size != 1
 
@@ -18,5 +20,3 @@ Returns true if the variable passed to this function is a boolean.
     return result
   end
 end
-
-# vim: set ts=2 sw=2 et :
diff --git a/lib/puppet/parser/functions/is_string.rb b/lib/puppet/parser/functions/is_string.rb
index f5bef04..144cf51 100644
--- a/lib/puppet/parser/functions/is_string.rb
+++ b/lib/puppet/parser/functions/is_string.rb
@@ -8,6 +8,8 @@ Returns true if the variable passed to this function is a string.
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
+
     raise(Puppet::ParseError, "is_string(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb
index 5f85f72..d5f5443 100644
--- a/lib/puppet/parser/functions/validate_absolute_path.rb
+++ b/lib/puppet/parser/functions/validate_absolute_path.rb
@@ -26,6 +26,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
+
     require 'puppet/util'
 
     unless args.length > 0 then
diff --git a/lib/puppet/parser/functions/validate_array.rb b/lib/puppet/parser/functions/validate_array.rb
index 34b5118..97bd41d 100644
--- a/lib/puppet/parser/functions/validate_array.rb
+++ b/lib/puppet/parser/functions/validate_array.rb
@@ -18,6 +18,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
+
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_array(): wrong number of arguments (#{args.length}; must be > 0)")
     end
diff --git a/lib/puppet/parser/functions/validate_bool.rb b/lib/puppet/parser/functions/validate_bool.rb
index 59a0805..4e52ffd 100644
--- a/lib/puppet/parser/functions/validate_bool.rb
+++ b/lib/puppet/parser/functions/validate_bool.rb
@@ -19,6 +19,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
     end
diff --git a/lib/puppet/parser/functions/validate_re.rb b/lib/puppet/parser/functions/validate_re.rb
index efee7f8..6bdc858 100644
--- a/lib/puppet/parser/functions/validate_re.rb
+++ b/lib/puppet/parser/functions/validate_re.rb
@@ -29,6 +29,9 @@ module Puppet::Parser::Functions
         validate_re("${::operatingsystemmajrelease}", '^[57]$')
 
     ENDHEREDOC
+
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Re. There is further documentation for validate_legacy function in the README.'])
+
     if (args.length < 2) or (args.length > 3) then
       raise Puppet::ParseError, "validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)"
     end
diff --git a/lib/puppet/parser/functions/validate_string.rb b/lib/puppet/parser/functions/validate_string.rb
index c841f6a..e92a2fc 100644
--- a/lib/puppet/parser/functions/validate_string.rb
+++ b/lib/puppet/parser/functions/validate_string.rb
@@ -23,6 +23,8 @@ module Puppet::Parser::Functions
     
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
+
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_string(): wrong number of arguments (#{args.length}; must be > 0)")
     end
-- 
cgit v1.2.3


From adf922c28441bc95f5cbac1f0951256c080b3298 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Wed, 10 Aug 2016 14:17:16 +0100
Subject: (WIP) Addition of validate legacy function

---
 lib/puppet/functions/validate_legacy.rb | 54 +++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 lib/puppet/functions/validate_legacy.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
new file mode 100644
index 0000000..9d7d012
--- /dev/null
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -0,0 +1,54 @@
+Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalFunction) do
+  # The function checks a value against both the target_type (new) and the previous_validation function (old).
+
+  dispatch :validate_legacy do
+    param 'Type', :target_type
+    param 'String', :previous_validation
+    param 'NotUndef', :value
+    optional_param 'Any', :args
+  end
+  dispatch :validate_legacy_s do
+    scope_param
+    param 'String', :type_string
+    param 'String', :previous_validation
+    param 'NotUndef', :value
+    optional_repeated_param 'Any', :args
+  end
+
+  def validate_legacy_s(scope, type_string, *args)
+    t = Puppet::Pops::Types::TypeParser.new.parse(type_string, scope)
+    validate_legacy(t, *args)
+  end
+
+  def validate_legacy(target_type, previous_validation, value, *prev_args)
+    if assert_type(target_type, value)
+      if previous_validation(previous_validation, value, *prev_args)
+        # Silently passes
+      else
+        Puppet.warn("Accepting previously invalid value for target_type '#{target_type}'")
+      end
+    else
+      inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
+      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
+      if previous_validation(previous_validation, value, *prev_args)
+        Puppet.warn(error_msg)
+      else
+        call_function('fail', error_msg)
+      end
+    end
+  end
+
+  def previous_validation(previous_validation, value, *prev_args)
+    # Call the previous validation function and catch any errors. Return true if no errors are thrown.
+    begin
+      call_function(previous_validation, value, *prev_args)
+      true
+    rescue Puppet::ParseError
+      false
+    end
+  end
+
+  def assert_type(type, value)
+    Puppet::Pops::Types::TypeCalculator.instance?(type, value)
+  end
+end
-- 
cgit v1.2.3


From 39148468abbd9b8af74b776eb49f0a8388fc8541 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Mon, 15 Aug 2016 10:39:50 +0100
Subject: (maint) Switch 3.x deprecation() to use Puppet warning logger

The deprecation function was calling the `Kernel#warn` function which
prints to stderr, rather than the Puppet logger. This causes problems
for Puppet module tests on Travis CI, which has a cap on the amount of
stdout/err permitted in its logs and also prevents users from finding
the deprecation warnings when running under a Puppet master.
---
 lib/puppet/parser/functions/deprecation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index 5d74984..fc861a6 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -10,6 +10,6 @@ EOS
     key = arguments[0]
     message = arguments[1]
 
-    warn("deprecation. #{key}. #{message}")
+    warning("deprecation. #{key}. #{message}")
   end
 end
-- 
cgit v1.2.3


From 6d185bdaa19f698270a0df4b0a0c05618864b955 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Tue, 16 Aug 2016 11:55:05 +0100
Subject: Deprecation of ip functions

---
 lib/puppet/parser/functions/is_ip_address.rb         | 2 ++
 lib/puppet/parser/functions/is_ipv4_address.rb       | 2 ++
 lib/puppet/parser/functions/is_ipv6_address.rb       | 2 ++
 lib/puppet/parser/functions/validate_ip_address.rb   | 2 ++
 lib/puppet/parser/functions/validate_ipv4_address.rb | 2 ++
 lib/puppet/parser/functions/validate_ipv6_address.rb | 2 ++
 6 files changed, 12 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/is_ip_address.rb b/lib/puppet/parser/functions/is_ip_address.rb
index a90adab..1901b2c 100644
--- a/lib/puppet/parser/functions/is_ip_address.rb
+++ b/lib/puppet/parser/functions/is_ip_address.rb
@@ -10,6 +10,8 @@ Returns true if the string passed to this function is a valid IP address.
 
     require 'ipaddr'
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_ip_address(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
diff --git a/lib/puppet/parser/functions/is_ipv4_address.rb b/lib/puppet/parser/functions/is_ipv4_address.rb
index b4861d5..c90fa64 100644
--- a/lib/puppet/parser/functions/is_ipv4_address.rb
+++ b/lib/puppet/parser/functions/is_ipv4_address.rb
@@ -10,6 +10,8 @@ Returns true if the string passed to this function is a valid IPv4 address.
 
     require 'ipaddr'
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
+
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_ipv4_address(): Wrong number of arguments "+
         "given #{arguments.size} for 1")
diff --git a/lib/puppet/parser/functions/is_ipv6_address.rb b/lib/puppet/parser/functions/is_ipv6_address.rb
index 475ad50..aec3483 100644
--- a/lib/puppet/parser/functions/is_ipv6_address.rb
+++ b/lib/puppet/parser/functions/is_ipv6_address.rb
@@ -8,6 +8,8 @@ Returns true if the string passed to this function is a valid IPv6 address.
     EOS
   ) do |arguments|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
+
     require 'ipaddr'
 
     if (arguments.size != 1) then
diff --git a/lib/puppet/parser/functions/validate_ip_address.rb b/lib/puppet/parser/functions/validate_ip_address.rb
index 64fbd75..3377c76 100644
--- a/lib/puppet/parser/functions/validate_ip_address.rb
+++ b/lib/puppet/parser/functions/validate_ip_address.rb
@@ -23,6 +23,8 @@ module Puppet::Parser::Functions
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+
     if defined?(IPAddr::InvalidAddressError)
       rescuable_exceptions << IPAddr::InvalidAddressError
     end
diff --git a/lib/puppet/parser/functions/validate_ipv4_address.rb b/lib/puppet/parser/functions/validate_ipv4_address.rb
index 97faa57..fb2260c 100644
--- a/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ b/lib/puppet/parser/functions/validate_ipv4_address.rb
@@ -18,6 +18,8 @@ module Puppet::Parser::Functions
     ENDHEREDOC
   ) do |args|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
+
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
 
diff --git a/lib/puppet/parser/functions/validate_ipv6_address.rb b/lib/puppet/parser/functions/validate_ipv6_address.rb
index b0f2558..4dedcd6 100644
--- a/lib/puppet/parser/functions/validate_ipv6_address.rb
+++ b/lib/puppet/parser/functions/validate_ipv6_address.rb
@@ -19,6 +19,8 @@ module Puppet::Parser::Functions
     ENDHEREDOC
   ) do |args|
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
+
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
 
-- 
cgit v1.2.3


From 789263cab5ca2f38face3399076f4d3be34b3d3d Mon Sep 17 00:00:00 2001
From: Dmitry Ilyin <di476k@att.com>
Date: Tue, 30 Aug 2016 15:12:29 -0500
Subject: Refactor dig44 function

The current implementation of the dig44 function has the
following problems:
* Doesn't recognise Puppet4's :undef value as an empty value
  and doesn't return the default value.
* Doesn't make a different between false and nil value
  and returns the default value for a non-empty false value
---
 lib/puppet/parser/functions/dig44.rb | 41 +++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dig44.rb b/lib/puppet/parser/functions/dig44.rb
index a7de363..d703380 100644
--- a/lib/puppet/parser/functions/dig44.rb
+++ b/lib/puppet/parser/functions/dig44.rb
@@ -1,23 +1,30 @@
-#
-# dig44.rb
+#		
+# dig44.rb		
 #
 
 module Puppet::Parser::Functions
-  newfunction(:dig44, :type => :rvalue, :doc => <<-EOS
+  newfunction(
+      :dig44,
+      :type => :rvalue,
+      :arity => -2,
+      :doc => <<-eos
 DEPRECATED: This function has been replaced in puppet 4.5.0.
 
-Looks up into a complex structure of arrays and hashes and returns nil
+Looks up into a complex structure of arrays and hashes and returns a value
 or the default value if nothing was found.
 
-Path is an array of keys to be looked up in data argument. The function
-will go down the structure and try to extract the required value.
+Key can contain slashes to describe path components. The function will go down
+the structure and try to extract the required value.
 
 $data = {
   'a' => {
     'b' => [
       'b1',
       'b2',
-      'b3' ]}}
+      'b3',
+    ]
+  }
+}
 
 $value = dig44($data, ['a', 'b', '2'], 'not_found')
 => $value = 'b3'
@@ -29,18 +36,18 @@ b -> second hash key
 not_found -> (optional) will be returned if there is no value or the path
 did not match. Defaults to nil.
 
-In addition to the required "path" argument, "dig44" accepts default
+In addition to the required "key" argument, the function accepts a default
 argument. It will be returned if no value was found or a path component is
 missing. And the fourth argument can set a variable path separator.
-    EOS
-             ) do |arguments|
+  eos
+  ) do |arguments|
     # Two arguments are required
     raise(Puppet::ParseError, "dig44(): Wrong number of arguments " +
                               "given (#{arguments.size} for at least 2)") if arguments.size < 2
 
     data, path, default = *arguments
 
-    if !(data.is_a?(Hash) || data.is_a?(Array))
+    unless data.is_a?(Hash) or data.is_a?(Array)
       raise(Puppet::ParseError, "dig44(): first argument must be a hash or an array, " <<
                                 "given #{data.class.name}")
     end
@@ -50,7 +57,17 @@ missing. And the fourth argument can set a variable path separator.
                                 "given #{path.class.name}")
     end
 
-    value = path.reduce(data) { |h, k| (h.is_a?(Hash) || h.is_a?(Array)) ? h[k] : break }
+    value = path.reduce(data) do |structure, key|
+      if structure.is_a? Hash or structure.is_a? Array
+        if structure.is_a? Array
+          key = Integer key rescue break
+        end
+        break if structure[key].nil? or structure[key] == :undef
+        structure[key]
+      else
+        break
+      end
+    end
     value.nil? ? default : value
   end
 end
-- 
cgit v1.2.3


From 2beef9acb246257c4edfb364b4b2d6bd9c7437d3 Mon Sep 17 00:00:00 2001
From: Stephen Benjamin <stephen@redhat.com>
Date: Fri, 2 Sep 2016 09:31:02 -0400
Subject: Add facter fact for puppet_environmentpath

---
 lib/facter/puppet_settings.rb | 35 +++++++++++++++++++++++++++++++++++
 lib/facter/puppet_vardir.rb   | 26 --------------------------
 2 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 lib/facter/puppet_settings.rb
 delete mode 100644 lib/facter/puppet_vardir.rb

(limited to 'lib')

diff --git a/lib/facter/puppet_settings.rb b/lib/facter/puppet_settings.rb
new file mode 100644
index 0000000..e6a066a
--- /dev/null
+++ b/lib/facter/puppet_settings.rb
@@ -0,0 +1,35 @@
+# These facter facts return the value of the Puppet vardir and environment path
+# settings for the node running puppet or puppet agent.  The intent is to
+# enable Puppet modules to automatically have insight into a place where they
+# can place variable data, or for modules running on the puppet master to know
+# where environments are stored.
+#
+# The values should be directly usable in a File resource path attribute.
+#
+begin
+  require 'facter/util/puppet_settings'
+rescue LoadError => e
+  # puppet apply does not add module lib directories to the $LOAD_PATH (See
+  # #4248). It should (in the future) but for the time being we need to be
+  # defensive which is what this rescue block is doing.
+  rb_file = File.join(File.dirname(__FILE__), 'util', 'puppet_settings.rb')
+  load rb_file if File.exists?(rb_file) or raise e
+end
+
+
+# These will be nil if Puppet is not available.
+Facter.add(:puppet_vardir) do
+  setcode do
+    Facter::Util::PuppetSettings.with_puppet do
+      Puppet[:vardir]
+    end
+  end
+end
+
+Facter.add(:puppet_environmentpath) do
+  setcode do
+    Facter::Util::PuppetSettings.with_puppet do
+      Puppet[:environmentpath]
+    end
+  end
+end
diff --git a/lib/facter/puppet_vardir.rb b/lib/facter/puppet_vardir.rb
deleted file mode 100644
index 0e6af40..0000000
--- a/lib/facter/puppet_vardir.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This facter fact returns the value of the Puppet vardir setting for the node
-# running puppet or puppet agent.  The intent is to enable Puppet modules to
-# automatically have insight into a place where they can place variable data,
-# regardless of the node's platform.
-#
-# The value should be directly usable in a File resource path attribute.
-
-
-begin
-  require 'facter/util/puppet_settings'
-rescue LoadError => e
-  # puppet apply does not add module lib directories to the $LOAD_PATH (See
-  # #4248). It should (in the future) but for the time being we need to be
-  # defensive which is what this rescue block is doing.
-  rb_file = File.join(File.dirname(__FILE__), 'util', 'puppet_settings.rb')
-  load rb_file if File.exists?(rb_file) or raise e
-end
-
-Facter.add(:puppet_vardir) do
-  setcode do
-    # This will be nil if Puppet is not available.
-    Facter::Util::PuppetSettings.with_puppet do
-      Puppet[:vardir]
-    end
-  end
-end
-- 
cgit v1.2.3


From 6c6c6d8e3448e3072d590a0782237486e46bc88d Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Tue, 23 Aug 2016 15:02:39 +0100
Subject: Deprecation function to be mutable in all cases

---
 lib/puppet/functions/deprecation.rb        | 2 +-
 lib/puppet/parser/functions/deprecation.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 3b84ae5..6b7b977 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -15,7 +15,7 @@ Puppet::Functions.create_function(:deprecation) do
     when :error
       fail("deprecation. #{key}. #{message}")
     else
-      Puppet.warn_once('deprecation', key, message)
+      Puppet.deprecation_warning(message, key)
     end
   end
 end
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index fc861a6..e30f3a0 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -9,7 +9,9 @@ EOS
 
     key = arguments[0]
     message = arguments[1]
-
-    warning("deprecation. #{key}. #{message}")
+    
+    if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
+      warning("deprecation. #{key}. #{message}")
+    end
   end
 end
-- 
cgit v1.2.3


From b63862ff43194194f7428739a32cfe13bad1e7ed Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Tue, 6 Sep 2016 15:00:07 +0100
Subject: Addition of logging with file and line numbers

---
 lib/puppet/functions/deprecation.rb        | 8 +++++---
 lib/puppet/functions/validate_legacy.rb    | 4 +++-
 lib/puppet/parser/functions/deprecation.rb | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 6b7b977..30aeb1d 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,5 +1,4 @@
 # Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method  It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning)  *Type*: String, String.
-#
 
 Puppet::Functions.create_function(:deprecation) do
   dispatch :deprecation do
@@ -9,13 +8,16 @@ Puppet::Functions.create_function(:deprecation) do
 
   def deprecation(key, message)
     # depending on configuration setting of strict
+    caller_infos = caller.first.split(":")
     case Puppet.settings[:strict]
     when :off
       # do nothing
     when :error
-      fail("deprecation. #{key}. #{message}")
+      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+      fail("deprecation. #{key}. #{err_message}")
     else
-      Puppet.deprecation_warning(message, key)
+      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+      Puppet.deprecation_warning(err_message, key)
     end
   end
 end
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 9d7d012..b1066e2 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -28,8 +28,10 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
         Puppet.warn("Accepting previously invalid value for target_type '#{target_type}'")
       end
     else
+      caller_infos = caller.first.split(":")
       inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
-      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
+      message = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
+      error_msg = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
       if previous_validation(previous_validation, value, *prev_args)
         Puppet.warn(error_msg)
       else
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index e30f3a0..0cb247d 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -11,7 +11,9 @@ EOS
     message = arguments[1]
     
     if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
-      warning("deprecation. #{key}. #{message}")
+      caller_infos = caller.first.split(":")
+      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+      warning("deprecation. #{key}. #{err_message}")
     end
   end
 end
-- 
cgit v1.2.3


From f1edd2715a755573d7578839a3efe8473b79b5c5 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 6 Sep 2016 11:18:48 +0100
Subject: (MODULES-3737) validate_legacy: refactoring

* validate_legacy now accepts undef values
* update the TypeMismatch message to include the original validate function name
* only notice, not warn, on newly allowed values
* changed previous_validation to function_name to avoid confusion with the function of the same name
* use deprecation() instead of warn(), when hitting a deprecated value
* prepare the tests and function for MODULES-3735
* rewrite validate_legacy tests to use new rspec-puppet
* move validate_re deprecation to puppet4 only
* adapt validate_re_spec
---
 lib/puppet/functions/validate_legacy.rb | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index b1066e2..0ba6dd8 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -2,48 +2,49 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
   # The function checks a value against both the target_type (new) and the previous_validation function (old).
 
   dispatch :validate_legacy do
+    scope_param
     param 'Type', :target_type
-    param 'String', :previous_validation
-    param 'NotUndef', :value
-    optional_param 'Any', :args
+    param 'String', :function_name
+    param 'Any', :value
+    optional_repeated_param 'Any', :args
   end
+
   dispatch :validate_legacy_s do
     scope_param
     param 'String', :type_string
-    param 'String', :previous_validation
-    param 'NotUndef', :value
+    param 'String', :function_name
+    param 'Any', :value
     optional_repeated_param 'Any', :args
   end
 
   def validate_legacy_s(scope, type_string, *args)
     t = Puppet::Pops::Types::TypeParser.new.parse(type_string, scope)
-    validate_legacy(t, *args)
+    validate_legacy(scope, t, *args)
   end
 
-  def validate_legacy(target_type, previous_validation, value, *prev_args)
+  def validate_legacy(scope, target_type, function_name, value, *prev_args)
     if assert_type(target_type, value)
-      if previous_validation(previous_validation, value, *prev_args)
+      if previous_validation(scope, function_name, value, *prev_args)
         # Silently passes
       else
-        Puppet.warn("Accepting previously invalid value for target_type '#{target_type}'")
+        Puppet.notice("Accepting previously invalid value for target type '#{target_type}'")
       end
     else
       caller_infos = caller.first.split(":")
       inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
-      message = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
-      error_msg = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
-      if previous_validation(previous_validation, value, *prev_args)
-        Puppet.warn(error_msg)
+      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name}) [#{caller_infos[0]}:#{caller_infos[1]}]", target_type, inferred_type)
+      if previous_validation(scope, function_name, value, *prev_args)
+        call_function('deprecation', 'validate_legacy', error_msg)
       else
         call_function('fail', error_msg)
       end
     end
   end
 
-  def previous_validation(previous_validation, value, *prev_args)
+  def previous_validation(scope, function_name, value, *prev_args)
     # Call the previous validation function and catch any errors. Return true if no errors are thrown.
     begin
-      call_function(previous_validation, value, *prev_args)
+      scope.send("function_#{function_name}".to_s, [value, *prev_args])
       true
     rescue Puppet::ParseError
       false
-- 
cgit v1.2.3


From 033d0180c7a4146fc66deef3710506475efedb16 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Thu, 15 Sep 2016 18:14:23 +0100
Subject: Fix whitespace

---
 lib/puppet/parser/functions/dig44.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/dig44.rb b/lib/puppet/parser/functions/dig44.rb
index d703380..1e7c318 100644
--- a/lib/puppet/parser/functions/dig44.rb
+++ b/lib/puppet/parser/functions/dig44.rb
@@ -1,5 +1,5 @@
-#		
-# dig44.rb		
+#
+# dig44.rb
 #
 
 module Puppet::Parser::Functions
-- 
cgit v1.2.3


From 0ec7ffa5c086c8a1c6e871b086299dd1953fa8ba Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Thu, 15 Sep 2016 11:35:38 +0100
Subject: Ensure validate functions use Puppet 4 deprecation

---
 lib/puppet/functions/validate_absolute_path.rb    |  3 +++
 lib/puppet/functions/validate_array.rb            |  3 +++
 lib/puppet/functions/validate_bool.rb             |  3 +++
 lib/puppet/functions/validate_hash.rb             |  3 +++
 lib/puppet/functions/validate_integer.rb          |  3 +++
 lib/puppet/functions/validate_ip_address.rb       |  3 +++
 lib/puppet/functions/validate_ipv4_address.rb     |  3 +++
 lib/puppet/functions/validate_ipv6_address.rb     |  3 +++
 lib/puppet/functions/validate_numeric.rb          |  3 +++
 lib/puppet/functions/validate_re.rb               |  3 +++
 lib/puppet/functions/validate_string.rb           |  3 +++
 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb | 21 +++++++++++++++++++++
 12 files changed, 54 insertions(+)
 create mode 100644 lib/puppet/functions/validate_absolute_path.rb
 create mode 100644 lib/puppet/functions/validate_array.rb
 create mode 100644 lib/puppet/functions/validate_bool.rb
 create mode 100644 lib/puppet/functions/validate_hash.rb
 create mode 100644 lib/puppet/functions/validate_integer.rb
 create mode 100644 lib/puppet/functions/validate_ip_address.rb
 create mode 100644 lib/puppet/functions/validate_ipv4_address.rb
 create mode 100644 lib/puppet/functions/validate_ipv6_address.rb
 create mode 100644 lib/puppet/functions/validate_numeric.rb
 create mode 100644 lib/puppet/functions/validate_re.rb
 create mode 100644 lib/puppet/functions/validate_string.rb
 create mode 100644 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
new file mode 100644
index 0000000..5ae9d29
--- /dev/null
+++ b/lib/puppet/functions/validate_absolute_path.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_absolute_path", "Stdlib::Compat::Absolute_Path")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
new file mode 100644
index 0000000..9155784
--- /dev/null
+++ b/lib/puppet/functions/validate_array.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_array", "Stdlib::Compat::Array")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
new file mode 100644
index 0000000..10f6edf
--- /dev/null
+++ b/lib/puppet/functions/validate_bool.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_bool", "Stdlib::Compat::Bool")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
new file mode 100644
index 0000000..5349664
--- /dev/null
+++ b/lib/puppet/functions/validate_hash.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_hash", "Stdlib::Compat::Hash")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
new file mode 100644
index 0000000..2c4645d
--- /dev/null
+++ b/lib/puppet/functions/validate_integer.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_integer", "Stdlib::Compat::Integer")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
new file mode 100644
index 0000000..15a710e
--- /dev/null
+++ b/lib/puppet/functions/validate_ip_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ip_address", "Stdlib::Compat::Ip_Address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
new file mode 100644
index 0000000..8e1bc59
--- /dev/null
+++ b/lib/puppet/functions/validate_ipv4_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv4_address", "Stdlib::Compat::Ipv4_Address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
new file mode 100644
index 0000000..865648a
--- /dev/null
+++ b/lib/puppet/functions/validate_ipv6_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv6_address", "Stdlib::Compat::Ipv6_address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
new file mode 100644
index 0000000..0c2e1f2
--- /dev/null
+++ b/lib/puppet/functions/validate_numeric.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_numeric", "Stdlib::Compat::Numeric")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
new file mode 100644
index 0000000..d63ed42
--- /dev/null
+++ b/lib/puppet/functions/validate_re.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_re", "Stdlib::Compat::Re")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
new file mode 100644
index 0000000..a196f43
--- /dev/null
+++ b/lib/puppet/functions/validate_string.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_string", "Stdlib::Compat::String")
+# Puppet::Functions.create_function
diff --git a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
new file mode 100644
index 0000000..a3d830b
--- /dev/null
+++ b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
@@ -0,0 +1,21 @@
+# Creates a Puppet 4 function for the corresponding puppet 3 validate function, who's name will be passed as an argument, alongside the type for deprecation output purposes.
+module PuppetX
+  module Puppetlabs
+    module Stdlib
+      def self.deprecation_gen(funct, type)
+        Puppet::Functions.create_function(funct, Puppet::Functions::InternalFunction) do
+          @@funct = funct
+          @@type = type
+          dispatch :deprecation_gen do
+            scope_param
+            optional_repeated_param 'Any', :args
+          end
+          def deprecation_gen(scope, *args)
+            call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with #{@@type}. There is further documentation for validate_legacy function in the README.")
+            scope.send("function_#{@@funct}", args)
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 69c69e750bdaee7d5eec264650551b149538de92 Mon Sep 17 00:00:00 2001
From: Helen <helen@puppetlabs.com>
Date: Wed, 21 Sep 2016 16:22:37 +0100
Subject: Revert "Ensure validate functions use Puppet 4 deprecation"

---
 lib/puppet/functions/validate_absolute_path.rb    |  3 ---
 lib/puppet/functions/validate_array.rb            |  3 ---
 lib/puppet/functions/validate_bool.rb             |  3 ---
 lib/puppet/functions/validate_hash.rb             |  3 ---
 lib/puppet/functions/validate_integer.rb          |  3 ---
 lib/puppet/functions/validate_ip_address.rb       |  3 ---
 lib/puppet/functions/validate_ipv4_address.rb     |  3 ---
 lib/puppet/functions/validate_ipv6_address.rb     |  3 ---
 lib/puppet/functions/validate_numeric.rb          |  3 ---
 lib/puppet/functions/validate_re.rb               |  3 ---
 lib/puppet/functions/validate_string.rb           |  3 ---
 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb | 21 ---------------------
 12 files changed, 54 deletions(-)
 delete mode 100644 lib/puppet/functions/validate_absolute_path.rb
 delete mode 100644 lib/puppet/functions/validate_array.rb
 delete mode 100644 lib/puppet/functions/validate_bool.rb
 delete mode 100644 lib/puppet/functions/validate_hash.rb
 delete mode 100644 lib/puppet/functions/validate_integer.rb
 delete mode 100644 lib/puppet/functions/validate_ip_address.rb
 delete mode 100644 lib/puppet/functions/validate_ipv4_address.rb
 delete mode 100644 lib/puppet/functions/validate_ipv6_address.rb
 delete mode 100644 lib/puppet/functions/validate_numeric.rb
 delete mode 100644 lib/puppet/functions/validate_re.rb
 delete mode 100644 lib/puppet/functions/validate_string.rb
 delete mode 100644 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
deleted file mode 100644
index 5ae9d29..0000000
--- a/lib/puppet/functions/validate_absolute_path.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_absolute_path", "Stdlib::Compat::Absolute_Path")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
deleted file mode 100644
index 9155784..0000000
--- a/lib/puppet/functions/validate_array.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_array", "Stdlib::Compat::Array")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
deleted file mode 100644
index 10f6edf..0000000
--- a/lib/puppet/functions/validate_bool.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_bool", "Stdlib::Compat::Bool")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
deleted file mode 100644
index 5349664..0000000
--- a/lib/puppet/functions/validate_hash.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_hash", "Stdlib::Compat::Hash")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
deleted file mode 100644
index 2c4645d..0000000
--- a/lib/puppet/functions/validate_integer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_integer", "Stdlib::Compat::Integer")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
deleted file mode 100644
index 15a710e..0000000
--- a/lib/puppet/functions/validate_ip_address.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ip_address", "Stdlib::Compat::Ip_Address")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
deleted file mode 100644
index 8e1bc59..0000000
--- a/lib/puppet/functions/validate_ipv4_address.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv4_address", "Stdlib::Compat::Ipv4_Address")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
deleted file mode 100644
index 865648a..0000000
--- a/lib/puppet/functions/validate_ipv6_address.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv6_address", "Stdlib::Compat::Ipv6_address")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
deleted file mode 100644
index 0c2e1f2..0000000
--- a/lib/puppet/functions/validate_numeric.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_numeric", "Stdlib::Compat::Numeric")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
deleted file mode 100644
index d63ed42..0000000
--- a/lib/puppet/functions/validate_re.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_re", "Stdlib::Compat::Re")
-# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
deleted file mode 100644
index a196f43..0000000
--- a/lib/puppet/functions/validate_string.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_string", "Stdlib::Compat::String")
-# Puppet::Functions.create_function
diff --git a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
deleted file mode 100644
index a3d830b..0000000
--- a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Creates a Puppet 4 function for the corresponding puppet 3 validate function, who's name will be passed as an argument, alongside the type for deprecation output purposes.
-module PuppetX
-  module Puppetlabs
-    module Stdlib
-      def self.deprecation_gen(funct, type)
-        Puppet::Functions.create_function(funct, Puppet::Functions::InternalFunction) do
-          @@funct = funct
-          @@type = type
-          dispatch :deprecation_gen do
-            scope_param
-            optional_repeated_param 'Any', :args
-          end
-          def deprecation_gen(scope, *args)
-            call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with #{@@type}. There is further documentation for validate_legacy function in the README.")
-            scope.send("function_#{@@funct}", args)
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3


From 055dbb611a60f5d8a6c184e12f8da0b85b8971dd Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Wed, 21 Sep 2016 17:28:04 +0100
Subject: Add deprecation warnings to remaining validates

---
 lib/puppet/parser/functions/validate_hash.rb    | 2 ++
 lib/puppet/parser/functions/validate_slength.rb | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_hash.rb b/lib/puppet/parser/functions/validate_hash.rb
index 9bdd543..800a758 100644
--- a/lib/puppet/parser/functions/validate_hash.rb
+++ b/lib/puppet/parser/functions/validate_hash.rb
@@ -18,6 +18,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.'])
+
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_hash(): wrong number of arguments (#{args.length}; must be > 0)")
     end
diff --git a/lib/puppet/parser/functions/validate_slength.rb b/lib/puppet/parser/functions/validate_slength.rb
index 47c7d4a..1641e5a 100644
--- a/lib/puppet/parser/functions/validate_slength.rb
+++ b/lib/puppet/parser/functions/validate_slength.rb
@@ -21,6 +21,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String[x]. There is further documentation for validate_legacy function in the README.'])
+
     raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
 
     input, max_length, min_length = *args
-- 
cgit v1.2.3


From 02fc7f8e4912e0def8e6717c4de38a951bf4b741 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Mon, 26 Sep 2016 16:45:23 +0100
Subject: Remove duplicate deprecation warnings

---
 lib/puppet/parser/functions/validate_absolute_path.rb | 3 ++-
 lib/puppet/parser/functions/validate_bool.rb          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb
index d5f5443..15b5c57 100644
--- a/lib/puppet/parser/functions/validate_absolute_path.rb
+++ b/lib/puppet/parser/functions/validate_absolute_path.rb
@@ -26,7 +26,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
+    # The deprecation function was being called twice, as validate_absolute_path calls is_absolute_path. I have removed it from here so it only calls deprecation once within is_absolute_path.
+    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
 
     require 'puppet/util'
 
diff --git a/lib/puppet/parser/functions/validate_bool.rb b/lib/puppet/parser/functions/validate_bool.rb
index 4e52ffd..e4345eb 100644
--- a/lib/puppet/parser/functions/validate_bool.rb
+++ b/lib/puppet/parser/functions/validate_bool.rb
@@ -19,7 +19,8 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+    # The deprecation function was being called twice, as validate_bool calls is_bool. I have removed it from here so it only calls deprecation once within is_bool.
+    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
-- 
cgit v1.2.3


From 970852dd317fbb2699b406dd25aeddef496a7c92 Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Mon, 3 Oct 2016 14:10:50 +0100
Subject: Addition of Puppet 4 functions

---
 lib/puppet/functions/validate_absolute_path.rb    |  3 +++
 lib/puppet/functions/validate_array.rb            |  3 +++
 lib/puppet/functions/validate_bool.rb             |  3 +++
 lib/puppet/functions/validate_hash.rb             |  3 +++
 lib/puppet/functions/validate_integer.rb          |  3 +++
 lib/puppet/functions/validate_ip_address.rb       |  3 +++
 lib/puppet/functions/validate_ipv4_address.rb     |  3 +++
 lib/puppet/functions/validate_ipv6_address.rb     |  3 +++
 lib/puppet/functions/validate_numeric.rb          |  3 +++
 lib/puppet/functions/validate_re.rb               |  3 +++
 lib/puppet/functions/validate_string.rb           |  3 +++
 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb | 19 +++++++++++++++++++
 12 files changed, 52 insertions(+)
 create mode 100644 lib/puppet/functions/validate_absolute_path.rb
 create mode 100644 lib/puppet/functions/validate_array.rb
 create mode 100644 lib/puppet/functions/validate_bool.rb
 create mode 100644 lib/puppet/functions/validate_hash.rb
 create mode 100644 lib/puppet/functions/validate_integer.rb
 create mode 100644 lib/puppet/functions/validate_ip_address.rb
 create mode 100644 lib/puppet/functions/validate_ipv4_address.rb
 create mode 100644 lib/puppet/functions/validate_ipv6_address.rb
 create mode 100644 lib/puppet/functions/validate_numeric.rb
 create mode 100644 lib/puppet/functions/validate_re.rb
 create mode 100644 lib/puppet/functions/validate_string.rb
 create mode 100644 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
new file mode 100644
index 0000000..5ae9d29
--- /dev/null
+++ b/lib/puppet/functions/validate_absolute_path.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_absolute_path", "Stdlib::Compat::Absolute_Path")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
new file mode 100644
index 0000000..9155784
--- /dev/null
+++ b/lib/puppet/functions/validate_array.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_array", "Stdlib::Compat::Array")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
new file mode 100644
index 0000000..10f6edf
--- /dev/null
+++ b/lib/puppet/functions/validate_bool.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_bool", "Stdlib::Compat::Bool")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
new file mode 100644
index 0000000..5349664
--- /dev/null
+++ b/lib/puppet/functions/validate_hash.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_hash", "Stdlib::Compat::Hash")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
new file mode 100644
index 0000000..2c4645d
--- /dev/null
+++ b/lib/puppet/functions/validate_integer.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_integer", "Stdlib::Compat::Integer")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
new file mode 100644
index 0000000..15a710e
--- /dev/null
+++ b/lib/puppet/functions/validate_ip_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ip_address", "Stdlib::Compat::Ip_Address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
new file mode 100644
index 0000000..8e1bc59
--- /dev/null
+++ b/lib/puppet/functions/validate_ipv4_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv4_address", "Stdlib::Compat::Ipv4_Address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
new file mode 100644
index 0000000..865648a
--- /dev/null
+++ b/lib/puppet/functions/validate_ipv6_address.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv6_address", "Stdlib::Compat::Ipv6_address")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
new file mode 100644
index 0000000..0c2e1f2
--- /dev/null
+++ b/lib/puppet/functions/validate_numeric.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_numeric", "Stdlib::Compat::Numeric")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
new file mode 100644
index 0000000..d63ed42
--- /dev/null
+++ b/lib/puppet/functions/validate_re.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_re", "Stdlib::Compat::Re")
+# Puppet::Functions.create_function
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
new file mode 100644
index 0000000..a196f43
--- /dev/null
+++ b/lib/puppet/functions/validate_string.rb
@@ -0,0 +1,3 @@
+require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
+PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_string", "Stdlib::Compat::String")
+# Puppet::Functions.create_function
diff --git a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
new file mode 100644
index 0000000..0d8908d
--- /dev/null
+++ b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
@@ -0,0 +1,19 @@
+# Creates a Puppet 4 function for the corresponding puppet 3 validate function, who's name will be passed as an argument, alongside the type for deprecation output purposes.
+module PuppetX
+  module Puppetlabs
+    module Stdlib
+      def self.deprecation_gen(funct, type)
+        Puppet::Functions.create_function(funct, Puppet::Functions::InternalFunction) do
+          dispatch :deprecation_gen do
+            scope_param
+            optional_repeated_param 'Any', :args
+          end
+          define_method 'deprecation_gen' do |scope, *args|
+            call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with #{type}. There is further documentation for validate_legacy function in the README.")
+            scope.send("function_#{funct}", args)
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From cce67b42bb6d09d4e9773b64e28c07d8a93ed088 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Tue, 4 Oct 2016 09:36:20 +0100
Subject: Permit undef passed as `nil` to validate_string

When validate_string is called via the Puppet 4 deprecation wrappers
from deprecation_gen (introduced in 970852d), `undef` is passed as `nil`
where it was previously passed as `''` from the Puppet 3-style function
API.

This change explicitly permits a `nil` value in validate_string, and
adds a test case to `is_string` which also accepts the same.

Fixes test failures in apt, concat etc:

    Error while evaluating a Function Call, nil is not a string.  It looks to be a NilClass at apt/manifests/source.pp:23:3 [..]
    # ./spec/fixtures/modules/stdlib/lib/puppet/parser/functions/validate_string.rb:34:in `block (2 levels) in <module:Functions>'
    # ./spec/fixtures/modules/stdlib/lib/puppet/parser/functions/validate_string.rb:32:in `each'
    # ./spec/fixtures/modules/stdlib/lib/puppet/parser/functions/validate_string.rb:32:in `block in <module:Functions>'
    # puppet-4.7.0/lib/puppet/parser/functions.rb:174:in `block (2 levels) in newfunction'
    # puppet-4.7.0/lib/puppet/util/profiler/around_profiler.rb:58:in `profile'
    # puppet-4.7.0/lib/puppet/util/profiler.rb:51:in `profile'
    # puppet-4.7.0/lib/puppet/parser/functions.rb:167:in `block in newfunction'
    # ./spec/fixtures/modules/stdlib/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb:13:in `block (2 levels) in deprecation_gen'
---
 lib/puppet/parser/functions/validate_string.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/validate_string.rb b/lib/puppet/parser/functions/validate_string.rb
index e92a2fc..0057fc1 100644
--- a/lib/puppet/parser/functions/validate_string.rb
+++ b/lib/puppet/parser/functions/validate_string.rb
@@ -30,7 +30,7 @@ module Puppet::Parser::Functions
     end
 
     args.each do |arg|
-      unless arg.is_a?(String)
+      unless arg.is_a?(String) || arg.nil?
         raise Puppet::ParseError, ("#{arg.inspect} is not a string.  It looks to be a #{arg.class}")
       end
     end
-- 
cgit v1.2.3


From 3c12e20526b4c6c6e36f6acc103f42f7e5915477 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 4 Oct 2016 14:11:17 +0100
Subject: (MODULES-3933) Fix getparam for 'false' values

This is the idiomatic version of #634, and also addresses
the test failures.

Original-Fix-By: Michiel Brandenburg <michiel@silverstreet.com>
---
 lib/puppet/parser/functions/getparam.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/getparam.rb b/lib/puppet/parser/functions/getparam.rb
index 6d51006..0a5cbe0 100644
--- a/lib/puppet/parser/functions/getparam.rb
+++ b/lib/puppet/parser/functions/getparam.rb
@@ -28,7 +28,7 @@ ENDOFDOC
   return '' if param.empty?
 
   if resource = findresource(reference.to_s)
-    return resource[param] if resource[param]
+    return resource[param] unless resource[param].nil?
   end
 
   return ''
-- 
cgit v1.2.3


From bcab71ded8507de4fd9f89b4dcf798b3d98ace59 Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Thu, 6 Oct 2016 15:23:35 -0700
Subject: (MODULES-3590) Fix match_for_absence parameter

Prior to this commit, due to a bug in the exists? method in the
file_line provider, match_for_absence didn't work as described (or
at all really). Update the exists? logic so that match_for_absence
works as described.

Additionally add a unit test to prevent regressions and update the
documentation for the parameter to reflect the fact that it is
ignored when `ensure => present`.
---
 lib/puppet/provider/file_line/ruby.rb | 6 +++++-
 lib/puppet/type/file_line.rb          | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index aab6fe2..beeb430 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -4,7 +4,11 @@ Puppet::Type.type(:file_line).provide(:ruby) do
       true
     else
       lines.find do |line|
-        line.chomp == resource[:line].chomp
+        if resource[:ensure].to_s == 'absent' and resource[:match_for_absence].to_s == 'true'
+          line.chomp =~ Regexp.new(resource[:match])
+        else
+          line.chomp == resource[:line].chomp
+        end
       end
     end
   end
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 6f5c188..7b7d44e 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -71,7 +71,8 @@ Puppet::Type.newtype(:file_line) do
   newparam(:match_for_absence) do
     desc 'An optional value to determine if match should be applied when ensure => absent.' +
          ' If set to true and match is set, the line that matches match will be deleted.' +
-         ' If set to false (the default), match is ignored when ensure => absent.'
+         ' If set to false (the default), match is ignored when ensure => absent.' +
+         ' When `ensure => present`, match_for_absence is ignored.'
     newvalues(true, false)
     defaultto false
   end
-- 
cgit v1.2.3


From a4ebae621dd4dc09d760a51b8b221a3250142789 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 7 Oct 2016 13:00:06 +0100
Subject: (FM-5703, PUP-6717) Remove the dynamic deprecation_gen

This was not working when the puppet master did not have the newest stdlib
version in its environment.
---
 lib/puppet/functions/validate_absolute_path.rb    | 13 ++++++++++---
 lib/puppet/functions/validate_array.rb            | 13 ++++++++++---
 lib/puppet/functions/validate_bool.rb             | 13 ++++++++++---
 lib/puppet/functions/validate_hash.rb             | 13 ++++++++++---
 lib/puppet/functions/validate_integer.rb          | 13 ++++++++++---
 lib/puppet/functions/validate_ip_address.rb       | 13 ++++++++++---
 lib/puppet/functions/validate_ipv4_address.rb     | 13 ++++++++++---
 lib/puppet/functions/validate_ipv6_address.rb     | 13 ++++++++++---
 lib/puppet/functions/validate_numeric.rb          | 13 ++++++++++---
 lib/puppet/functions/validate_re.rb               | 13 ++++++++++---
 lib/puppet/functions/validate_string.rb           | 13 ++++++++++---
 lib/puppet/parser/functions/validate_slength.rb   |  2 +-
 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb | 19 -------------------
 13 files changed, 111 insertions(+), 53 deletions(-)
 delete mode 100644 lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
index 5ae9d29..94f52e1 100644
--- a/lib/puppet/functions/validate_absolute_path.rb
+++ b/lib/puppet/functions/validate_absolute_path.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_absolute_path", "Stdlib::Compat::Absolute_Path")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_absolute_path, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_Path. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_absolute_path", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
index 9155784..eb8f5e5 100644
--- a/lib/puppet/functions/validate_array.rb
+++ b/lib/puppet/functions/validate_array.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_array", "Stdlib::Compat::Array")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_array, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_array", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
index 10f6edf..168775d 100644
--- a/lib/puppet/functions/validate_bool.rb
+++ b/lib/puppet/functions/validate_bool.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_bool", "Stdlib::Compat::Bool")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_bool, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_bool", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
index 5349664..c356ceb 100644
--- a/lib/puppet/functions/validate_hash.rb
+++ b/lib/puppet/functions/validate_hash.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_hash", "Stdlib::Compat::Hash")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_hash, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_hash", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
index 2c4645d..db95f1c 100644
--- a/lib/puppet/functions/validate_integer.rb
+++ b/lib/puppet/functions/validate_integer.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_integer", "Stdlib::Compat::Integer")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_integer, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_integer", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
index 15a710e..eaf56bb 100644
--- a/lib/puppet/functions/validate_ip_address.rb
+++ b/lib/puppet/functions/validate_ip_address.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ip_address", "Stdlib::Compat::Ip_Address")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_ip_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_Address. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_ip_address", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
index 8e1bc59..6a870eb 100644
--- a/lib/puppet/functions/validate_ipv4_address.rb
+++ b/lib/puppet/functions/validate_ipv4_address.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv4_address", "Stdlib::Compat::Ipv4_Address")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_ipv4_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4_Address. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_ipv4_address", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
index 865648a..922a9ac 100644
--- a/lib/puppet/functions/validate_ipv6_address.rb
+++ b/lib/puppet/functions/validate_ipv6_address.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_ipv6_address", "Stdlib::Compat::Ipv6_address")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_ipv6_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6_address. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_ipv6_address", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
index 0c2e1f2..e48bec4 100644
--- a/lib/puppet/functions/validate_numeric.rb
+++ b/lib/puppet/functions/validate_numeric.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_numeric", "Stdlib::Compat::Numeric")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_numeric, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_numeric", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
index d63ed42..8a95077 100644
--- a/lib/puppet/functions/validate_re.rb
+++ b/lib/puppet/functions/validate_re.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_re", "Stdlib::Compat::Re")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_re, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Pattern[]. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_re", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
index a196f43..fe4c623 100644
--- a/lib/puppet/functions/validate_string.rb
+++ b/lib/puppet/functions/validate_string.rb
@@ -1,3 +1,10 @@
-require 'puppet_x/puppetlabs/stdlib/deprecation_gen'
-PuppetX::Puppetlabs::Stdlib.deprecation_gen("validate_string", "Stdlib::Compat::String")
-# Puppet::Functions.create_function
+Puppet::Functions.create_function(:validate_string, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_string", args)
+  end
+end
diff --git a/lib/puppet/parser/functions/validate_slength.rb b/lib/puppet/parser/functions/validate_slength.rb
index 1641e5a..1828f49 100644
--- a/lib/puppet/parser/functions/validate_slength.rb
+++ b/lib/puppet/parser/functions/validate_slength.rb
@@ -21,7 +21,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String[x]. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.'])
 
     raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
 
diff --git a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb b/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
deleted file mode 100644
index 0d8908d..0000000
--- a/lib/puppet_x/puppetlabs/stdlib/deprecation_gen.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# Creates a Puppet 4 function for the corresponding puppet 3 validate function, who's name will be passed as an argument, alongside the type for deprecation output purposes.
-module PuppetX
-  module Puppetlabs
-    module Stdlib
-      def self.deprecation_gen(funct, type)
-        Puppet::Functions.create_function(funct, Puppet::Functions::InternalFunction) do
-          dispatch :deprecation_gen do
-            scope_param
-            optional_repeated_param 'Any', :args
-          end
-          define_method 'deprecation_gen' do |scope, *args|
-            call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with #{type}. There is further documentation for validate_legacy function in the README.")
-            scope.send("function_#{funct}", args)
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.3


From ddae9880025b6dfdc3b5a8c177548c8eb5e50a91 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Fri, 7 Oct 2016 13:00:16 +0100
Subject: (Maint) add missing validate_slength deprecation

---
 lib/puppet/functions/validate_slength.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/puppet/functions/validate_slength.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/validate_slength.rb b/lib/puppet/functions/validate_slength.rb
new file mode 100644
index 0000000..2d71a14
--- /dev/null
+++ b/lib/puppet/functions/validate_slength.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:validate_slength, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.")
+    scope.send("function_validate_slength", args)
+  end
+end
-- 
cgit v1.2.3


From f6bd01b784d279d477f327e5da76f3c27fcf4156 Mon Sep 17 00:00:00 2001
From: Maksym Melnychok <keymone@gmail.com>
Date: Thu, 6 Oct 2016 16:36:29 +0200
Subject: Ignore :undefined_variable "reason" in getvar

`catch` returns value of second argument to `throw`, which until 860a2761f334c964068038b3ef6853f08beb1df5 was `nil`, but now is non-falsey reason for error. short-circuit using return and eval to nil if `throw` was caught.
---
 lib/puppet/parser/functions/getvar.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/getvar.rb b/lib/puppet/parser/functions/getvar.rb
index ae9c869..aa6edbb 100644
--- a/lib/puppet/parser/functions/getvar.rb
+++ b/lib/puppet/parser/functions/getvar.rb
@@ -21,8 +21,10 @@ module Puppet::Parser::Functions
 
     begin
       catch(:undefined_variable) do
-        self.lookupvar("#{args[0]}")
+        return self.lookupvar("#{args[0]}")
       end
+      
+      nil # throw was caught
     rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end
 
-- 
cgit v1.2.3


From e44238a9c7da7ad4a872ba86cd103becadd51b3b Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Sat, 8 Oct 2016 18:10:53 +0100
Subject: Revert "Addition of logging with file and line numbers"

This reverts commit b63862ff43194194f7428739a32cfe13bad1e7ed, as it would
only show the irrelevant first entry of the ruby stack trace. The
puppetserver log does contain the full trace information, or you can use
--strict=error to cause a hard failure when hitting a deprecation.

# Conflicts:
#	lib/puppet/functions/validate_legacy.rb
---
 lib/puppet/functions/deprecation.rb        | 8 +++-----
 lib/puppet/functions/validate_legacy.rb    | 3 +--
 lib/puppet/parser/functions/deprecation.rb | 4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 30aeb1d..6b7b977 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,4 +1,5 @@
 # Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method  It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning)  *Type*: String, String.
+#
 
 Puppet::Functions.create_function(:deprecation) do
   dispatch :deprecation do
@@ -8,16 +9,13 @@ Puppet::Functions.create_function(:deprecation) do
 
   def deprecation(key, message)
     # depending on configuration setting of strict
-    caller_infos = caller.first.split(":")
     case Puppet.settings[:strict]
     when :off
       # do nothing
     when :error
-      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
-      fail("deprecation. #{key}. #{err_message}")
+      fail("deprecation. #{key}. #{message}")
     else
-      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
-      Puppet.deprecation_warning(err_message, key)
+      Puppet.deprecation_warning(message, key)
     end
   end
 end
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 0ba6dd8..3f50459 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -30,9 +30,8 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
         Puppet.notice("Accepting previously invalid value for target type '#{target_type}'")
       end
     else
-      caller_infos = caller.first.split(":")
       inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
-      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name}) [#{caller_infos[0]}:#{caller_infos[1]}]", target_type, inferred_type)
+      error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name})", target_type, inferred_type)
       if previous_validation(scope, function_name, value, *prev_args)
         call_function('deprecation', 'validate_legacy', error_msg)
       else
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index 0cb247d..e30f3a0 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -11,9 +11,7 @@ EOS
     message = arguments[1]
     
     if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
-      caller_infos = caller.first.split(":")
-      err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
-      warning("deprecation. #{key}. #{err_message}")
+      warning("deprecation. #{key}. #{message}")
     end
   end
 end
-- 
cgit v1.2.3


From bec521e6b79dd612a73e742d1cb6371e17ade1a9 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Sat, 8 Oct 2016 18:28:22 +0100
Subject: Update deprecation() so warnings can be disabled for CI

---
 lib/puppet/functions/deprecation.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 6b7b977..a860aa2 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -15,7 +15,9 @@ Puppet::Functions.create_function(:deprecation) do
     when :error
       fail("deprecation. #{key}. #{message}")
     else
-      Puppet.deprecation_warning(message, key)
+      unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
+        Puppet.deprecation_warning(message, key)
+      end
     end
   end
 end
-- 
cgit v1.2.3


From b92fad2b7667df836f8ca4eb92d8c8be84bd0538 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 12 Oct 2016 10:04:54 +0100
Subject: (MODULES-3961) emit more deprecation warnings

This now emits one deprecation warning for each function used (but not for each call-site). Prior to this, only a single deprecation warning would have been triggered, potentially misleading users.

Additionally this adds v4 deprecation stubs for the functions that were missed.
---
 lib/puppet/functions/is_absolute_path.rb              | 10 ++++++++++
 lib/puppet/functions/is_array.rb                      | 10 ++++++++++
 lib/puppet/functions/is_bool.rb                       | 10 ++++++++++
 lib/puppet/functions/is_float.rb                      | 10 ++++++++++
 lib/puppet/functions/is_ip_address.rb                 | 10 ++++++++++
 lib/puppet/functions/is_ipv4_address.rb               | 10 ++++++++++
 lib/puppet/functions/is_ipv6_address.rb               | 10 ++++++++++
 lib/puppet/functions/is_numeric.rb                    | 10 ++++++++++
 lib/puppet/functions/is_string.rb                     | 10 ++++++++++
 lib/puppet/functions/validate_absolute_path.rb        |  2 +-
 lib/puppet/functions/validate_array.rb                |  2 +-
 lib/puppet/functions/validate_bool.rb                 |  2 +-
 lib/puppet/functions/validate_hash.rb                 |  2 +-
 lib/puppet/functions/validate_integer.rb              |  2 +-
 lib/puppet/functions/validate_ip_address.rb           |  2 +-
 lib/puppet/functions/validate_ipv4_address.rb         |  2 +-
 lib/puppet/functions/validate_ipv6_address.rb         |  2 +-
 lib/puppet/functions/validate_numeric.rb              |  2 +-
 lib/puppet/functions/validate_re.rb                   |  2 +-
 lib/puppet/functions/validate_slength.rb              |  2 +-
 lib/puppet/functions/validate_string.rb               |  2 +-
 lib/puppet/parser/functions/is_absolute_path.rb       |  2 +-
 lib/puppet/parser/functions/is_array.rb               |  2 +-
 lib/puppet/parser/functions/is_bool.rb                |  2 +-
 lib/puppet/parser/functions/is_float.rb               |  2 +-
 lib/puppet/parser/functions/is_ip_address.rb          |  2 +-
 lib/puppet/parser/functions/is_ipv4_address.rb        |  2 +-
 lib/puppet/parser/functions/is_ipv6_address.rb        |  2 +-
 lib/puppet/parser/functions/is_numeric.rb             |  2 +-
 lib/puppet/parser/functions/is_string.rb              |  5 +++--
 lib/puppet/parser/functions/validate_absolute_path.rb |  2 +-
 lib/puppet/parser/functions/validate_array.rb         |  2 +-
 lib/puppet/parser/functions/validate_bool.rb          |  2 +-
 lib/puppet/parser/functions/validate_hash.rb          |  2 +-
 lib/puppet/parser/functions/validate_integer.rb       |  4 ++--
 lib/puppet/parser/functions/validate_ip_address.rb    |  6 +++---
 lib/puppet/parser/functions/validate_ipv4_address.rb  |  2 +-
 lib/puppet/parser/functions/validate_ipv6_address.rb  |  2 +-
 lib/puppet/parser/functions/validate_numeric.rb       |  4 ++--
 lib/puppet/parser/functions/validate_re.rb            |  2 +-
 lib/puppet/parser/functions/validate_slength.rb       |  2 +-
 lib/puppet/parser/functions/validate_string.rb        |  9 +++++----
 42 files changed, 133 insertions(+), 41 deletions(-)
 create mode 100644 lib/puppet/functions/is_absolute_path.rb
 create mode 100644 lib/puppet/functions/is_array.rb
 create mode 100644 lib/puppet/functions/is_bool.rb
 create mode 100644 lib/puppet/functions/is_float.rb
 create mode 100644 lib/puppet/functions/is_ip_address.rb
 create mode 100644 lib/puppet/functions/is_ipv4_address.rb
 create mode 100644 lib/puppet/functions/is_ipv6_address.rb
 create mode 100644 lib/puppet/functions/is_numeric.rb
 create mode 100644 lib/puppet/functions/is_string.rb

(limited to 'lib')

diff --git a/lib/puppet/functions/is_absolute_path.rb b/lib/puppet/functions/is_absolute_path.rb
new file mode 100644
index 0000000..0a100f8
--- /dev/null
+++ b/lib/puppet/functions/is_absolute_path.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_absolute_path, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_absolute_path', "This method is deprecated, please use match expressions with Stdlib::Compat::Absolute_Path instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_absolute_path", args)
+  end
+end
diff --git a/lib/puppet/functions/is_array.rb b/lib/puppet/functions/is_array.rb
new file mode 100644
index 0000000..0542a63
--- /dev/null
+++ b/lib/puppet/functions/is_array.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_array, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_array', "This method is deprecated, please use match expressions with Stdlib::Compat::Array instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_array", args)
+  end
+end
diff --git a/lib/puppet/functions/is_bool.rb b/lib/puppet/functions/is_bool.rb
new file mode 100644
index 0000000..ff1d462
--- /dev/null
+++ b/lib/puppet/functions/is_bool.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_bool, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_bool', "This method is deprecated, please use match expressions with Stdlib::Compat::Bool instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_bool", args)
+  end
+end
diff --git a/lib/puppet/functions/is_float.rb b/lib/puppet/functions/is_float.rb
new file mode 100644
index 0000000..b3763f2
--- /dev/null
+++ b/lib/puppet/functions/is_float.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_float, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_float', "This method is deprecated, please use match expressions with Stdlib::Compat::Float instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_float", args)
+  end
+end
diff --git a/lib/puppet/functions/is_ip_address.rb b/lib/puppet/functions/is_ip_address.rb
new file mode 100644
index 0000000..e584714
--- /dev/null
+++ b/lib/puppet/functions/is_ip_address.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_ip_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_ip_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ip_address instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_ip_address", args)
+  end
+end
diff --git a/lib/puppet/functions/is_ipv4_address.rb b/lib/puppet/functions/is_ipv4_address.rb
new file mode 100644
index 0000000..76c75e5
--- /dev/null
+++ b/lib/puppet/functions/is_ipv4_address.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_ipv4_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_ipv4_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ipv4 instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_ipv4_address", args)
+  end
+end
diff --git a/lib/puppet/functions/is_ipv6_address.rb b/lib/puppet/functions/is_ipv6_address.rb
new file mode 100644
index 0000000..dbf5282
--- /dev/null
+++ b/lib/puppet/functions/is_ipv6_address.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_ipv6_address, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_ipv4_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ipv6 instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_ipv6_address", args)
+  end
+end
diff --git a/lib/puppet/functions/is_numeric.rb b/lib/puppet/functions/is_numeric.rb
new file mode 100644
index 0000000..3a0f0cd
--- /dev/null
+++ b/lib/puppet/functions/is_numeric.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_numeric, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_numeric', "This method is deprecated, please use match expressions with Stdlib::Compat::Numeric instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_numeric", args)
+  end
+end
diff --git a/lib/puppet/functions/is_string.rb b/lib/puppet/functions/is_string.rb
new file mode 100644
index 0000000..4978284
--- /dev/null
+++ b/lib/puppet/functions/is_string.rb
@@ -0,0 +1,10 @@
+Puppet::Functions.create_function(:is_string, Puppet::Functions::InternalFunction) do
+  dispatch :deprecation_gen do
+    scope_param
+    optional_repeated_param 'Any', :args
+  end
+  def deprecation_gen(scope, *args)
+    call_function('deprecation', 'is_string', "This method is deprecated, please use match expressions with Stdlib::Compat::String instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
+    scope.send("function_is_string", args)
+  end
+end
diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
index 94f52e1..946ff31 100644
--- a/lib/puppet/functions/validate_absolute_path.rb
+++ b/lib/puppet/functions/validate_absolute_path.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_absolute_path, Puppet::Functions::In
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_Path. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_absolute_path', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_Path. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_absolute_path", args)
   end
 end
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
index eb8f5e5..c8553c4 100644
--- a/lib/puppet/functions/validate_array.rb
+++ b/lib/puppet/functions/validate_array.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_array, Puppet::Functions::InternalFu
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_array', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_array", args)
   end
 end
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
index 168775d..9d68cc9 100644
--- a/lib/puppet/functions/validate_bool.rb
+++ b/lib/puppet/functions/validate_bool.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_bool, Puppet::Functions::InternalFun
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_bool', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_bool", args)
   end
 end
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
index c356ceb..fdd8e01 100644
--- a/lib/puppet/functions/validate_hash.rb
+++ b/lib/puppet/functions/validate_hash.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_hash, Puppet::Functions::InternalFun
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_hash', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_hash", args)
   end
 end
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
index db95f1c..63a3523 100644
--- a/lib/puppet/functions/validate_integer.rb
+++ b/lib/puppet/functions/validate_integer.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_integer, Puppet::Functions::Internal
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_integer', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_integer", args)
   end
 end
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
index eaf56bb..c9c52bb 100644
--- a/lib/puppet/functions/validate_ip_address.rb
+++ b/lib/puppet/functions/validate_ip_address.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_ip_address, Puppet::Functions::Inter
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_Address. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_ip_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_Address. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_ip_address", args)
   end
 end
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
index 6a870eb..d501f7a 100644
--- a/lib/puppet/functions/validate_ipv4_address.rb
+++ b/lib/puppet/functions/validate_ipv4_address.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_ipv4_address, Puppet::Functions::Int
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4_Address. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_ipv4_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4_Address. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_ipv4_address", args)
   end
 end
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
index 922a9ac..aa8044f 100644
--- a/lib/puppet/functions/validate_ipv6_address.rb
+++ b/lib/puppet/functions/validate_ipv6_address.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_ipv6_address, Puppet::Functions::Int
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6_address. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_ipv6_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6_address. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_ipv6_address", args)
   end
 end
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
index e48bec4..7db5c90 100644
--- a/lib/puppet/functions/validate_numeric.rb
+++ b/lib/puppet/functions/validate_numeric.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_numeric, Puppet::Functions::Internal
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_numeric', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_numeric", args)
   end
 end
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
index 8a95077..ae5d9f1 100644
--- a/lib/puppet/functions/validate_re.rb
+++ b/lib/puppet/functions/validate_re.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_re, Puppet::Functions::InternalFunct
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Pattern[]. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_re', "This method is deprecated, please use the stdlib validate_legacy function, with Pattern[]. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_re", args)
   end
 end
diff --git a/lib/puppet/functions/validate_slength.rb b/lib/puppet/functions/validate_slength.rb
index 2d71a14..c3c29a5 100644
--- a/lib/puppet/functions/validate_slength.rb
+++ b/lib/puppet/functions/validate_slength.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_slength, Puppet::Functions::Internal
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_slength', "This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_slength", args)
   end
 end
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
index fe4c623..9b0b731 100644
--- a/lib/puppet/functions/validate_string.rb
+++ b/lib/puppet/functions/validate_string.rb
@@ -4,7 +4,7 @@ Puppet::Functions.create_function(:validate_string, Puppet::Functions::InternalF
     optional_repeated_param 'Any', :args
   end
   def deprecation_gen(scope, *args)
-    call_function('deprecation', 'puppet_3_type_check', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.")
+    call_function('deprecation', 'validate_string', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.")
     scope.send("function_validate_string", args)
   end
 end
diff --git a/lib/puppet/parser/functions/is_absolute_path.rb b/lib/puppet/parser/functions/is_absolute_path.rb
index 2e37414..e64777f 100644
--- a/lib/puppet/parser/functions/is_absolute_path.rb
+++ b/lib/puppet/parser/functions/is_absolute_path.rb
@@ -23,7 +23,7 @@ module Puppet::Parser::Functions
         is_absolute_path($undefined)
 
   ENDHEREDOC
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_absolute_path, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
     require 'puppet/util'
 
     path = args[0]
diff --git a/lib/puppet/parser/functions/is_array.rb b/lib/puppet/parser/functions/is_array.rb
index d1bb58a..1d2c0fa 100644
--- a/lib/puppet/parser/functions/is_array.rb
+++ b/lib/puppet/parser/functions/is_array.rb
@@ -8,7 +8,7 @@ Returns true if the variable passed to this function is an array.
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_array, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
 
     raise(Puppet::ParseError, "is_array(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
diff --git a/lib/puppet/parser/functions/is_bool.rb b/lib/puppet/parser/functions/is_bool.rb
index 48aaa08..83d2ebe 100644
--- a/lib/puppet/parser/functions/is_bool.rb
+++ b/lib/puppet/parser/functions/is_bool.rb
@@ -8,7 +8,7 @@ Returns true if the variable passed to this function is a boolean.
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_bool, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
 
     raise(Puppet::ParseError, "is_bool(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size != 1
diff --git a/lib/puppet/parser/functions/is_float.rb b/lib/puppet/parser/functions/is_float.rb
index 5233e40..1186458 100644
--- a/lib/puppet/parser/functions/is_float.rb
+++ b/lib/puppet/parser/functions/is_float.rb
@@ -8,7 +8,7 @@ Returns true if the variable passed to this function is a float.
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Float. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_float, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Float. There is further documentation for validate_legacy function in the README.'])
 
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_float(): Wrong number of arguments "+
diff --git a/lib/puppet/parser/functions/is_ip_address.rb b/lib/puppet/parser/functions/is_ip_address.rb
index 1901b2c..5f1d765 100644
--- a/lib/puppet/parser/functions/is_ip_address.rb
+++ b/lib/puppet/parser/functions/is_ip_address.rb
@@ -10,7 +10,7 @@ Returns true if the string passed to this function is a valid IP address.
 
     require 'ipaddr'
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
 
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_ip_address(): Wrong number of arguments "+
diff --git a/lib/puppet/parser/functions/is_ipv4_address.rb b/lib/puppet/parser/functions/is_ipv4_address.rb
index c90fa64..1764e61 100644
--- a/lib/puppet/parser/functions/is_ipv4_address.rb
+++ b/lib/puppet/parser/functions/is_ipv4_address.rb
@@ -10,7 +10,7 @@ Returns true if the string passed to this function is a valid IPv4 address.
 
     require 'ipaddr'
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_ipv4_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
 
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_ipv4_address(): Wrong number of arguments "+
diff --git a/lib/puppet/parser/functions/is_ipv6_address.rb b/lib/puppet/parser/functions/is_ipv6_address.rb
index aec3483..7ca4997 100644
--- a/lib/puppet/parser/functions/is_ipv6_address.rb
+++ b/lib/puppet/parser/functions/is_ipv6_address.rb
@@ -8,7 +8,7 @@ Returns true if the string passed to this function is a valid IPv6 address.
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_ipv6_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
 
     require 'ipaddr'
 
diff --git a/lib/puppet/parser/functions/is_numeric.rb b/lib/puppet/parser/functions/is_numeric.rb
index 2bdd353..4a55225 100644
--- a/lib/puppet/parser/functions/is_numeric.rb
+++ b/lib/puppet/parser/functions/is_numeric.rb
@@ -24,7 +24,7 @@ Valid examples:
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_numeric, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
 
     if (arguments.size != 1) then
       raise(Puppet::ParseError, "is_numeric(): Wrong number of arguments "+
diff --git a/lib/puppet/parser/functions/is_string.rb b/lib/puppet/parser/functions/is_string.rb
index 144cf51..31ee91e 100644
--- a/lib/puppet/parser/functions/is_string.rb
+++ b/lib/puppet/parser/functions/is_string.rb
@@ -8,14 +8,15 @@ Returns true if the variable passed to this function is a string.
     EOS
   ) do |arguments|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:is_string, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
 
     raise(Puppet::ParseError, "is_string(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
     type = arguments[0]
 
-    result = type.is_a?(String)
+    # when called through the v4 API shim, undef gets translated to nil
+    result = type.is_a?(String) || type.nil?
 
     if result and (type == type.to_f.to_s or type == type.to_i.to_s) then
       return false
diff --git a/lib/puppet/parser/functions/validate_absolute_path.rb b/lib/puppet/parser/functions/validate_absolute_path.rb
index 15b5c57..c73f3df 100644
--- a/lib/puppet/parser/functions/validate_absolute_path.rb
+++ b/lib/puppet/parser/functions/validate_absolute_path.rb
@@ -27,7 +27,7 @@ module Puppet::Parser::Functions
     ENDHEREDOC
 
     # The deprecation function was being called twice, as validate_absolute_path calls is_absolute_path. I have removed it from here so it only calls deprecation once within is_absolute_path.
-    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
+    # function_deprecation([:validate_absolute_path, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_path. There is further documentation for validate_legacy function in the README.'])
 
     require 'puppet/util'
 
diff --git a/lib/puppet/parser/functions/validate_array.rb b/lib/puppet/parser/functions/validate_array.rb
index 97bd41d..3bf3983 100644
--- a/lib/puppet/parser/functions/validate_array.rb
+++ b/lib/puppet/parser/functions/validate_array.rb
@@ -18,7 +18,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_array, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_array(): wrong number of arguments (#{args.length}; must be > 0)")
diff --git a/lib/puppet/parser/functions/validate_bool.rb b/lib/puppet/parser/functions/validate_bool.rb
index e4345eb..49075b8 100644
--- a/lib/puppet/parser/functions/validate_bool.rb
+++ b/lib/puppet/parser/functions/validate_bool.rb
@@ -20,7 +20,7 @@ module Puppet::Parser::Functions
     ENDHEREDOC
 
     # The deprecation function was being called twice, as validate_bool calls is_bool. I have removed it from here so it only calls deprecation once within is_bool.
-    # function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
+    # function_deprecation([:validate_bool, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
diff --git a/lib/puppet/parser/functions/validate_hash.rb b/lib/puppet/parser/functions/validate_hash.rb
index 800a758..fcdc7e1 100644
--- a/lib/puppet/parser/functions/validate_hash.rb
+++ b/lib/puppet/parser/functions/validate_hash.rb
@@ -18,7 +18,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_hash, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_hash(): wrong number of arguments (#{args.length}; must be > 0)")
diff --git a/lib/puppet/parser/functions/validate_integer.rb b/lib/puppet/parser/functions/validate_integer.rb
index f52e053..2ae0293 100644
--- a/lib/puppet/parser/functions/validate_integer.rb
+++ b/lib/puppet/parser/functions/validate_integer.rb
@@ -2,7 +2,7 @@ module Puppet::Parser::Functions
 
   newfunction(:validate_integer, :doc => <<-'ENDHEREDOC') do |args|
     Validate that the first argument is an integer (or an array of integers). Abort catalog compilation if any of the checks fail.
-    
+
     The second argument is optional and passes a maximum. (All elements of) the first argument has to be less or equal to this max.
 
     The third argument is optional and passes a minimum.  (All elements of) the first argument has to be greater or equal to this min.
@@ -53,7 +53,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_integer, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.'])
 
     # tell the user we need at least one, and optionally up to two other parameters
     raise Puppet::ParseError, "validate_integer(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
diff --git a/lib/puppet/parser/functions/validate_ip_address.rb b/lib/puppet/parser/functions/validate_ip_address.rb
index 3377c76..5d80cfb 100644
--- a/lib/puppet/parser/functions/validate_ip_address.rb
+++ b/lib/puppet/parser/functions/validate_ip_address.rb
@@ -8,12 +8,12 @@ module Puppet::Parser::Functions
     $my_ip = "1.2.3.4"
     validate_ip_address($my_ip)
     validate_ip_address("8.8.8.8", "172.16.0.1", $my_ip)
-    
+
     $my_ip = "3ffe:505:2"
     validate_ip_address(1)
     validate_ip_address($my_ip)
     validate_ip_address("fe80::baf6:b1ff:fe19:7507", $my_ip)
-   
+
     The following values will fail, causing compilation to abort:
     $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
     validate_ip_address($some_array)
@@ -23,7 +23,7 @@ module Puppet::Parser::Functions
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
 
     if defined?(IPAddr::InvalidAddressError)
       rescuable_exceptions << IPAddr::InvalidAddressError
diff --git a/lib/puppet/parser/functions/validate_ipv4_address.rb b/lib/puppet/parser/functions/validate_ipv4_address.rb
index fb2260c..0660abd 100644
--- a/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ b/lib/puppet/parser/functions/validate_ipv4_address.rb
@@ -18,7 +18,7 @@ module Puppet::Parser::Functions
     ENDHEREDOC
   ) do |args|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_ipv4_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
 
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
diff --git a/lib/puppet/parser/functions/validate_ipv6_address.rb b/lib/puppet/parser/functions/validate_ipv6_address.rb
index 4dedcd6..f5dd9e5 100644
--- a/lib/puppet/parser/functions/validate_ipv6_address.rb
+++ b/lib/puppet/parser/functions/validate_ipv6_address.rb
@@ -19,7 +19,7 @@ module Puppet::Parser::Functions
     ENDHEREDOC
   ) do |args|
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_ipv6_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6. There is further documentation for validate_legacy function in the README.'])
 
     require "ipaddr"
     rescuable_exceptions = [ ArgumentError ]
diff --git a/lib/puppet/parser/functions/validate_numeric.rb b/lib/puppet/parser/functions/validate_numeric.rb
index 6b55f49..4205b30 100644
--- a/lib/puppet/parser/functions/validate_numeric.rb
+++ b/lib/puppet/parser/functions/validate_numeric.rb
@@ -2,7 +2,7 @@ module Puppet::Parser::Functions
 
   newfunction(:validate_numeric, :doc => <<-'ENDHEREDOC') do |args|
     Validate that the first argument is a numeric value (or an array of numeric values). Abort catalog compilation if any of the checks fail.
-    
+
     The second argument is optional and passes a maximum. (All elements of) the first argument has to be less or equal to this max.
 
     The third argument is optional and passes a minimum.  (All elements of) the first argument has to be greater or equal to this min.
@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_numeric, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.'])
 
     # tell the user we need at least one, and optionally up to two other parameters
     raise Puppet::ParseError, "validate_numeric(): Wrong number of arguments; must be 1, 2 or 3, got #{args.length}" unless args.length > 0 and args.length < 4
diff --git a/lib/puppet/parser/functions/validate_re.rb b/lib/puppet/parser/functions/validate_re.rb
index 6bdc858..0ac83dd 100644
--- a/lib/puppet/parser/functions/validate_re.rb
+++ b/lib/puppet/parser/functions/validate_re.rb
@@ -30,7 +30,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Re. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_re, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Re. There is further documentation for validate_legacy function in the README.'])
 
     if (args.length < 2) or (args.length > 3) then
       raise Puppet::ParseError, "validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)"
diff --git a/lib/puppet/parser/functions/validate_slength.rb b/lib/puppet/parser/functions/validate_slength.rb
index 1828f49..383855c 100644
--- a/lib/puppet/parser/functions/validate_slength.rb
+++ b/lib/puppet/parser/functions/validate_slength.rb
@@ -21,7 +21,7 @@ module Puppet::Parser::Functions
 
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_slength, 'This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.'])
 
     raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
 
diff --git a/lib/puppet/parser/functions/validate_string.rb b/lib/puppet/parser/functions/validate_string.rb
index 0057fc1..6675d86 100644
--- a/lib/puppet/parser/functions/validate_string.rb
+++ b/lib/puppet/parser/functions/validate_string.rb
@@ -13,23 +13,24 @@ module Puppet::Parser::Functions
 
         validate_string(true)
         validate_string([ 'some', 'array' ])
-        
+
     Note: validate_string(undef) will not fail in this version of the
     functions API (incl. current and future parser). Instead, use:
-    
+
         if $var == undef {
           fail('...')
         }
-    
+
     ENDHEREDOC
 
-    function_deprecation([:puppet_3_type_check, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_string, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.'])
 
     unless args.length > 0 then
       raise Puppet::ParseError, ("validate_string(): wrong number of arguments (#{args.length}; must be > 0)")
     end
 
     args.each do |arg|
+      # when called through the v4 API shim, undef gets translated to nil
       unless arg.is_a?(String) || arg.nil?
         raise Puppet::ParseError, ("#{arg.inspect} is not a string.  It looks to be a #{arg.class}")
       end
-- 
cgit v1.2.3


From f2741dc814c1b6c10d8dd69c17aabf5bae106c17 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 12 Oct 2016 13:25:33 +0100
Subject: (MODULES-3962) Rework v4 function shims to work on puppet 3.7 and
 4.0.0

This is a workaround for PUP-4438 (fixed in https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08, 4.1.0, 3.8.1).

It works by manually passing through the scope, instead of relying on the
InternalFunction class.
---
 lib/puppet/functions/is_absolute_path.rb       | 11 ++++++++---
 lib/puppet/functions/is_array.rb               | 11 ++++++++---
 lib/puppet/functions/is_bool.rb                | 11 ++++++++---
 lib/puppet/functions/is_float.rb               | 11 ++++++++---
 lib/puppet/functions/is_ip_address.rb          | 11 ++++++++---
 lib/puppet/functions/is_ipv4_address.rb        | 11 ++++++++---
 lib/puppet/functions/is_ipv6_address.rb        | 11 ++++++++---
 lib/puppet/functions/is_numeric.rb             | 11 ++++++++---
 lib/puppet/functions/is_string.rb              | 11 ++++++++---
 lib/puppet/functions/validate_absolute_path.rb | 11 ++++++++---
 lib/puppet/functions/validate_array.rb         | 11 ++++++++---
 lib/puppet/functions/validate_bool.rb          | 11 ++++++++---
 lib/puppet/functions/validate_hash.rb          | 11 ++++++++---
 lib/puppet/functions/validate_integer.rb       | 11 ++++++++---
 lib/puppet/functions/validate_ip_address.rb    | 11 ++++++++---
 lib/puppet/functions/validate_ipv4_address.rb  | 11 ++++++++---
 lib/puppet/functions/validate_ipv6_address.rb  | 11 ++++++++---
 lib/puppet/functions/validate_legacy.rb        | 16 +++++++++++-----
 lib/puppet/functions/validate_numeric.rb       | 11 ++++++++---
 lib/puppet/functions/validate_re.rb            | 11 ++++++++---
 lib/puppet/functions/validate_slength.rb       | 11 ++++++++---
 lib/puppet/functions/validate_string.rb        | 11 ++++++++---
 22 files changed, 179 insertions(+), 68 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/is_absolute_path.rb b/lib/puppet/functions/is_absolute_path.rb
index 0a100f8..b61064a 100644
--- a/lib/puppet/functions/is_absolute_path.rb
+++ b/lib/puppet/functions/is_absolute_path.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_absolute_path, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_absolute_path) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_absolute_path', "This method is deprecated, please use match expressions with Stdlib::Compat::Absolute_Path instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_array.rb b/lib/puppet/functions/is_array.rb
index 0542a63..a29fe8a 100644
--- a/lib/puppet/functions/is_array.rb
+++ b/lib/puppet/functions/is_array.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_array, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_array) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_array', "This method is deprecated, please use match expressions with Stdlib::Compat::Array instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_bool.rb b/lib/puppet/functions/is_bool.rb
index ff1d462..6e2c22b 100644
--- a/lib/puppet/functions/is_bool.rb
+++ b/lib/puppet/functions/is_bool.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_bool, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_bool) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_bool', "This method is deprecated, please use match expressions with Stdlib::Compat::Bool instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_float.rb b/lib/puppet/functions/is_float.rb
index b3763f2..c91aa5d 100644
--- a/lib/puppet/functions/is_float.rb
+++ b/lib/puppet/functions/is_float.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_float, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_float) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_float', "This method is deprecated, please use match expressions with Stdlib::Compat::Float instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_ip_address.rb b/lib/puppet/functions/is_ip_address.rb
index e584714..4c72037 100644
--- a/lib/puppet/functions/is_ip_address.rb
+++ b/lib/puppet/functions/is_ip_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_ip_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_ip_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_ip_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ip_address instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_ipv4_address.rb b/lib/puppet/functions/is_ipv4_address.rb
index 76c75e5..97b01ae 100644
--- a/lib/puppet/functions/is_ipv4_address.rb
+++ b/lib/puppet/functions/is_ipv4_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_ipv4_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_ipv4_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_ipv4_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ipv4 instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_ipv6_address.rb b/lib/puppet/functions/is_ipv6_address.rb
index dbf5282..be0c98a 100644
--- a/lib/puppet/functions/is_ipv6_address.rb
+++ b/lib/puppet/functions/is_ipv6_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_ipv6_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_ipv6_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_ipv4_address', "This method is deprecated, please use match expressions with Stdlib::Compat::Ipv6 instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_numeric.rb b/lib/puppet/functions/is_numeric.rb
index 3a0f0cd..f5e9d41 100644
--- a/lib/puppet/functions/is_numeric.rb
+++ b/lib/puppet/functions/is_numeric.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_numeric, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_numeric) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_numeric', "This method is deprecated, please use match expressions with Stdlib::Compat::Numeric instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/is_string.rb b/lib/puppet/functions/is_string.rb
index 4978284..a05a796 100644
--- a/lib/puppet/functions/is_string.rb
+++ b/lib/puppet/functions/is_string.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:is_string, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:is_string) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'is_string', "This method is deprecated, please use match expressions with Stdlib::Compat::String instead. They are described at https://docs.puppet.com/puppet/latest/reference/lang_data_type.html#match-expressions.")
diff --git a/lib/puppet/functions/validate_absolute_path.rb b/lib/puppet/functions/validate_absolute_path.rb
index 946ff31..a3c696d 100644
--- a/lib/puppet/functions/validate_absolute_path.rb
+++ b/lib/puppet/functions/validate_absolute_path.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_absolute_path, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_absolute_path) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_absolute_path', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Absolute_Path. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_array.rb b/lib/puppet/functions/validate_array.rb
index c8553c4..f59c6b4 100644
--- a/lib/puppet/functions/validate_array.rb
+++ b/lib/puppet/functions/validate_array.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_array, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_array) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_array', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Array. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_bool.rb b/lib/puppet/functions/validate_bool.rb
index 9d68cc9..5cfb2ac 100644
--- a/lib/puppet/functions/validate_bool.rb
+++ b/lib/puppet/functions/validate_bool.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_bool, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_bool) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_bool', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Bool. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_hash.rb b/lib/puppet/functions/validate_hash.rb
index fdd8e01..89ad9ab 100644
--- a/lib/puppet/functions/validate_hash.rb
+++ b/lib/puppet/functions/validate_hash.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_hash, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_hash) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_hash', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Hash. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_integer.rb b/lib/puppet/functions/validate_integer.rb
index 63a3523..475ea0f 100644
--- a/lib/puppet/functions/validate_integer.rb
+++ b/lib/puppet/functions/validate_integer.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_integer, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_integer) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_integer', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Integer. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_ip_address.rb b/lib/puppet/functions/validate_ip_address.rb
index c9c52bb..1521c08 100644
--- a/lib/puppet/functions/validate_ip_address.rb
+++ b/lib/puppet/functions/validate_ip_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_ip_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_ip_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_ip_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_Address. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_ipv4_address.rb b/lib/puppet/functions/validate_ipv4_address.rb
index d501f7a..fe66ab3 100644
--- a/lib/puppet/functions/validate_ipv4_address.rb
+++ b/lib/puppet/functions/validate_ipv4_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_ipv4_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_ipv4_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_ipv4_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4_Address. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_ipv6_address.rb b/lib/puppet/functions/validate_ipv6_address.rb
index aa8044f..7cc3cbd 100644
--- a/lib/puppet/functions/validate_ipv6_address.rb
+++ b/lib/puppet/functions/validate_ipv6_address.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_ipv6_address, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_ipv6_address) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_ipv6_address', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv6_address. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 3f50459..c9d1f56 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -1,20 +1,26 @@
-Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_legacy) do
   # The function checks a value against both the target_type (new) and the previous_validation function (old).
 
   dispatch :validate_legacy do
-    scope_param
+    param 'Any', :scope
     param 'Type', :target_type
     param 'String', :function_name
     param 'Any', :value
-    optional_repeated_param 'Any', :args
+    repeated_param 'Any', :args
   end
 
   dispatch :validate_legacy_s do
-    scope_param
+    param 'Any', :scope
     param 'String', :type_string
     param 'String', :function_name
     param 'Any', :value
-    optional_repeated_param 'Any', :args
+    repeated_param 'Any', :args
+  end
+
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
 
   def validate_legacy_s(scope, type_string, *args)
diff --git a/lib/puppet/functions/validate_numeric.rb b/lib/puppet/functions/validate_numeric.rb
index 7db5c90..3052d35 100644
--- a/lib/puppet/functions/validate_numeric.rb
+++ b/lib/puppet/functions/validate_numeric.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_numeric, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_numeric) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_numeric', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Numeric. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_re.rb b/lib/puppet/functions/validate_re.rb
index ae5d9f1..19443a8 100644
--- a/lib/puppet/functions/validate_re.rb
+++ b/lib/puppet/functions/validate_re.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_re, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_re) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_re', "This method is deprecated, please use the stdlib validate_legacy function, with Pattern[]. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_slength.rb b/lib/puppet/functions/validate_slength.rb
index c3c29a5..584232a 100644
--- a/lib/puppet/functions/validate_slength.rb
+++ b/lib/puppet/functions/validate_slength.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_slength, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_slength) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_slength', "This method is deprecated, please use the stdlib validate_legacy function, with String[]. There is further documentation for validate_legacy function in the README.")
diff --git a/lib/puppet/functions/validate_string.rb b/lib/puppet/functions/validate_string.rb
index 9b0b731..91ff004 100644
--- a/lib/puppet/functions/validate_string.rb
+++ b/lib/puppet/functions/validate_string.rb
@@ -1,7 +1,12 @@
-Puppet::Functions.create_function(:validate_string, Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:validate_string) do
   dispatch :deprecation_gen do
-    scope_param
-    optional_repeated_param 'Any', :args
+    param 'Any', :scope
+    repeated_param 'Any', :args
+  end
+  # Workaround PUP-4438 (fixed: https://github.com/puppetlabs/puppet/commit/e01c4dc924cd963ff6630008a5200fc6a2023b08#diff-c937cc584953271bb3d3b3c2cb141790R221) to support puppet < 4.1.0 and puppet < 3.8.1.
+  def call(scope, *args)
+    manipulated_args = [scope] + args
+    self.class.dispatcher.dispatch(self, scope, manipulated_args)
   end
   def deprecation_gen(scope, *args)
     call_function('deprecation', 'validate_string', "This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::String. There is further documentation for validate_legacy function in the README.")
-- 
cgit v1.2.3


From a0f86644cd254697b4c875a7a8e34fbb1010cf3a Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 12 Oct 2016 16:11:02 +0100
Subject: (MODULES-3969) Update getvar to work on ruby 1.8.7

---
 lib/puppet/parser/functions/getvar.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/getvar.rb b/lib/puppet/parser/functions/getvar.rb
index aa6edbb..3af8d48 100644
--- a/lib/puppet/parser/functions/getvar.rb
+++ b/lib/puppet/parser/functions/getvar.rb
@@ -20,11 +20,13 @@ module Puppet::Parser::Functions
     end
 
     begin
+      result = nil
       catch(:undefined_variable) do
-        return self.lookupvar("#{args[0]}")
+        result = self.lookupvar("#{args[0]}")
       end
-      
-      nil # throw was caught
+
+      # avoid relying on incosistent behaviour around ruby return values from catch
+      result
     rescue Puppet::ParseError # Eat the exception if strict_variables = true is set
     end
 
-- 
cgit v1.2.3


From b979e34b05652cbfb4e9ca7adc29ba9a01081437 Mon Sep 17 00:00:00 2001
From: Simon Beirnaert <simon.beirnaert@bayer.com>
Date: Tue, 8 Nov 2016 08:37:12 +0100
Subject: (MODULES-3829) Use .dup to duplicate classes for modification.

This function otherwise fails during `puppet preview` on Puppet 3.8.X systems.
---
 lib/puppet/parser/functions/ensure_resources.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/ensure_resources.rb b/lib/puppet/parser/functions/ensure_resources.rb
index 30d57a8..b3c51e6 100644
--- a/lib/puppet/parser/functions/ensure_resources.rb
+++ b/lib/puppet/parser/functions/ensure_resources.rb
@@ -36,7 +36,7 @@ ENDOFDOC
   params ||= {}
 
   if title.is_a?(Hash)
-    resource_hash = Hash(title)
+    resource_hash = title.dup
     resources = resource_hash.keys
 
     Puppet::Parser::Functions.function(:ensure_resource)
-- 
cgit v1.2.3


From f81ba549b73f0d752be1b4185c73818f791ab2f6 Mon Sep 17 00:00:00 2001
From: Reid Vandewiele <reid@puppetlabs.com>
Date: Wed, 29 Jun 2016 15:54:20 +0100
Subject: Add puppet_server fact to return agent's server

It is frequently useful to configure an agent to retrieve a resource
from it's configured master, or make further configuration adjustments
to itself based on what server it's using. Similar to the rationale for
stdlib providing a puppet_vardir fact, this commit adds a puppet_server
fact.

Note that the closest equivalent available today is $settings::server,
which returns only the MASTER's configured server, not the AGENT's. This
makes $settings::server unreliable, and not useful in a multi-master
deployment or a deployment involving a load balancer.
---
 lib/facter/puppet_settings.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/facter/puppet_settings.rb b/lib/facter/puppet_settings.rb
index e6a066a..eac9e97 100644
--- a/lib/facter/puppet_settings.rb
+++ b/lib/facter/puppet_settings.rb
@@ -33,3 +33,11 @@ Facter.add(:puppet_environmentpath) do
     end
   end
 end
+
+Facter.add(:puppet_server) do
+  setcode do
+    Facter::Util::PuppetSettings.with_puppet do
+      Puppet[:server]
+    end
+  end
+end
-- 
cgit v1.2.3


From 64abfc99c6222f22ccfbb39ae9ece5ccd41fa25c Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Mon, 7 Nov 2016 14:52:12 +0000
Subject: Call site display for deprecation warnings

---
 lib/puppet/functions/deprecation.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index a860aa2..7082068 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -8,15 +8,19 @@ Puppet::Functions.create_function(:deprecation) do
   end
 
   def deprecation(key, message)
+    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
+    file = stacktrace[0]
+    line = stacktrace[1]
+    output_message = "#{message} at #{file}:#{line}"
     # depending on configuration setting of strict
     case Puppet.settings[:strict]
     when :off
       # do nothing
     when :error
-      fail("deprecation. #{key}. #{message}")
+      fail("deprecation. #{key}. #{output_message}")
     else
       unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
-        Puppet.deprecation_warning(message, key)
+        Puppet.deprecation_warning(output_message, key)
       end
     end
   end
-- 
cgit v1.2.3


From 91847caad08faba7f3cd12badff73a3f936ff9d1 Mon Sep 17 00:00:00 2001
From: Bryan Jen <bryan.jen@gmail.com>
Date: Mon, 21 Nov 2016 14:18:29 -0700
Subject: Revert "Call site output for deprecation warnings"

---
 lib/puppet/functions/deprecation.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 7082068..a860aa2 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -8,19 +8,15 @@ Puppet::Functions.create_function(:deprecation) do
   end
 
   def deprecation(key, message)
-    stacktrace = Puppet::Pops::PuppetStack.stacktrace()
-    file = stacktrace[0]
-    line = stacktrace[1]
-    output_message = "#{message} at #{file}:#{line}"
     # depending on configuration setting of strict
     case Puppet.settings[:strict]
     when :off
       # do nothing
     when :error
-      fail("deprecation. #{key}. #{output_message}")
+      fail("deprecation. #{key}. #{message}")
     else
       unless ENV['STDLIB_LOG_DEPRECATIONS'] == 'false'
-        Puppet.deprecation_warning(output_message, key)
+        Puppet.deprecation_warning(message, key)
       end
     end
   end
-- 
cgit v1.2.3


From 746c1f83984ce875d810e00788e383109fa7ab2f Mon Sep 17 00:00:00 2001
From: Helen Campbell <helen@puppetlabs.com>
Date: Wed, 23 Nov 2016 16:01:01 +0000
Subject: Deprecation - Use puppet stacktrace if available

A previous PR (#685) was raised on this issue, however once it was merged it was discovered that Puppet 3 with future parser enabled was calling the Puppet 4 version of the deprecation function. The Puppet stacktrace is not available until Puppet 4.6, so this was breaking existing setups. The solution was to check is the stacktrace was defined, and if it was to use it as part of the message output.
---
 lib/puppet/functions/deprecation.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index a860aa2..39d9bc7 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -8,6 +8,12 @@ Puppet::Functions.create_function(:deprecation) do
   end
 
   def deprecation(key, message)
+    if defined? Puppet::Pops::PuppetStack.stacktrace()
+      stacktrace = Puppet::Pops::PuppetStack.stacktrace()
+      file = stacktrace[0]
+      line = stacktrace[1]
+      message = "#{message} at #{file}:#{line}"
+    end
     # depending on configuration setting of strict
     case Puppet.settings[:strict]
     when :off
-- 
cgit v1.2.3


From c5fbd82204e9832b0d398e894003e9898adb71fc Mon Sep 17 00:00:00 2001
From: David Schmitt <david@black.co.at>
Date: Sun, 27 Nov 2016 17:39:07 +0000
Subject: Remove rvalue declaration from v3 deprecation() function

Without this, some uses of this function do not work in puppet3. e.g.

    if $include_src != undef {
      deprecation('apt $include_src', "please use \$include => { 'src' => ${include_src} } instead")
    }

causes

    Function 'deprecation' must be the value of a statement

on puppet 3.8.7.
---
 lib/puppet/parser/functions/deprecation.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index e30f3a0..cd64fe2 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -1,5 +1,5 @@
 module Puppet::Parser::Functions
-  newfunction(:deprecation, :type => :rvalue, :doc => <<-EOS
+  newfunction(:deprecation, :doc => <<-EOS
   Function to print deprecation warnings (this is the 3.X version of it), The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method.).
 EOS
   ) do |arguments|
@@ -9,7 +9,7 @@ EOS
 
     key = arguments[0]
     message = arguments[1]
-    
+
     if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
       warning("deprecation. #{key}. #{message}")
     end
-- 
cgit v1.2.3


From d3bbd3cbf89cb23bce4e55c3828e17c05c4cfd70 Mon Sep 17 00:00:00 2001
From: Nick Walker <npwalker@users.noreply.github.com>
Date: Thu, 1 Dec 2016 05:54:08 -0800
Subject: Indicate that the type function is preferred (#695)

Prior to this commit, users coming to the type_of function would not realize that the type function in puppet does the same thing and is preferred over type_of.

After this commit, we have a comment indicating the above.
---
 lib/puppet/functions/type_of.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/puppet/functions/type_of.rb b/lib/puppet/functions/type_of.rb
index 02cdd4d..01f1f49 100644
--- a/lib/puppet/functions/type_of.rb
+++ b/lib/puppet/functions/type_of.rb
@@ -10,6 +10,8 @@
 # See the documentation for "The Puppet Type System" for more information about types.
 # See the `assert_type()` function for flexible ways to assert the type of a value.
 #
+# The built-in type() function in puppet is generally preferred over this function 
+# this function is provided for backwards compatibility.
 Puppet::Functions.create_function(:type_of) do
   def type_of(value)
     Puppet::Pops::Types::TypeCalculator.infer_set(value)
-- 
cgit v1.2.3


From 1cd0209aec84b0135adbe6b5fc2769f0053c26f3 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Wed, 17 Aug 2016 10:27:54 -0700
Subject: Add pry() function from hunner-pry

---
 lib/puppet/parser/functions/pry.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 lib/puppet/parser/functions/pry.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/pry.rb b/lib/puppet/parser/functions/pry.rb
new file mode 100644
index 0000000..c18ef7e
--- /dev/null
+++ b/lib/puppet/parser/functions/pry.rb
@@ -0,0 +1,30 @@
+#
+# pry.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:pry, :type => :statement, :doc => <<-EOS
+This function invokes a pry debugging session in the current scope object. This is useful for debugging manifest code at specific points during a compilation.
+
+*Examples:*
+
+    pry()
+    EOS
+  ) do |arguments|
+    begin
+      require 'pry'
+    rescue LoadError
+      raise(Puppet::Error, "pry(): Requires the 'pry' rubygem to use, but it was not found")
+    end
+    #
+    ## Run `catalog` to see the contents currently compiling catalog
+    ## Run `cd catalog` and `ls` to see catalog methods and instance variables
+    ## Run `@resource_table` to see the current catalog resource table
+    #
+    if $stdout.isatty
+      binding.pry # rubocop:disable Lint/Debugger
+    else
+      Puppet.warning 'pry(): cowardly refusing to start the debugger on a daemonized master'
+    end
+  end
+end
-- 
cgit v1.2.3


From 0e684d82ea1ad0f5c85b8aa0147ffec39aac8ddd Mon Sep 17 00:00:00 2001
From: Peter Souter <peter.souter+GIT@puppet.com>
Date: Wed, 7 Dec 2016 19:25:03 +0000
Subject: (MODULES-4188) Add FQDN UUID generation function

* Generates UUID based on a given FQDN string and the DNS namespace (6ba7b810-9dad-11d1-80b4-00c04fd430c8)
---
 lib/puppet/parser/functions/fqdn_uuid.rb | 92 ++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 lib/puppet/parser/functions/fqdn_uuid.rb

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/fqdn_uuid.rb b/lib/puppet/parser/functions/fqdn_uuid.rb
new file mode 100644
index 0000000..30205d0
--- /dev/null
+++ b/lib/puppet/parser/functions/fqdn_uuid.rb
@@ -0,0 +1,92 @@
+require 'digest/sha1'
+
+module Puppet::Parser::Functions
+  newfunction(:fqdn_uuid, :type => :rvalue, :doc => <<-END) do |args|
+
+    Creates a UUID based on a given string, assumed to be the FQDN
+
+    For example, to generate a UUID based on the FQDN of a system:
+
+    Usage:
+
+      $uuid = fqdn_uuid($::fqdn)
+
+    The generated UUID will be the same for the given hostname
+
+    The resulting UUID is returned on the form:
+
+      1d839dea-5e10-5243-88eb-e66815bd7d5c
+
+    (u.e. without any curly braces.)
+
+    The generated UUID is a version 5 UUID with the V5 DNS namespace:
+
+      6ba7b810-9dad-11d1-80b4-00c04fd430c8
+
+    This only supports a the V5 SHA-1 hash, using the DNS namespace.
+
+    Please consult http://www.ietf.org/rfc/rfc4122.txt for the details on
+    UUID generation and example implementation.
+
+    No verification is present at the moment as whether the domain name given
+    is in fact a correct fully-qualified domain name.  Therefore any arbitrary
+    string and/or alpha-numeric value can subside for a domain name.
+    EOS
+
+    END
+
+    if args.length == 0
+      raise(ArgumentError, "fqdn_uuid: No arguments given")
+    elsif args.length == 1
+      fqdn = args[0]
+    else
+      raise(ArgumentError, "fqdn_uuid: Too many arguments given (#{args.length})")
+    end
+
+    # Code lovingly taken from
+    # https://github.com/puppetlabs/marionette-collective/blob/master/lib/mcollective/ssl.rb
+
+    # This is the UUID version 5 type DNS name space which is as follows:
+    #
+    #  6ba7b810-9dad-11d1-80b4-00c04fd430c8
+    #
+    uuid_name_space_dns = [0x6b,
+      0xa7,
+      0xb8,
+      0x10,
+      0x9d,
+      0xad,
+      0x11,
+      0xd1,
+      0x80,
+      0xb4,
+      0x00,
+      0xc0,
+      0x4f,
+      0xd4,
+      0x30,
+      0xc8
+    ].map {|b| b.chr}.join
+
+    sha1 = Digest::SHA1.new
+    sha1.update(uuid_name_space_dns)
+    sha1.update(fqdn)
+
+    # first 16 bytes..
+    bytes = sha1.digest[0, 16].bytes.to_a
+
+    # version 5 adjustments
+    bytes[6] &= 0x0f
+    bytes[6] |= 0x50
+
+    # variant is DCE 1.1
+    bytes[8] &= 0x3f
+    bytes[8] |= 0x80
+
+    bytes = [4, 2, 2, 2, 6].collect do |i|
+      bytes.slice!(0, i).pack('C*').unpack('H*')
+    end
+
+    bytes.join('-')
+  end
+end
-- 
cgit v1.2.3


From 3312cc1f44d1acf25ce45701a74cecd647c50858 Mon Sep 17 00:00:00 2001
From: Hailee Kenney <hailee@puppetlabs.com>
Date: Fri, 9 Dec 2016 13:17:48 +0000
Subject: (MODULES-3829) Make ensure_packages work with < 2.0

Prior to this commit, if a hash was passed in as an
argument to the ensure_packages function a method of
hash duplication would be used that is not supported
with versions of ruby older than 2.0. In order to
ensure the method is compatible with older ruby versions,
switch to a different method of duplication.

Additionally add tests to prevent further regressions.
---
 lib/puppet/parser/functions/ensure_packages.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/puppet/parser/functions/ensure_packages.rb b/lib/puppet/parser/functions/ensure_packages.rb
index 532b702..439af1e 100644
--- a/lib/puppet/parser/functions/ensure_packages.rb
+++ b/lib/puppet/parser/functions/ensure_packages.rb
@@ -25,7 +25,7 @@ third argument to the ensure_resource() function.
       end
 
       Puppet::Parser::Functions.function(:ensure_resources)
-      function_ensure_resources(['package', Hash(arguments[0]), defaults ])
+      function_ensure_resources(['package', arguments[0].dup, defaults ])
     else
       packages = Array(arguments[0])
 
-- 
cgit v1.2.3