tiller 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44d4f088a889a8fd6d1c4f23bad614e91bfb215
-  data.tar.gz: b1a5e3c7a157675b36dae9fabc71e40155beed0d
+  metadata.gz: d77cf5dbfb18a7c01748c26f85a1750db39cdf64
+  data.tar.gz: 7c6495941198eb295f8bc77aa596836ba4c1b1bb
 SHA512:
-  metadata.gz: 29465a4eb5cbea636fc6ee2a20a65230e7e33a1ed7b2d41d325800d86e621c8d9bd39c754d7ba6e1f9c5cb3eb5cb3d723d82c8575880ae8e832a53c92bce49bf
-  data.tar.gz: 4c79f0d2c99294fd9372f3006a949791360f79d39cec70f1b44bc01a47114bdfbbdcd8028de89e5443a513bd237f41b3614201f8d7d04db45fc59ce9fe91f944
+  metadata.gz: 62be132162a6b83147e771070d663f1e9218a83f92e0a120b74f8adc1d3e44c163eab8f6bbf5eb50106f776c50d6181f1538f451d8e039fb491b323a48c6a78a
+  data.tar.gz: 8782973e32397059a0be3406a946274f3f3afe521bf07893202c5e7f5c42f697b646419a2547ee6ee6eb2651d86c4f356ed6d0e04117802697f930671e58ef82

data/bin/tiller

@@ -297,7 +297,7 @@ module Tiller
     log.info("Child process forked with PID #{child_pid}")
 
     # Catch signals and send them on to the child processes
-    [ :INT, :TERM, :HUP ].each do |sig|
+    [ :INT, :TERM, :HUP, :QUIT, :USR1, :USR2, :WINCH ].each do |sig|
       Signal.trap(sig) do
         pids.each { |p|  signal(sig, p, :verbose => config[:verbose])}
       end

data/lib/tiller/data/consul.rb

@@ -61,11 +61,13 @@ class ConsulDataSource < Tiller::DataSource
 
   def fetch_all_keys(path)
     keys = Diplomat::Kv.get(path, { keys: true, :dc => @consul_config['dc'] }, :return)
-    all_keys = {}
+    all_keys = Hash.new
     if keys.is_a? Array
       keys.each do |k|
         Tiller::log.debug("#{self} : Fetching key #{k}")
-        all_keys[File.basename(k)] = Diplomat::Kv.get(k, { nil_values: true, :dc => @consul_config['dc'] })
+        k_basename = k[path.length..-1] # remove leading path
+        v = Diplomat::Kv.get(k, { nil_values: true, :dc => @consul_config['dc'] })
+        all_keys.deep_merge!(k_basename.split('/').reverse.inject(v) { |a, n| { n => a } })
       end
       all_keys
     else

data/lib/tiller/data/environment_nested.rb

@@ -0,0 +1,18 @@
+require 'tiller/datasource'
+
+class EnvironmentNestedDataSource < Tiller::DataSource
+
+  def global_values
+    values = Hash.new
+    ENV.each do |k, v|
+      begin
+        v = YAML.load(v)  # helper to get real data type instead of string
+        values.deep_merge!(k.split('_').reverse.inject(v) { |a, n| { n => a } })
+      rescue
+        Tiller::log.debug("Environment variable #{k} with value #{v} could not be unfolded (ignored)")
+      end
+    end
+    values
+  end
+
+end

data/lib/tiller/data/file.rb

@@ -25,6 +25,7 @@ class FileDataSource < Tiller::DataSource
         env_file = File.join(Tiller::config[:tiller_base], 'environments',
                              "#{Tiller::config[:environment]}.yaml")
         @config_hash = YAML.load(open(env_file))
+        @config_hash ||= Hash.new #in case YAML.load returned false
       rescue
         abort("Error : Could not load environment file #{env_file}")
       end

data/lib/tiller/data/vault.rb

@@ -9,26 +9,59 @@ class VaultDataSource < Tiller::DataSource
 
   def global_values
     return {} unless Tiller::config.has_key?('vault')
-    path = interpolate("#{@vault_config['values']['global']}")
-    Tiller::log.debug("#{self} : Fetching globals from #{path}")
-    globals = get_values(path)
-
-    # Do we have per-env globals ? If so, merge them
-    path = interpolate("#{@vault_config['values']['per_env']}")
-    Tiller::log.debug("#{self} : Fetching per-environment globals from #{path}")
-    globals.deep_merge!(get_values(path))
+    if @vault_config['flex_mode']
+      globals = {}
+      Tiller::log.debug("#{self} : In Flex Mode: Fetching all defined paths under values")
+      @vault_config['values'].each do |key, path|
+        next unless path
+        Tiller::log.debug("#{self} : Fetching values in #{path} into the #{key} variable")
+        path = "/#{path}" if path[0] != '/'
+        path = interpolate(path)
+        globals[key] = get_values(path)
+      end
+      globals
+    else
+      path = interpolate("#{@vault_config['values']['global']}")
+      Tiller::log.debug("#{self} : Fetching globals from #{path}")
+      globals = get_values(path)
+
+      # Do we have per-env globals ? If so, merge them
+      path = interpolate("#{@vault_config['values']['per_env']}")
+      Tiller::log.debug("#{self} : Fetching per-environment globals from #{path}")
+      globals.deep_merge!(get_values(path))
+    end
   end
 
   def values(template_name)
     return {} unless Tiller::config.has_key?('vault')
-    path = interpolate("#{@vault_config['values']['template']}", template_name)
-    Tiller::log.debug("#{self} : Fetching template values from #{path}")
-    get_values(path)
+    if @vault_config['flex_mode']
+      # Merge configs of the template and environment, subsequently
+      template_config = Tiller::config[template_name] || {}
+      if Tiller::config.has_key?('environments') && Tiller::config['environments'].has_key?(Tiller::config[:environment]) && Tiller::config['environments'][Tiller::config[:environment]].has_key?(template_name)
+        template_config.deep_merge!(Tiller::config['environments'][Tiller::config[:environment]][template_name])
+      end
+      return {} unless template_config.has_key?('vault')
+      values = {}
+      template_config['vault'].each do |key, path|
+        path = "/#{path}" if path[0] != '/'
+        # We want to make Vault compatible with dynamic values here
+        path = Tiller::render(path, direct_render: true) if Tiller::config.assoc('dynamic_values')
+        path = interpolate(path)
+        Tiller::log.debug("#{self} : Fetching values in #{path} into the #{key} variable")
+        values[key] = get_values(path)
+      end
+      values
+    else
+      path = interpolate("#{@vault_config['values']['template']}", template_name)
+      Tiller::log.debug("#{self} : Fetching template values from #{path}")
+      get_values(path)
+    end
   end
 
 
   def target_values(template_name)
     return {} unless Tiller::config.has_key?('vault')
+    return {} if @vault_config['flex_mode']
     path = interpolate("#{@vault_config['values']['target']}", template_name)
     Tiller::log.debug("#{self} : Fetching template target values from #{path}")
     get_values(path)
@@ -38,18 +71,37 @@ class VaultDataSource < Tiller::DataSource
   # Helper method, not used by DataSource API
   def get_values(path)
     keys = nil
+    Tiller::log.debug("Trying Vault list with #{path}")
     Vault.with_retries(Vault::HTTPConnectionError, Vault::HTTPError) do |attempt, e|
-        Tiller::log.warn("#{self} : Received exception #{e} from Vault") if e
-        keys = Vault.logical.list(path)
+      Tiller::log.warn("#{self} : Received exception #{e} from Vault") if e
+      keys = Vault.logical.list(path)
     end
 
     values = {}
-    if keys.is_a? Array
+    if keys.is_a?(Array) && keys.size > 0
       keys.each do |k|
         Tiller::log.debug("#{self} : Fetching value at #{path}/#{k}")
         Vault.with_retries(Vault::HTTPConnectionError, Vault::HTTPError) do |attempt, e|
-            Tiller::log.warn("#{self} : Received exception #{e} from Vault") if e
-            values[k] = Vault.logical.read(File.absolute_path(k,path)).data[@vault_config['json_key_name']]
+          Tiller::log.warn("#{self} : Received exception #{e} from Vault") if e
+          Tiller::log.debug("Actual Vault Path: #{File.absolute_path(k,path)}")
+          vdata = Vault.logical.read(File.absolute_path(k,path)).data
+          if @vault_config['flex_mode']
+            values[k.to_sym] = vdata
+          else
+            values[k] = vdata[@vault_config['json_key_name']]
+          end
+        end
+      end
+      values
+    elsif @vault_config['flex_mode']
+      Tiller::log.debug("#{path} is likely a Vault document, retrieving values for them")
+      Vault.with_retries(Vault::HTTPConnectionError, Vault::HTTPError) do |attempt, e|
+        Tiller::log.warn("#{self} : Received exception #{e} from Vault") if e
+        vault_data = Vault.logical.read(path)
+        if vault_data && (data = vault_data.data) && data.is_a?(Hash)
+          values = data
+        else
+          Tiller::log.warn("No values found at #{path}")
         end
       end
       values

data/lib/tiller/vault.rb

@@ -3,7 +3,7 @@ require 'pp'
 require 'tiller/defaults'
 require 'tiller/util'
 
-VAULT_TOKEN_FILE = "#{Dir.home}/.vault-token"
+VAULT_TOKEN_FILE = ENV.key?('HOME') ? "#{Dir.home}/.vault-token" : nil
 
 module Tiller::VaultCommon
   def setup
@@ -19,14 +19,14 @@ module Tiller::VaultCommon
 
     # Sanity checks
     ['url'].each {|c| raise "Missing Vault configuration #{c}" unless @vault_config.has_key?(c)}
-    raise "Missing Vault token" if !(File.exists? VAULT_TOKEN_FILE || @vault_config['token'])
+    raise "Missing Vault token" if !((VAULT_TOKEN_FILE && File.exists?(VAULT_TOKEN_FILE)) || @vault_config['token'] || ENV['VAULT_TOKEN'])
 
     Vault.configure do |config|
         # The address of the Vault server
         config.address = @vault_config['url']
 
         # The token to authenticate to Vault
-        config.token = @vault_config['token'] || File.read(VAULT_TOKEN_FILE)
+        config.token = @vault_config['token'] || ENV['VAULT_TOKEN'] || File.read(VAULT_TOKEN_FILE)
 
         config.ssl_verify = @vault_config['ssl_verify']
         config.ssl_pem_file = @vault_config['ssl_pem_file'] if @vault_config.has_key?(:ssl_pem_file)

data/lib/tiller/version.rb

@@ -1,2 +1,2 @@
 # http://semver.org/
-VERSION="1.0.0"
+VERSION="1.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files from a variety of sources, particularly
   useful for Docker containers. See https://github.com/markround/tiller for examples
@@ -33,6 +33,7 @@ files:
 - lib/tiller/data/defaults.rb
 - lib/tiller/data/environment.rb
 - lib/tiller/data/environment_json.rb
+- lib/tiller/data/environment_nested.rb
 - lib/tiller/data/external_file.rb
 - lib/tiller/data/file.rb
 - lib/tiller/data/http.rb