aggkit 0.4.6.12981 → 0.4.6.13035

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ae9e1f75683bf395b350f1d3e236bcf379148b58f05c1a16489bd704a592c3
-  data.tar.gz: '038b25ef20529fc2817799c9df0cc6aa2c39edd657ad69deef7bff241e8b3a72'
+  metadata.gz: fc41d1a529e9abaa8a424db2024abd58b6da1f417387abdd1faa4c91a5656fbd
+  data.tar.gz: 80ac8d7e82efad5d5bb93804acee4e37ec554faecd4720345b613a24b1cacb99
 SHA512:
-  metadata.gz: 5ace4f576c16f5ed25b738fb64f57c398a3df252cfe8b6137ec69c345d817c6e814aaf13ac3c76d7a122685e50f91246a37e7567789b5a717dc1e45814c79920
-  data.tar.gz: 131cffabaa956bb278006414a1668aa8345d31b4ba4197cbd2f335c85c772f58ec8def6520189fa80de730994bdceccaffbd8136c17c53b4e3ff98e09c78aa33
+  metadata.gz: 9b0b7d463c041872ffd60971f2af4e39295ffc688ba4a49b504e834237a02d9267f3f162878a31a1c9a4cfb58a294cc2768693c89f92da52efa46709db966b49
+  data.tar.gz: e2ed1577dabc96603df538ed92e8bb384418d202540530e8d558ed26efb6359d456edee1c35657eb7e67b571bac83bbd7bc06398c3973e0a65f2a733d06cbc92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.6.12981)
+    aggkit (0.4.6.13035)
       diplomat
       dotenv
       json

data/bin/aggexec

@@ -8,9 +8,10 @@ consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], ho
 
 
 @opts = {
-  depends:   [],
-  prefixes:  [],
-  templates: []
+  depends:    [],
+  prefixes:   [],
+  templates:  [],
+  dereference:true
 }
 
 @opts[:exec] = (begin
@@ -47,6 +48,10 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:prefixes] << "services/env/#{service}".strip
   end
 
+  opts.on('--[no-]ref', 'dereference consul values in form of "consul://key/subkey"') do |v|
+    options[:dereference] = v
+  end
+
   o.on('--templates=<FOLDER>', 'Folder for recursive envsubst *.in templates. Multiple prefixes are merged from left to right.') do |folder|
     @opts[:templates] << folder.strip
   end
@@ -76,6 +81,10 @@ ENV['CONSUL_PORT'] = consul_addr.port.to_s
 
 Aggkit::Exec.die 'exec script must be provided' if @opts[:exec].empty? && !@opts[:noexec]
 
+def load_envs_from_consul(prefix)
+  Aggkit::Consul.load_envs_from_consul(@opts[:consul], prefix, dereference: @opts[:dereference])
+end
+
 if @opts[:depends].any? || @opts[:prefixes].any?
   # Wait for consul
   Aggkit::Consul.wait_for_consul(@opts[:consul])
@@ -84,7 +93,7 @@ if @opts[:depends].any? || @opts[:prefixes].any?
   @opts[:depends].each(&Aggkit::Consul.method(:wait_for_service).curry.call(@opts[:consul]))
 
   # Load env from consul
-  @opts[:prefixes].each(&Aggkit::Consul.method(:load_envs_from_consul).curry.call(@opts[:consul]))
+  @opts[:prefixes].each(&load_envs_from_consul)
 end
 
 # Preprocess template files

data/lib/aggkit/consul.rb

@@ -26,7 +26,6 @@ module Aggkit
       else
         uri.port = port.to_i
       end
-      
 
       uri
     end
@@ -39,9 +38,10 @@ module Aggkit
       end
     end
 
-    def load_envs_from_consul(consul, prefix)
+    def load_envs_from_consul(consul, prefix, dereference: true)
       consul_http = consul_addr(consul)
-      envs = Aggkit::Exec.capture!("aggconsul --consul=#{consul_http} --env #{prefix} --pristine -d", "Can't load envs from #{prefix}")
+      dr = dereference ? '-d' : ''
+      envs = Aggkit::Exec.capture!("aggconsul --consul=#{consul_http} --env #{prefix} --pristine #{dr}", "Can't load envs from #{prefix}")
       load_envs(envs)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.6.12981
+  version: 0.4.6.13035
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat