hiera-vault 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6d60dd27aa1e1da061baa78922a7d2f69eead26
-  data.tar.gz: 7d7f43da214143da5cb6d10461e77125d41858ef
+  metadata.gz: 3f5330ec11f401a3bafbc2223c3dbcf513ce63f6
+  data.tar.gz: bfca139927590fa43f24a782c1eb36249164cc0e
 SHA512:
-  metadata.gz: 8d713a2c831f5c0fb85a0c9700b1b48327c0dd9b3ab07b9772df0b9b6c1c4c5433919e7df180bfe06f75798c3397c41f3c10f57494247cb30eb351a4e1826daa
-  data.tar.gz: 00783473c833126563f53796e3ea7a145c7a7ecadddc326838af6a9e61ae59a35a44960a66c03496e5fbabae76efa183dcf8bd546c0d445a0456519468dc6282
+  metadata.gz: a73d38373d64d71b5611cb882e207aec7ecbe521f0b829742f5f04c3339756056423a850f8162c42b9a86192aa0f4598661573eeba164a2ce80e4c85c617bb04
+  data.tar.gz: afa2f42bc6d4d75946a43787f6b6baf71d6b3c9e49a479aefb900b7ae59c4754eaa57f99c8714a3e2d910f0f55fc6b42d3ac71f1f2fd5b1bfeb8d007ea5e1c7f

data/lib/hiera/backend/vault_backend.rb

@@ -10,6 +10,20 @@ class Hiera
         @config = Config[:vault]
         @config[:mounts] ||= {}
         @config[:mounts][:generic] ||= ['secret']
+        @config[:default_field_parse] ||= 'string' # valid values: 'string', 'json'
+
+        if not ['string','json'].include?(@config[:default_field_parse])
+          raise Exception, "[hiera-vault] invalid value for :default_field_parse: '#{@config[:default_field_behavior]}', should be one of 'string','json'"
+        end
+
+        # :default_field_behavior:
+        #   'ignore' => ignore additional fields, if the field is not present return nil
+        #   'only'   => only return value of default_field when it is present and the only field, otherwise return hash as normal
+        @config[:default_field_behavior] ||= 'ignore'
+
+        if not ['ignore','only'].include?(@config[:default_field_behavior])
+          raise Exception, "[hiera-vault] invalid value for :default_field_behavior: '#{@config[:default_field_behavior]}', should be one of 'ignore','only'"
+        end
 
         begin
           @vault = Vault::Client.new
@@ -37,16 +51,31 @@ class Hiera
         Hiera.debug("[hiera-vault] Looking up #{key} in vault backend")
 
         answer = nil
+        found = false
 
         # Only generic mounts supported so far
         @config[:mounts][:generic].each do |mount|
           path = Backend.parse_string(mount, scope, { 'key' => key })
-          answer = lookup_generic("#{path}/#{key}", scope)
-
-          break if answer.kind_of? Hash
+          Hiera.debug("Looking in path #{path}")
+          new_answer = lookup_generic("#{path}/#{key}", scope)
+          #Hiera.debug("[hiera-vault] Answer: #{new_answer}:#{new_answer.class}")
+          next if new_answer.nil?
+          case resolution_type
+          when :array
+            raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
+            answer ||= []
+            answer << new_answer
+          when :hash
+            raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
+            answer ||= {}
+            answer = Backend.merge_answer(new_answer,answer)
+          else
+            answer = new_answer
+            break
+          end
         end
 
-        answer
+        return answer
       end
 
       def lookup_generic(key, scope)
@@ -61,13 +90,22 @@ class Hiera
           return nil if secret.nil?
 
           Hiera.debug("[hiera-vault] Read secret: #{key}")
-          if @config[:default_field]
+          if @config[:default_field] and (@config[:default_field_behavior] == 'ignore' or (secret.data.has_key?(@config[:default_field].to_sym) and secret.data.length == 1))
+            return nil if not secret.data.has_key?(@config[:default_field].to_sym)
             # Return just our default_field
             data = secret.data[@config[:default_field].to_sym]
+            if @config[:default_field_parse] == 'json'
+              begin
+                data = JSON.parse(data)
+              rescue JSON::ParserError => e
+                Hiera.debug("[hiera-vault] Could not parse string as json: #{e}")
+              end
+            end
           else
             # Turn secret's hash keys into strings
             data = secret.data.inject({}) { |h, (k, v)| h[k.to_s] = v; h }
           end
+          #Hiera.debug("[hiera-vault] Data: #{data}:#{data.class}")
 
           return Backend.parse_answer(data, scope)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-vault
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jonathan Sokolowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault