confidante 0.28.0.pre.14 → 0.28.0.pre.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c9839bc842ebec023e9ed5b5dfb855a0d71065197b823f61fd672ccde8ae0a
-  data.tar.gz: 3fb77acf16a3aefb99ac313a02b834ac091b1ada64af3dd669d190c72e5d66b5
+  metadata.gz: 94d4ad7adeb2f7f50922b57bbcb7112754b76c8c14c1deec0f6e6c976ef746bc
+  data.tar.gz: 720f5ad0310855b2c45babda8fef3a0a2a31457a43e836a384c690ddc781b8b5
 SHA512:
-  metadata.gz: ced6ac392c151b4a5e70ea61cbb5a17c3e4f41c99c54d70f780e0079697b09a2b63099eb367a4eaf1c791a51aff82ed1082bf6d6cf5dcb1346cfb8f0e60aad9e
-  data.tar.gz: e94e7f53374f7e2b5b3570111cc959874b546ecbea03738eff28c0f890637d43260f2884a8d93b3b45c146b38cdfb88ac5c58f8476174a8f48b1bfe6ed5d5e91
+  metadata.gz: bcb0aaf12c349634d99b098d74fff4eceb293105f9a763e6651f3ff85af907b865d87e3e16fd68b57c8db368b641977f705705969de78e4b1030621f559f45b0
+  data.tar.gz: 60436dbd48b8ec6e338a407381acaa839361e3b658216f81d70f2786b06a159c985cc992f8614ded82516ef8a0d51afbbbf32190b30a8b0a31a95b7147227dc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confidante (0.28.0.pre.14)
+    confidante (0.28.0.pre.17)
       activesupport (>= 4)
       hiera (~> 3.3)
       shikashi (~> 0.6)
@@ -113,7 +113,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.35.0)
+    rubocop (1.35.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -161,6 +161,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -179,4 +180,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.20
+   2.3.21

data/lib/confidante/version.rb

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

data/lib/hiera/backend/vault_backend.rb

@@ -17,17 +17,37 @@ class Hiera
 
         vault_config = Backend.parse_answer(Config[:vault], scope)
         vault_address = vault_config[:address]
+
+        throw :no_vault_address_provided unless vault_address
+
         vault_client = Vault::Client.new(address: vault_address)
+        value = get_value(vault_client, key, vault_config[:sources])
+        Backend.parse_answer(value, scope)
+      end
 
-        secret = vault_client.kv('kv').read(key)
-        throw(:no_such_key) unless secret
+      def get_value(vault_client, key, sources)
+        found_source = sources.find do |source|
+          read_kv_value(vault_client, source, key)
+        end
 
-        value = secret.data[:value]
-        throw(:no_such_key) unless value
+        throw(:no_such_key) unless found_source
 
-        Backend.parse_answer(value, scope)
+        read_kv_value(vault_client, found_source, key)
+      end
+
+      def read_kv_value(vault_client, source, key)
+        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
+
+        secret.data[:value]
       end
     end
+
     # rubocop:enable Naming/ClassAndModuleCamelCase
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confidante
 version: !ruby/object:Gem::Version
-  version: 0.28.0.pre.14
+  version: 0.28.0.pre.17
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport