tiller 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d370d0cfa95a4115b8a5f6daec7789d5352ec86
-  data.tar.gz: aa1ea4c0bb09ae319f97be6d71026bfd0b9797cb
+  metadata.gz: d8dc77227116ed298ac33995aa6b389192d6917b
+  data.tar.gz: 50e4cc6c12c7f1ba0844ea776f180136b75640fa
 SHA512:
-  metadata.gz: 8749c166f4d4581b7423ba444be330ab8ddbf2981a59197e1c0b75fa14a6204bf31f6085f16bb642eb13414f26d31d75ccfd27b8e336fcff78c6fb930ce26cb5
-  data.tar.gz: 98edc1de13a2bc03ae34786258598af6cc0279044d5e57c1f5630248296df607d79047588795c21226c5f9608bc9fcf2227cc29d2fdfc4c77f4a2218c8932024
+  metadata.gz: 721d43464aaec3feab28f9647005cc50dbfeba1f5e816d03982e35f1bce8287e3cda45d898bc3ec163513a59f371e913456efcabc1e06d1bec102cf6337f9294
+  data.tar.gz: 5802b4722771fa28f172383516ece84de346f1b6b54132c5d79d9317788d0d95604a559efa8a59e79931a655ef38c0672d683393d05f035954a54630f2fc2a12

data/bin/tiller

@@ -8,7 +8,7 @@
 #
 # Mark Dastmalchi-Round <github@markround.com>
 
-VERSION = '0.7.7'
+VERSION = '0.7.8'
 
 require 'erb'
 require 'ostruct'

data/lib/tiller/consul.rb

@@ -0,0 +1,35 @@
+require 'diplomat'
+require 'pp'
+require 'tiller/defaults'
+require 'tiller/util'
+
+module Tiller::ConsulCommon
+  def setup
+    # Set our defaults if not specified
+    @consul_config = Tiller::Consul.defaults
+    raise 'No Consul configuration block' unless @config.has_key?('consul')
+    @consul_config.deep_merge!(@config['consul'])
+
+    # Sanity check
+    ['url'].each {|c| raise "Consul: Missing Consul configuration #{c}" unless @consul_config.has_key?(c)}
+
+    # Now we connect to Consul
+    Diplomat.configure do |config|
+      @log.debug("#{self} : Connecting to Consul at #{@consul_config['url']}")
+      config.url = @consul_config['url']
+
+      if @consul_config['acl_token']
+        @log.debug("#{self} : Using Consul ACL token")
+        config.acl_token = @consul_config['acl_token']
+      end
+    end
+  end
+
+  # Interpolate configuration placeholders with values
+  def interpolate(path, template_name = nil)
+    path.gsub!('%e', @config[:environment])
+    path.gsub!('%t', template_name) if template_name
+    path
+  end
+
+end

data/lib/tiller/data/consul.rb

@@ -0,0 +1,71 @@
+require 'pp'
+require 'diplomat'
+require 'tiller/consul.rb'
+
+class ConsulDataSource < Tiller::DataSource
+
+  include Tiller::ConsulCommon
+
+  def global_values
+    # Fetch globals
+    path = interpolate("#{@consul_config['values']['global']}")
+    @log.debug("#{self} : Fetching globals from #{path}")
+    globals = fetch_all_keys(path)
+
+    # Do we have per-env globals ? If so, merge them
+    path = interpolate("#{@consul_config['values']['per_env']}")
+    @log.debug("#{self} : Fetching per-environment globals from #{path}")
+    globals.deep_merge!(fetch_all_keys(path))
+
+    # Do we want to register services in consul_services hash ?
+    if @consul_config['register_services']
+      @log.debug("#{self} : Registering Consul services")
+      globals['consul_services'] = {}
+      services = Diplomat::Service.get_all({ :dc => @consul_config['dc'] })
+      services.marshal_dump.each do |service, _data|
+        @log.debug("#{self} : Fetching Consul service information for #{service}")
+        service_data = Diplomat::Service.get(service, :all, { :dc => @consul_config['dc']})
+        globals['consul_services'].merge!( { "#{service}" => service_data })
+      end
+    end
+
+    # Do we want to register nodes in consul_nodes hash ?
+    if @consul_config['register_nodes']
+      @log.debug("#{self} : Registering Consul nodes")
+      globals['consul_nodes'] = {}
+      nodes = Diplomat::Node.get_all
+      nodes.each do |n|
+        globals['consul_nodes'].merge!({ n.Node => n.Address })
+      end
+    end
+    globals
+  end
+
+  def values(template_name)
+    path = interpolate("#{@consul_config['values']['template']}", template_name)
+    @log.debug("#{self} : Fetching template values from #{path}")
+    fetch_all_keys(path)
+  end
+
+  def target_values(template_name)
+    path = interpolate("#{@consul_config['values']['target']}", template_name)
+    @log.debug("#{self} : Fetching template target values from #{path}")
+    fetch_all_keys(path)
+  end
+
+
+  def fetch_all_keys(path)
+    keys = Diplomat::Kv.get(path, { keys: true, :dc => @consul_config['dc'] }, :return)
+    all_keys = {}
+    if keys.is_a? Array
+      keys.each do |k|
+        @log.debug("#{self} : Fetching key #{k}")
+        all_keys[File.basename(k)] = Diplomat::Kv.get(k, { nil_values: true, :dc => @consul_config['dc'] })
+      end
+      all_keys
+    else
+      {}
+    end
+  end
+
+end

data/lib/tiller/data/defaults.rb

@@ -1,14 +1,7 @@
 require 'yaml'
-# Defaults datasource for Tiller.
-
-# Thanks, StackOverflow ;)
-class ::Hash
-  def deep_merge!(second)
-    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
-end
+require 'tiller/util'
 
+# Defaults datasource for Tiller.
 
 class DefaultsDataSource < Tiller::DataSource
   def setup

data/lib/tiller/data/file.rb

@@ -1,10 +1,6 @@
 require 'yaml'
-# File datasource for Tiller. This works the same way as the default behaviour
-# in Runner.rb - it loads your <environment>.yaml file and pulls data from it.
-# See examples/etc/tiller/environments/production.yaml to see what this file
-# looks like.
-#
-# We also don't provide any global values, just ones specific to a template.
+# File datasource for Tiller.
+
 class FileDataSource < Tiller::DataSource
   # Open and parse the environment file. Tries from v2 format common.yaml first, if that
   # failes, then it looks for separate environment files.

data/lib/tiller/defaults.rb

@@ -1,5 +1,4 @@
 module Tiller
-
   Defaults = {
     :tiller_base          => (ENV['tiller_base'].nil?)  ? '/etc/tiller' : ENV['tiller_base'],
     :tiller_lib           => (ENV['tiller_lib'].nil?)   ? '/usr/local/lib' : ENV['tiller_lib'],
@@ -13,12 +12,10 @@ module Tiller
     'api_enable'          => false,
     'api_port'            => 6275
   }
-
 end
 
 # Defaults for the Zookeeper data and template sources
 module Tiller::Zookeeper
-
   Defaults = {
     'timeout'   => 5,
     'templates' => '/tiller/%e',
@@ -29,14 +26,13 @@ module Tiller::Zookeeper
         'target'    => '/tiller/%e/%t/target_values'
     }
   }
-
 end
 
 
 # Defaults for the HTTP data and template sources
 module Tiller::Http
-
-  Defaults = {
+  def self.defaults
+    {
       'timeout'   => 5,
       'proxy'     => '',
       'templates' => '/tiller/environments/%e/templates',
@@ -48,7 +44,27 @@ module Tiller::Http
           'template'  => '/tiller/templates/%t/values/%e',
           'target'    => '/tiller/templates/%t/target_values/%e'
       }
-  }
+    }
+  end
+end
+
+module Tiller::Consul
+  def self.defaults
+    {
+      'dc'                => 'dc1',
+      'acl_token'         => nil,
+      'register_services' => false,
+      'register_nodes'    => false,
+
+      'templates' => '/tiller/templates',
 
+      'values'    => {
+          'global'    => '/tiller/globals/all',
+          'per_env'   => '/tiller/globals/%e',
+          'template'  => '/tiller/values/%e/%t',
+          'target'    => '/tiller/target_values/%t/%e'
+      }
+    }
+  end
 end
 

data/lib/tiller/http.rb

@@ -10,7 +10,7 @@ module Tiller::HttpCommon
 
   def setup
     # Set our defaults if not specified
-    @http_config = Tiller::Http::Defaults
+    @http_config = Tiller::Http.defaults
 
     raise 'No HTTP configuration block' unless @config.has_key?('http')
     @http_config.merge!(@config['http'])
@@ -61,4 +61,4 @@ module Tiller::HttpCommon
   end
 
 
-end
+end

data/lib/tiller/template/consul.rb

@@ -0,0 +1,27 @@
+require 'pp'
+require 'diplomat'
+require 'tiller/consul.rb'
+
+class ConsulTemplateSource < Tiller::TemplateSource
+
+  include Tiller::ConsulCommon
+
+  def templates
+    path = interpolate("#{@consul_config['templates']}")
+    @log.debug("#{self} : Fetching templates from #{path}")
+    templates = Diplomat::Kv.get(path, {:keys => true, :dc => @consul_config['dc']}, :return)
+
+    if templates.is_a? Array
+      templates.map{|t| File.basename(t)}
+    else
+      @log.warn("Consul : No templates could be fetched from #{path}")
+      []
+    end
+  end
+
+  def template(template_name)
+    path = interpolate("#{@consul_config['templates']}")
+    Diplomat::Kv.get("#{path}/#{template_name}", {:dc => @consul_config['dc']})
+  end
+
+end

data/lib/tiller/template/file.rb

@@ -1,5 +1,4 @@
-# File template datasource for Tiller. This works the same way that Runner.rb
-# used to - it returns templates files present under /etc/tiller/templates
+# File template datasource for Tiller. It returns templates files present under /etc/tiller/templates
 # (or wherever the tiller_base environment is set).
 class FileTemplateSource < Tiller::TemplateSource
   def initialize(config)

data/lib/tiller/templatesource.rb

@@ -21,10 +21,10 @@ module Tiller
     end
 
     def templates
-      {}
+      []
     end
 
-    def template
+    def template(_template_name)
       ""
     end
 

data/lib/tiller/util.rb

@@ -1,3 +1,11 @@
+# Thanks, StackOverflow ;)
+class ::Hash
+  def deep_merge!(second)
+    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
+end
+
 # This is needed so we can enumerate all the loaded plugins later
 class Class
   def subclasses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-13 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
@@ -27,6 +27,8 @@ files:
 - lib/tiller/api/handlers/ping.rb
 - lib/tiller/api/handlers/template.rb
 - lib/tiller/api/handlers/templates.rb
+- lib/tiller/consul.rb
+- lib/tiller/data/consul.rb
 - lib/tiller/data/defaults.rb
 - lib/tiller/data/environment.rb
 - lib/tiller/data/environment_json.rb
@@ -42,6 +44,7 @@ files:
 - lib/tiller/loader.rb
 - lib/tiller/logger.rb
 - lib/tiller/options.rb
+- lib/tiller/template/consul.rb
 - lib/tiller/template/file.rb
 - lib/tiller/template/http.rb
 - lib/tiller/template/zookeeper.rb