rubyconfig-vault 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161ede1df26b9ba941d4e64dd921b4c4f98f9c66ed443b5f83d3ebeb55bc7ae3
-  data.tar.gz: 54e80ec49323dbbf1540dd39ce99623ff3acf86968ca3dcf4ba9122e099ee364
+  metadata.gz: 615bbf4df424a7d1f403b806113e097c81ef41752afa9ebd61771d45a10f4991
+  data.tar.gz: 563b9bd3cd608d49ee2050bd86dd0374cd8fd5a12549f3235f3170ddc65f889a
 SHA512:
-  metadata.gz: 617735e0edf543dfed976f9b07a090414b47f4ec218e28e7821762da19ffbf44aa447072c205d3ab79db68b619de946d4d962385cdd50f74bd5ceac5c886f4a6
-  data.tar.gz: c96b23a0ae4b45daaf688b39d65948bbee01909ad3866bacfd78eb91aa1c1c97a53bfd2961c17dbe31f4e6b330a8606120dbced79b403410a9ed8b5378824f46
+  metadata.gz: 36c354d9baf5cce5f2cd4d0492caa90ae3b77ee4e0e7891d6e260f0a3b2a33f42c749193c5b7c4e82526b5ac9d55dd4d35e4a90a274f89302910deea94f71859
+  data.tar.gz: 652d144137915a2e7213fbf4cb4fb12efa3fecc8fe6861a376a67ff3c1f6ec7edfc44e364ec07553282b4cc687024c5aab29a826691e910c0d1fd57cd92b6965

data/lib/config/vault/vault_error.rb

@@ -0,0 +1,7 @@
+module Config
+  module Sources
+    class RecoverableVaultError < Exception; end
+
+    class VaultError < Exception; end
+  end
+end

data/lib/config/vault/vault_source.rb

@@ -1,5 +1,6 @@
 require 'config'
 require 'vault'
+require_relative 'vault_error'
 
 module Config
   module Sources
@@ -68,7 +69,7 @@ module Config
       #
       # @return [Hash]
       def load
-        ::Vault.with_retries(::Vault::HTTPError,
+        ::Vault.with_retries(RecoverableVaultError,
                              attempts: @attempts,
                              base: @base,
                              max_wait: @max_wait) do
@@ -86,6 +87,30 @@ module Config
         end
       end
 
+      def read_at_path(query_path)
+        client_ops.read(query_path)&.data || {}
+      rescue ::Vault::HTTPClientError => e
+        if e.code == 403
+          raise VaultError, "Attempting to read at path #{query_path}\n#{e.response}", caller
+        else
+          raise RecoverableVaultError, e.response, caller
+        end
+      rescue ::Vault::HTTPError => e
+        raise RecoverableVaultError, e.response, caller
+      end
+
+      def list_at_path(query_path)
+        client_ops.list(query_path)
+      rescue ::Vault::HTTPClientError => e
+        if e.code == 403
+          raise VaultError, "Attempting to list at path #{query_path}\n#{e.response}", caller
+        else
+          raise RecoverableVaultError, e.response, caller
+        end
+      rescue ::Vault::HTTPError => e
+        raise RecoverableVaultError, e.response, caller
+      end
+
       def process_paths
         root = {}
         parsed_paths = @paths.map { |p| process_path(p) }
@@ -104,7 +129,7 @@ module Config
           query_path, idx, parent = stack.pop
           sp = subpaths[idx]
           if sp.nil? || sp.eql?('*')
-            data = client_ops.read(query_path)&.data || {}
+            data = read_at_path(query_path)
             node = root if @flatten
             node = parent unless @flatten
             node.merge!(data)
@@ -113,7 +138,7 @@ module Config
           end
 
           if sp.eql?('**') || sp.eql?('*')
-            subtrees = client_ops.list(query_path)
+            subtrees = list_at_path(query_path)
             subtrees.each do |st|
               new_parent = {}
               new_key = st.split('/').last.downcase.to_sym
@@ -131,6 +156,8 @@ module Config
         end
 
         if path.last
+          { path.last => root }
+        elsif @root
           { @root => root }
         else
           root

data/lib/config/vault/version.rb

@@ -1,5 +1,5 @@
 module Config
   module Vault
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyconfig-vault
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - David Young
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/config/vault.rb
+- lib/config/vault/vault_error.rb
 - lib/config/vault/vault_source.rb
 - lib/config/vault/version.rb
 homepage: https://github.com/CrunchwrapSupreme/rubyconfig-vault