lib/hiera/backend/vault_backend.rb in confidante-0.28.0.pre.19 vs lib/hiera/backend/vault_backend.rb in confidante-0.28.0.pre.20

@@ -14,26 +14,41 @@
       def lookup(key, scope, _order_override, resolution_type, _context)
         Hiera.debug("Looking up #{key} in vault backend " \
                     "with #{resolution_type}")
 
         vault_config = Backend.parse_answer(Config[:vault], scope)
-        vault_address = vault_config[:address]
 
-        throw :no_vault_address_provided unless vault_address
+        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
 
+      def valid_vault_address?(vault_config)
+        vault_address = vault_config[:address]
+        vault_address.nil? || vault_address.empty?
+      end
+
+      def get_value(vault_config, key)
+        vault_address = vault_config[:address]
         vault_client = Vault::Client.new(address: vault_address)
-        value = get_value(vault_client, key, vault_config[:sources])
-        Backend.parse_answer(value, scope)
+        get_first_value_from_sources(
+          vault_client,
+          key,
+          vault_config[:sources]
+        )
       end
 
-      def get_value(vault_client, key, sources)
-        found_source = sources.find do |source|
-          read_kv_value(vault_client, source, key)
+      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
 
-        throw(:no_such_key) unless found_source
-
-        read_kv_value(vault_client, found_source, key)
+        throw(:no_such_key)
       end
 
       def read_kv_value(vault_client, source, key)
         throw(:unsupported_secrets_engine) unless source[:engine] == 'kv'