settings_reader-vault_resolver 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5135f50633e103f09f6f30bf956295fc9290a6b75dfd7864e0296ecc9f467f35
-  data.tar.gz: d80b42374412c4053538af7e2ba9a984f0f53219fed76aa440a1a35494167b33
+  metadata.gz: e7cf89396af4e1bdd661243b99672359c0da0ae19af41e89b25e4564765a8c9a
+  data.tar.gz: 0a4e19ad01365e9c5b40e7192fc4c6fc259a238bad1d0c7c08f0e9ab20a15fec
 SHA512:
-  metadata.gz: 57f47f6d9d9cbea621fa523560129021ceb70c5c9b4175f34f367387bfc76992cae6f5761fb11d36a04bf3111ff156b2ea7c4d7c69703b0256be14e51c973849
-  data.tar.gz: 9789a9fe5ac8bfebb040eae0998d977806daaed20b05a35655d77cf8615aeab6f1023e933ff59c71dd3ce79061f8675f09e8da97d079c02b1b1d95377905e536
+  metadata.gz: 0275337c5c6c561972cacaf4cfa91576950f024a8062669b74678836328f890b5a93cd4803f65352e5d6d40998c1e6f635d54a045458ec51e24224167cbfe5c4
+  data.tar.gz: fe1bebe19a8f0334bd893fe84c9b162d5b2ffb06c6c253f088f74269bf2cbb64b37499bd6da2253bdb0b7261fe322268031a35086d1ceb299ec874e37a9f1188

data/lib/settings_reader/vault_resolver/cache.rb

@@ -36,6 +36,10 @@ module SettingsReader
         @secrets.each_value(&block)
       end
 
+      def active_entries(&block)
+        @secrets.values.select(&:active?).each(&block)
+      end
+
       def clear_all
         @secrets = {}
       end

data/lib/settings_reader/vault_resolver/configuration.rb

@@ -34,15 +34,20 @@ module SettingsReader
       # Default: empty proc
       attr_accessor :vault_initializer
 
+      # Block to be executed when "lease not found" error is raised
+      # Default: empty proc
+      attr_accessor :lease_not_found_handler
+
       def initialize
         @logger = Logger.new($stdout, level: Logger::ERROR)
         @retrieval_retries = 2
         @lease_refresh_interval = 60
         @lease_renew_delay = 300
         @lease_renew_retries = 4
-        @lease_renew_error_listener = -> {}
-        @lease_renew_success_listener = -> {}
+        @lease_renew_error_listener = ->(_result) {}
+        @lease_renew_success_listener = ->(_result) {}
         @vault_initializer = -> {}
+        @lease_not_found_handler = ->(_entry) {}
       end
 
       def setup_lease_refresher(cache, previous_task = nil)

data/lib/settings_reader/vault_resolver/engines/abstract.rb

@@ -29,8 +29,6 @@ module SettingsReader
           new_secret = renew_and_retry_auth(entry)
           entry.update_renewed(new_secret)
           true
-        rescue Vault::VaultError => e
-          raise SettingsReader::VaultResolver::Error, e.message
         end
 
         protected
@@ -50,18 +48,18 @@ module SettingsReader
           end
         end
 
-        def renew_and_retry_auth(address)
-          renew_and_retry_connection(address)
+        def renew_and_retry_auth(entry)
+          renew_and_retry_connection(entry)
         rescue Vault::HTTPError => e # if not authenticated, let's reauthenticate and try once more
           raise unless auth_error?(e)
 
           config.vault_initializer.call
-          renew_and_retry_connection(address)
+          renew_and_retry_connection(entry)
         end
 
-        def renew_and_retry_connection(address)
+        def renew_and_retry_connection(entry)
           Vault.with_retries(Vault::HTTPConnectionError, attempts: config.lease_renew_retries) do
-            renew_lease(address)
+            renew_lease(entry)
           end
         end
 

data/lib/settings_reader/vault_resolver/entry.rb

@@ -23,6 +23,10 @@ module SettingsReader
         Time.now > @lease_started + lease_duration
       end
 
+      def active?
+        !expired?
+      end
+
       def expires_in
         return MONTH unless leased?
 

data/lib/settings_reader/vault_resolver/refresher.rb

@@ -18,7 +18,7 @@ module SettingsReader
 
       def refresh
         info { 'Performing Vault leases refresh' }
-        promises = cache.entries.map do |entry|
+        promises = cache.active_entries.map do |entry|
           debug { "Checking lease for #{entry}. Leased?: #{entry.leased?}. Expires in: #{entry.expires_in}s" }
           refresh_entry(entry)
         end.compact
@@ -35,10 +35,27 @@ module SettingsReader
           info { "Lease renewed for #{entry}. Expires in: #{entry.expires_in}" }
           entry
         rescue StandardError => e
-          error { "Error refreshing lease for #{entry}: #{e.message}" }
-          raise SettingsReader::VaultResolver::Error, e.message
+          handle_refresh_error(e, entry)
         end
       end
+
+      private
+
+      def handle_refresh_error(error, entry)
+        handle_lease_not_found(entry) if lease_not_found_error?(error)
+
+        error { "Error refreshing lease for #{entry}: #{error.message}" }
+        raise SettingsReader::VaultResolver::Error, error.message
+      end
+
+      def lease_not_found_error?(error)
+        error.is_a?(Vault::HTTPClientError) && error.code == 400 && error.message =~ /lease not found/
+      end
+
+      def handle_lease_not_found(entry)
+        cache.clear(entry)
+        config.lease_not_found_handler.call(entry)
+      end
     end
   end
 end

data/lib/settings_reader/vault_resolver/version.rb

@@ -1,5 +1,5 @@
 module SettingsReader
   module VaultResolver
-    VERSION = '0.4.4'.freeze
+    VERSION = '0.4.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settings_reader-vault_resolver
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Volodymyr Mykhailyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby