diff options
| author |   Jaume Devesa <devvesa@gmail.com> | 2015-12-01 11:26:11 +0100 |
|---|---|---|
| committer | Jaume Devesa <devvesa@gmail.com> | 2015-12-01 11:26:11 +0100 |
| commit | 6021323d41c19e4aac4a3f353c1de9278763b548 (patch) | |
| tree | 008b9923047886f3f7dfbdab490ef74a2745ac58 /lib/puppet/parser/functions | |
| parent | 4666fbad534f04b6dcb87923b061a4b1da6c1033 (diff) | |
Remove `validate_ip_address` validator.
It is already merged on the puppetlabs-stdlib module:
https://github.com/puppetlabs/puppetlabs-stdlib/commit/88a9a314c3e9cccbea5add95081655f2c14ec4c1
And we don't need to carry with this validation anymore.
Change-Id: I2cee12e7601c546e616e2c249157e7739af29490
Diffstat (limited to 'lib/puppet/parser/functions')
| -rw-r--r-- | lib/puppet/parser/functions/validate_ip_address.rb | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/lib/puppet/parser/functions/validate_ip_address.rb b/lib/puppet/parser/functions/validate_ip_address.rb deleted file mode 100644 index ebdf727..0000000 --- a/lib/puppet/parser/functions/validate_ip_address.rb +++ /dev/null @@ -1,53 +0,0 @@ -# TODO(devvesa): Remove the validation function once puppetlabs-stdlib maintainers -# accept the pull request: https://github.com/puppetlabs/puppetlabs-stdlib/pull/546 -# This project should not maintain it. -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 |