confidante 0.28.0.pre.16 → 0.28.0.pre.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f227c07f069e181681816cc7489b858e84902900d7c19f31b5ba99449f6e431b
-  data.tar.gz: b0d0e7a23a56b82c86a26aedad88b03f12ae92a08a8a6d670cd6929916c15c79
+  metadata.gz: f1bfb2c0fa603d1a89d220fd4c54dc97fb1ef1a00447ceabfe657e9dfb1d4e29
+  data.tar.gz: 98ebe1930702415a5f6fc09fc206d165498dcbb0696b00cd387b9ff0baa75924
 SHA512:
-  metadata.gz: 83b32114eccd28d13653e36afe295828adf3def314aa33d21da2665e237021c74128b852c7244a273cedfa880bcd2ad628226ca16ae14db5f50d9adb39cc0626
-  data.tar.gz: 031042a9e6e29028ff51a5772c834cf4025f04b4e250a3ca2ea5fe638d1d1fb70c43bf209200ff5c2e3b6ccc07537a711d87277b1035ac5fdfebb4d8d51fe5a9
+  metadata.gz: 5e5278e02d47658641d1ce61d9f147a60cebae653792bbfdf09bf8641e0034087fbf5059da792ddb39a3ec67764e435e3aeb04a5dd204f592991d9443a2152fa
+  data.tar.gz: 248b245aa62c7005f8de4939351a63cf80f84b9d6561885e1cdbc70d81abf9cc137bfe2071dd009bd620b542af280d5c90b41d6ca64b15dc85508dbe0dc497fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confidante (0.28.0.pre.16)
+    confidante (0.28.0.pre.20)
       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.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -136,12 +136,12 @@ GEM
       sexp_processor (~> 4.6)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
-    ruby_parser (3.18.1)
+    ruby_parser (3.19.1)
       sexp_processor (~> 4.16)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    sexp_processor (4.16.0)
+    sexp_processor (4.16.1)
     shikashi (0.6.0)
       evalhook (>= 0.6.0)
       getsource (>= 0.1.0)
@@ -180,4 +180,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.20
+   2.3.21

data/Rakefile

@@ -50,7 +50,7 @@ namespace :library do
   task check: [:rubocop]
 
   desc 'Attempt to automatically fix issues with the library'
-  task fix: [:'rubocop:auto_correct']
+  task fix: [:'rubocop:autocorrect']
 end
 
 namespace :test do

data/lib/confidante/version.rb

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

data/lib/hiera/backend/vault_backend.rb

@@ -16,22 +16,38 @@ class Hiera
                     "with #{resolution_type}")
 
         vault_config = Backend.parse_answer(Config[:vault], scope)
-        vault_address = vault_config[:address]
-        vault_client = Vault::Client.new(address: vault_address)
 
-        value = get_value(vault_client, key, vault_config[:sources])
+        if valid_vault_address?(vault_config)
+          Hiera.warn('No vault address provided. Skipping lookup!')
+          nil
+        else
+          Backend.parse_answer(get_value(vault_config, key), scope)
+        end
+      end
 
-        Backend.parse_answer(value, scope)
+      def valid_vault_address?(vault_config)
+        vault_address = vault_config[:address]
+        vault_address.nil? || vault_address.empty?
       end
 
-      def get_value(vault_client, key, sources)
-        found_source = sources.find do |source|
-          read_kv_value(vault_client, source, key)
-        end
+      def get_value(vault_config, key)
+        vault_address = vault_config[:address]
+        vault_client = Vault::Client.new(address: vault_address)
+        get_first_value_from_sources(
+          vault_client,
+          key,
+          vault_config[:sources]
+        )
+      end
 
-        throw(:no_such_key) unless found_source
+      def get_first_value_from_sources(vault_client, key, sources)
+        sources.each do |source|
+          value = read_kv_value(vault_client, source, key)
+
+          return value if value
+        end
 
-        read_kv_value(vault_client, found_source, key)
+        throw(:no_such_key)
       end
 
       def read_kv_value(vault_client, source, key)

metadata

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