confidante 0.28.0.pre.15 → 0.28.0.pre.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9650fc6b5cfb60cde80bd5d25dde663535bca870a8f9b08ce29eb9c2375be8f7
-  data.tar.gz: 17cc9dd25523d6415681f1fcda2b8036c94360b4927fa97dd5532e1bfc3386e8
+  metadata.gz: f227c07f069e181681816cc7489b858e84902900d7c19f31b5ba99449f6e431b
+  data.tar.gz: b0d0e7a23a56b82c86a26aedad88b03f12ae92a08a8a6d670cd6929916c15c79
 SHA512:
-  metadata.gz: 8a81fed1309c40c7f52fac384b1f084ad7f1a8352adc031aed918d780f7d072436007f12571fe8c739173f35f6b834073bb1e67efc4441ac4d085fda3e57d642
-  data.tar.gz: e8eb70b0f2246395a497ade451252cf05d762bad52d2128f6ce50360ba20709f8921de4059202d19463641dc39dbb10a8c7f5fce7f9f81d1248e7567721abe4c
+  metadata.gz: 83b32114eccd28d13653e36afe295828adf3def314aa33d21da2665e237021c74128b852c7244a273cedfa880bcd2ad628226ca16ae14db5f50d9adb39cc0626
+  data.tar.gz: 031042a9e6e29028ff51a5772c834cf4025f04b4e250a3ca2ea5fe638d1d1fb70c43bf209200ff5c2e3b6ccc07537a711d87277b1035ac5fdfebb4d8d51fe5a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confidante (0.28.0.pre.15)
+    confidante (0.28.0.pre.16)
       activesupport (>= 4)
       hiera (~> 3.3)
       shikashi (~> 0.6)

data/lib/confidante/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Confidante
-  VERSION = '0.28.0.pre.15'
+  VERSION = '0.28.0.pre.16'
 end

data/lib/hiera/backend/vault_backend.rb

@@ -19,22 +19,31 @@ class Hiera
         vault_address = vault_config[:address]
         vault_client = Vault::Client.new(address: vault_address)
 
-        source = vault_config[:sources][0]
+        value = get_value(vault_client, key, vault_config[:sources])
 
-        throw(:unsupported_secrets_engine) unless source[:engine] == 'kv'
+        Backend.parse_answer(value, scope)
+      end
 
-        value = read_kv_value(vault_client, source, key)
+      def get_value(vault_client, key, sources)
+        found_source = sources.find do |source|
+          read_kv_value(vault_client, source, key)
+        end
 
-        Backend.parse_answer(value, scope)
+        throw(:no_such_key) unless found_source
+
+        read_kv_value(vault_client, found_source, key)
       end
 
       def read_kv_value(vault_client, source, key)
-        secret = vault_client.kv(source[:mount]).read(key)
-        throw(:no_such_key) unless secret
+        throw(:unsupported_secrets_engine) unless source[:engine] == 'kv'
+
+        mount = source[:mount]
+        full_path = "#{source[:path]}/#{key}"
+
+        secret = vault_client.kv(mount).read(full_path)
+        return nil unless secret
 
-        value = secret.data[:value]
-        throw(:no_such_key) unless value
-        value
+        secret.data[:value]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confidante
 version: !ruby/object:Gem::Version
-  version: 0.28.0.pre.15
+  version: 0.28.0.pre.16
 platform: ruby
 authors:
 - InfraBlocks Maintainers