rubyconfig-vault 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46de173dcd36067470c87796ac1767b87b0dfa8a45deccab555e3f4e46f27eba
-  data.tar.gz: a46241218beef3db50686fdd504804c0996b3a773dc7d5fdf0c6cffe2250ae8e
+  metadata.gz: 161ede1df26b9ba941d4e64dd921b4c4f98f9c66ed443b5f83d3ebeb55bc7ae3
+  data.tar.gz: 54e80ec49323dbbf1540dd39ce99623ff3acf86968ca3dcf4ba9122e099ee364
 SHA512:
-  metadata.gz: 2714a2880f99e0adfa77bbcdfb1b0bc00fe26ecc087846d47dce9d1c644f37c39ce459c1474810f4d6b9200094b197dab593f80e26023643854eb27d3b828859
-  data.tar.gz: d31a1275c69520b68ed8d3c7bb6bb68fbd852ac50e8337899ab310114c76d4086697407067cfb13d6c391b98bb3f96fbcf40202bb7a8a322a13a4176c35962b5
+  metadata.gz: 617735e0edf543dfed976f9b07a090414b47f4ec218e28e7821762da19ffbf44aa447072c205d3ab79db68b619de946d4d962385cdd50f74bd5ceac5c886f4a6
+  data.tar.gz: c96b23a0ae4b45daaf688b39d65948bbee01909ad3866bacfd78eb91aa1c1c97a53bfd2961c17dbe31f4e6b330a8606120dbced79b403410a9ed8b5378824f46

data/lib/config/vault/vault_source.rb

@@ -1,10 +1,11 @@
+require 'config'
 require 'vault'
 
 module Config
   module Sources
     # A vault source for Config
     class VaultSource
-      attr_accessor :kv, :root
+      attr_accessor :kv, :root, :flatten
       attr_reader :paths, :client
 
       # Create a new Config source, all Vault::Client parameters supported
@@ -27,6 +28,7 @@ module Config
         @root = client_opts.delete(:root)
         @flatten = client_opts.delete(:flatten)
         @paths << client_opts.delete(:paths) if client_opts.key?(:paths)
+        @map = {}
         @paths.map! do |p|
           if p.is_a?(Array)
             p
@@ -34,7 +36,7 @@ module Config
             [p, @root]
           end
         end
-        @client = Vault::Client.new(client_opts)
+        @client = ::Vault::Client.new(client_opts)
       end
 
       # Add a path to Config source
@@ -50,6 +52,13 @@ module Config
         @paths << [path, root]
       end
 
+      # Re-map individual key names
+      #
+      # @param hsh [Hash] mappings for keys
+      def map(hsh)
+        @map = hsh
+      end
+
       # Remove added paths
       def clear_paths
         @paths = []
@@ -59,10 +68,10 @@ module Config
       #
       # @return [Hash]
       def load
-        Vault.with_retries(Vault::HTTPError,
-                           attempts: @attempts,
-                           base: @base,
-                           max_wait: @max_wait) do
+        ::Vault.with_retries(::Vault::HTTPError,
+                             attempts: @attempts,
+                             base: @base,
+                             max_wait: @max_wait) do
           process_paths
         end
       end
@@ -95,9 +104,12 @@ module Config
           query_path, idx, parent = stack.pop
           sp = subpaths[idx]
           if sp.nil? || sp.eql?('*')
-            data = client_ops.read(query_path)&.data
-            parent.merge!(data || {})
-            parent.compact!
+            data = client_ops.read(query_path)&.data || {}
+            node = root if @flatten
+            node = parent unless @flatten
+            node.merge!(data)
+            node.transform_keys! { |key| @map[key] || key }
+            node.compact!
           end
 
           if sp.eql?('**') || sp.eql?('*')
@@ -106,19 +118,18 @@ module Config
               new_parent = {}
               new_key = st.split('/').last.downcase.to_sym
               new_query_path = [query_path, st].join('/')
-              parent[new_key] = new_parent
+              parent[new_key] = new_parent unless @flatten
               stack.push([new_query_path, idx + 1, new_parent])
             end
           elsif sp
             query_path = [query_path, sp].compact.join('/')
             idx += 1
             new_parent = {}
-            parent[sp.downcase.to_sym] = new_parent
+            parent[sp.downcase.to_sym] = new_parent unless @flatten
             stack.push([query_path, idx, new_parent])
           end
         end
 
-        root = root.flatten if @flatten
         if path.last
           { @root => root }
         else

data/lib/config/vault/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyconfig-vault
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - David Young
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - da.young@f5.com
 executables: []
@@ -97,7 +97,7 @@ metadata:
   homepage_uri: https://github.com/CrunchwrapSupreme/rubyconfig-vault
   source_code_uri: https://github.com/CrunchwrapSupreme/rubyconfig-vault
   documentation_uri: https://www.rubydoc.info/gems/rubyconfig-vault/index
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Implements a ruby config source from vault
 test_files: []