Merge pull request #6 from jumanjiman/json

Attempt to parse json hash or array when called with hiera()

Author: garethr

lib/hiera/backend/etcd_backend.rb

@@ -42,6 +42,7 @@ def parse_result(res, type, scope)
         answer = nil
         case type
         when :array
+          # Called with hiera_array().
           answer ||= []
           begin
             data = Backend.parse_answer(JSON[res], scope)
@@ -56,6 +57,7 @@ def parse_result(res, type, scope)
             Hiera.warn("Data is in json format, but this is not an array")
           end
         when :hash
+          # Called with hiera_hash().
           answer ||= {}
           begin
             data = Backend.parse_answer(JSON[res], scope)
@@ -69,6 +71,8 @@ def parse_result(res, type, scope)
             Hiera.warn("Data is in json format, but this is not an hash")
           end
         else
+          # Called with hiera(), which can return an array, hash, or string.
+          res = JSON[res] rescue res
           answer = Backend.parse_answer(res, scope)
         end
         answer