tiller 0.9.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50bc4389c299371589ded733f06078559c91555
-  data.tar.gz: 3f6c1c9cdb4e504f7c5bddce477b684062a3993c
+  metadata.gz: e44d4f088a889a8fd6d1c4f23bad614e91bfb215
+  data.tar.gz: b1a5e3c7a157675b36dae9fabc71e40155beed0d
 SHA512:
-  metadata.gz: a5f706f2109f84b7a015ce5173a67ee3025dd23394b344df5bdae4968adbd037f0f1615fc8c776f8226e60abeb8f2cc8b415ce67b00b5e297c98b28a53a7d472
-  data.tar.gz: 883ace5cc0dbc824881c129d9d62533f1e27e005fc954cbac5f41ba2a0b24cc4d69eb04602904101e492edae003021e1fa9c7404d68b5d9a2fa465984eb033a0
+  metadata.gz: 29465a4eb5cbea636fc6ee2a20a65230e7e33a1ed7b2d41d325800d86e621c8d9bd39c754d7ba6e1f9c5cb3eb5cb3d723d82c8575880ae8e832a53c92bce49bf
+  data.tar.gz: 4c79f0d2c99294fd9372f3006a949791360f79d39cec70f1b44bc01a47114bdfbbdcd8028de89e5443a513bd237f41b3614201f8d7d04db45fc59ce9fe91f944

data/bin/tiller

@@ -26,6 +26,7 @@ require 'tiller/datasource'
 require 'tiller/logger'
 require 'digest/md5'
 require 'tiller/render'
+require 'tiller/kv'
 require 'tiller/version'
 
 EXIT_SUCCESS = 0
@@ -100,6 +101,8 @@ module Tiller
     log.info('Helper modules loaded ' + helper_modules.to_s)
   end
 
+  log.debug("Dynamic values specified. Will parse all values as ERb.") if config.assoc('dynamic_values')
+
   # We now don't actually use the global_values hash for anything when constructing the templates (as they can be
   # over-ridden by template values), but it's here to keep compatibility with the v1 API.
   global_values = { 'environment' => config[:environment] }
@@ -133,6 +136,8 @@ module Tiller
   all_templates       = {}
   skipped_templates   = 0
   updated_templates   = 0
+  pids                = []
+
 
   templates.each do |template, _content|
 
@@ -163,6 +168,27 @@ module Tiller
       target_values.tiller_merge!(dc.target_values(template)) do |key, old, new|
         warn_merge(key, old, new, 'target', data_class.to_s)
       end
+
+      # Dynamic config stuff, allows us to use ERb syntax inside configuration.
+      if config.assoc('dynamic_values')
+        # Need to recursively walk the hash, looking for ERb syntax
+        tiller.deep_traverse do |path,value|
+          if value.is_a?(String) && value.include?('<%')
+            log.debug("Found ERb syntax for #{value} at #{path}")
+            parsed_value = Tiller::render(value, direct_render: true)
+            # Proper Ruby voodoo here.
+            # See http://stackoverflow.com/questions/19304135/deep-nest-a-value-into-a-hash-given-a-path-array for
+            # explanation.
+            tiller.merge!((path + [parsed_value]).reverse.reduce { |s,e| { e => s } })
+          end
+        end
+        target_values.each do |key ,value|
+          if value.is_a?(String) && value.include?('<%')
+            log.debug("Found ERb syntax for target value #{key}:#{value}}")
+            target_values[key] = Tiller::render(value, direct_render: true)
+          end
+        end
+      end
     end
 
     # If our data source returned no values (e.g. we don't build this template
@@ -222,6 +248,17 @@ module Tiller
         "#{target_values['target']}")
     end
 
+    # Exec on write
+    if target_values.key?('exec_on_write')
+      if ! target_values['exec_on_write'].is_a?(Array)
+        log.warn("Warning: exec_on_write for template #{template} is not in array format")
+      else
+        eow_pid=launch(target_values['exec_on_write'])
+        pids.push(eow_pid)
+        log.info("exec_on_write process for #{template} forked with PID #{eow_pid}")
+      end
+    end
+
   end
 
   if config['md5sum']
@@ -254,24 +291,38 @@ module Tiller
     puts "Executing #{config['exec']}..."
 
     # Spawn and wait so API can continue to run
-    child_pid = launch(config['exec'], :verbose => config[:verbose])
+    child_pid = launch(config['exec'])
+    pids.push(child_pid)
 
-    log.info("Child process forked with PID #{child_pid}.")
+    log.info("Child process forked with PID #{child_pid}")
 
-    # Catch signals and send them on to the child process
+    # Catch signals and send them on to the child processes
     [ :INT, :TERM, :HUP ].each do |sig|
-      Signal.trap(sig) { signal(sig, child_pid, :verbose => config[:verbose]) }
+      Signal.trap(sig) do
+        pids.each { |p|  signal(sig, p, :verbose => config[:verbose])}
+      end
     end
 
-    Process.wait(child_pid)
-
-    # Capture the child process status, so we can also exit with this code
-    exit_status = ($?.exitstatus == nil) ? 0 : $?.exitstatus
+    # Wait for all PIDs
+    main_exit_status = 0
+    while pids.length >= 1 do
+      collected_pid = Process.wait
+      exit_status = ($?.exitstatus == nil) ? 0 : $?.exitstatus
+      if collected_pid == child_pid
+        log.info("Main child process with PID #{collected_pid} exited with status #{exit_status}")
+        main_exit_status = exit_status
+      else
+        log.info("exec_on_write process with PID #{collected_pid} exited with status #{exit_status}")
+      end
+      pids.delete(collected_pid)
+    end
 
-    log.info("Child process exited with status #{exit_status}")
+    log.info("Child process exited with status #{main_exit_status}")
     log.info('Child process finished, Tiller is stopping.')
     exit exit_status
 
   end
 
+
+
 end

data/lib/tiller/api/handlers/globals.rb

@@ -2,10 +2,11 @@ require 'tiller/json'
 require 'tiller/api/handlers/404'
 
 def handle_globals(api_version, tiller_api_hash)
+  warning_json = { deprecation_warning: 'The v1 Tiller API is deprecated. Expect this endpoint to be removed in future versions.' }
   case api_version
     when 'v1'
       {
-          :content => dump_json(tiller_api_hash['global_values']),
+          :content => dump_json(tiller_api_hash['global_values'].merge(warning_json)),
           :status => '200 OK'
       }
     else

data/lib/tiller/datasource.rb

@@ -36,7 +36,8 @@ module Tiller
     #    'target'  => "/tmp/#{template_name}",
     #    'user'    => 'root',
     #    'group'   => 'root',
-    #    'perms'   => '0644'
+    #    'perms'   => '0644',
+    #    'exec_on_write' => [ "/usr/bin/touch" , "somefile.tmp" ]
     # }
     # Again, we should always return a hash; if we have no data for the given
     # template, just return an empty hash.

data/lib/tiller/kv.rb

@@ -0,0 +1,26 @@
+module Tiller
+
+  # Simple KV implementation to facilitate passing 'private' data between datasources and helpers
+
+  class Kv
+    @@kv = {}
+
+    def self.set(path, value, options={})
+      ns = options[:namespace] || 'tiller'
+      hash = path.sub(/^\//, '').split('/').reverse.inject(value) { |h, s|  {s => h}  }
+      Tiller::log.debug("#{self} : Setting [#{ns}]#{path} = #{value}")
+      @@kv[ns]=hash
+    end
+
+    def self.get(path, options={})
+      ns = options[:namespace] || 'tiller'
+      value = path.sub(/^\//, '').split('/').inject(@@kv[ns]) { |h,v| h[v] }
+      if value == nil
+        Tiller::log.warn("#{self} : Request for non-existent key [#{ns}]#{path}")
+      end
+      value
+    end
+
+  end
+end
+

data/lib/tiller/logger.rb

@@ -26,6 +26,12 @@ module Tiller
       self.messages.push(msg)
     end
 
+    # Quick hack to remove duplicate informational messages
+    def debug(msg)
+      super(msg) unless self.messages.include?(msg)
+      self.messages.push(msg)
+    end
+
   end
 
 end

data/lib/tiller/render.rb

@@ -1,5 +1,13 @@
 module Tiller
-  def self.render(template)
+  def self.render(template, options={})
+
+    # This is used for rendering content in dynamic configuration files
+    if options.has_key?(:direct_render)
+      content = template
+      ns = OpenStruct.new(Tiller::tiller)
+      return ERB.new(content, nil, '-').result(ns.instance_eval { binding })
+    end
+
     if Tiller::templates.key?(template)
       content = Tiller::templates[template]
       ns = OpenStruct.new(Tiller::tiller)

data/lib/tiller/util.rb

@@ -13,6 +13,19 @@ class ::Hash
     merger = proc { |_key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
     self.merge!(second, &merger)
   end
+
+  # https://gist.github.com/sepastian/8688143
+  def deep_traverse(&block)
+    stack = self.map{ |k,v| [ [k], v ] }
+    while not stack.empty?
+      key, value = stack.pop
+      yield(key, value)
+      if value.is_a? Hash
+        value.each{ |k,v| stack.push [ key.dup << k, v ] }
+      end
+    end
+  end
+
 end
 
 # This is needed so we can enumerate all the loaded plugins later
@@ -24,8 +37,8 @@ end
 
 # Warn if values are being merged
 def warn_merge(key, old, new, type, source)
-  puts "Warning, merging duplicate #{type} values."
-  puts "#{key} => '#{old}' being replaced by : '#{new}' from #{source}"
+  Tiller::log.info("Merging duplicate #{type} values")
+  Tiller::log.info("#{key} => '#{old}' being replaced by : '#{new}' from #{source}")
   new
 end
 
@@ -39,8 +52,8 @@ def signal(sig, pid, options={})
   end
 end
 
-# Launch the replacement process.
-def launch(cmd, _options={})
+# Fork and launch a process.
+def launch(cmd)
   # If an array, then we use a different form of spawn() which
   # avoids a subshell. See https://github.com/markround/tiller/issues/8
   if cmd.is_a?(Array)

data/lib/tiller/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-02-09 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
@@ -44,6 +44,7 @@ files:
 - lib/tiller/defaults.rb
 - lib/tiller/http.rb
 - lib/tiller/json.rb
+- lib/tiller/kv.rb
 - lib/tiller/loader.rb
 - lib/tiller/logger.rb
 - lib/tiller/options.rb