rubyconfig-vault 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a737c714f6c9e6cdff7bc6ea5ad1cdb864929ea00552b49c0a711bf7985571e
-  data.tar.gz: 54d1b1055a1272b021c3b9411fefd41c2c6ee2e6ec2469fec1382e7becbd4502
+  metadata.gz: c8983ba9504c855d75c19d322a3d3c501749f8f076a9e10c9ebc00b31b3d3167
+  data.tar.gz: 9dc89fac7bcabde9c1327ee1dc1f17f6f14ee1cf145acce4449b4a256c6594b1
 SHA512:
-  metadata.gz: d6810e8ed8954833fd7de46c76f1ff0102ab8240d7c25b9eed16eee421bd73703c1ae2b6ac75b1a5b36b25c5857e763ef7c73c8641a6aa305702b9716f3ba1ca
-  data.tar.gz: f4b0a4031bff1d623978064ddef59656b60ae9cf7071ee0a2e31665d7397b4c15ed63462a9a356b5ee7e82b2b671d2daf6a94b2969f24fb3c7e402f85e005cd6
+  metadata.gz: 75ff199594c448bd6976efee7dda5a71d2d75806f98d3b9156bf01c28b7598f30a797141f7cb58ddf791a2abedcd0dc38b748361fb00b07e4eaf919d1e2d7dd8
+  data.tar.gz: c4e4bdc78601d67d8f853ac31ddfd4eabc5739a66e1df8380ad68dc47895fc3802035143dffba9544ac688bcb28c95da43e4e318e51fd8c4d79b258615b60b12

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,4 +1,6 @@
+require 'config'
 require 'vault'
+require_relative 'vault_error'
 
 module Config
   module Sources
@@ -27,7 +29,7 @@ module Config
         @root = client_opts.delete(:root)
         @flatten = client_opts.delete(:flatten)
         @paths << client_opts.delete(:paths) if client_opts.key?(:paths)
-        @map = {}
+        map({})
         @paths.map! do |p|
           if p.is_a?(Array)
             p
@@ -56,6 +58,7 @@ module Config
       # @param hsh [Hash] mappings for keys
       def map(hsh)
         @map = hsh
+        @map.transform_keys! { |k| k.to_sym }
       end
 
       # Remove added paths
@@ -67,10 +70,10 @@ module Config
       #
       # @return [Hash]
       def load
-        Vault.with_retries(Vault::HTTPError,
-                           attempts: @attempts,
-                           base: @base,
-                           max_wait: @max_wait) do
+        ::Vault.with_retries(RecoverableVaultError,
+                             attempts: @attempts,
+                             base: @base,
+                             max_wait: @max_wait) do
           process_paths
         end
       end
@@ -85,10 +88,34 @@ module Config
         end
       end
 
+      def read_at_path(query_path)
+        client_ops.read(query_path)&.data || {}
+      rescue ::Vault::HTTPClientError => e
+        if e.code.to_i == 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) }
-        parsed_paths.each { |p| root.merge!(p) }
+        parsed_paths.each { |p| root.deep_merge!(p) }
 
         root
       end
@@ -103,7 +130,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)
@@ -112,7 +139,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
@@ -130,6 +157,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.3"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyconfig-vault
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - David Young
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault
@@ -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