hiera-vault 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb5cca3d9d24e6760776515dcb5acbfac438ae2
-  data.tar.gz: 8a121daa6c51a3fc5c210a7640a95f9ceedcb38c
+  metadata.gz: 2e98b1ef726ad9a2412e138a71937ed4ae2bf49e
+  data.tar.gz: 206a6df160648bd03c1e1f3fb57582be24f16e1d
 SHA512:
-  metadata.gz: 4400e13c0ac33f823313215f047d89500e87fe91b67cd1a483046c0b0884e1f7fa560ca7b4f8229091be3980f4d67aa981c60ded1afdf65421a0f35bf4597ba1
-  data.tar.gz: 2718aa35637dd800b7338173f750c5b6ebf1c060e07a7cec70a4ded703c49b6beacf638f75426822483bbd153d69eed99c6c4e8736ad8d2ec59771dd3c71ae12
+  metadata.gz: 84622036bc28f5b5ba3054c5ae00c8ea5ccc31a943f6d329bc0240194e77097b1b6881b8085761262a9b981ecbd7f10f34ed0aa4fa884d2dc083ca819f6762b1
+  data.tar.gz: 503989936d17bcab44d4f96787a3b3a69ecfc53f062e96c90743b510033629d7beb9d47e957591bf5555e9c04e5a27167834f6b2745540e8cd1dd74f2d349a02

data/lib/hiera/backend/vault_backend.rb

@@ -56,23 +56,27 @@ class Hiera
         # Only generic mounts supported so far
         @config[:mounts][:generic].each do |mount|
           path = Backend.parse_string(mount, scope, { 'key' => key })
-          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
+          Backend.datasources(scope, order_override) do |source|
+            Hiera.debug("Looking in path #{path}/#{source}/")
+            new_answer = lookup_generic("#{path}/#{source}/#{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
+              found = true
+              break
+            end
           end
+          break if found
         end
 
         return answer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-vault
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Sokolowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Hiera backend for looking up secrets stored in Vault
 email: jonathan.sokolowski@gmail.com
 executables: []