diff options
author | Dmitry Ilyin <dilyin@mirantis.com> | 2015-08-24 22:00:18 +0300 |
---|---|---|
committer | Dmitry Ilyin <dilyin@mirantis.com> | 2015-08-25 21:41:03 +0300 |
commit | eb948c4a0dc36790c5444fc236b0154c3d716c58 (patch) | |
tree | 02357ac0aaebe45825bf6fffeb8f0cf9e883cab4 /lib/puppet/parser/functions/parsejson.rb | |
parent | f820bb156038f638d8e488286d0c2b92c5636925 (diff) |
[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
Diffstat (limited to 'lib/puppet/parser/functions/parsejson.rb')
-rw-r--r-- | lib/puppet/parser/functions/parsejson.rb | 23 |
1 files changed, 12 insertions, 11 deletions
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 |