tiller 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3db7fef71f4948a26c6b5eb125302bcff62a19
-  data.tar.gz: e61b34146b245e680d55a6a6e9bb4c3462c51beb
+  metadata.gz: f0724940d4aabb1620ddc521faff0783fa9b5b0f
+  data.tar.gz: 379f0c788be67ed8c8176e964226b2ade39afcfe
 SHA512:
-  metadata.gz: 61080e310e0b0d7454809269ceb2b9bdf5ef7e61c13e9851b2bf6a7aa343ce741d2d17acf9a92badf6ba81f25eb0b296667ea34004a90df0f8e7d9b5ad065676
-  data.tar.gz: 383a7379a17f669031b98df9bb2d1804efdd8b4d7ead35168dba1705d30d03195fbb93e0b481a96d994c1240571f93a9987106a612d89e71143a036a45fe5bfc
+  metadata.gz: 75d56a1140dd02e6b5ae3ee56a88d639439cc92a1751d129291978ed0f2339ad5899d08cfa6cb39b2064ecbff4265ed6d0a36b988c7fa574306f393498f7dcab
+  data.tar.gz: f7836c90b6750fbdcfc0d4a50893c0ef74edba09ddc14c1efb7e024b14240b46888d22e5c0624ae51587e1e2fbec96cbe9382fcf46043f8568647dedcaa00f9f

data/bin/tiller

@@ -12,6 +12,9 @@ require 'yaml'
 require 'fileutils'
 require 'optparse'
 require 'pp'
+require 'json'
+require 'socket'
+require 'tiller/api'
 
 # This is needed so we can enumerate all the loaded plugins later
 class Class
@@ -41,6 +44,7 @@ module Tiller
   # Parse command-line arguments
   config[:no_exec] = false
   config[:verbose] = false
+  config[:api_enable] = false
 
   optparse = OptionParser.new do |opts|
     opts.on('-n', '--no-exec', 'Do not execute a replacement process') do
@@ -49,6 +53,12 @@ module Tiller
     opts.on('-v', '--verbose', 'Display verbose output') do
       config[:verbose] = true
     end
+    opts.on('-a', '--api', 'Enable HTTP API') do
+      config['api_enable'] = true
+    end
+    opts.on('-p', '--api-port [API_PORT]', 'HTTP API port') do |api_port|
+      config['api_port'] = api_port
+    end
     opts.on('-b', '--base-dir [BASE_DIR]', 'Override the tiller_base environment variable') do |base_dir|
       config[:tiller_base] = base_dir
     end
@@ -79,7 +89,7 @@ module Tiller
   require 'tiller/datasource.rb'
 
   # Load the common YAML configuration file
-  config[:common_config] = YAML.load(open(File.join(config[:tiller_base], 'common.yaml')))
+  config.merge!(YAML.load(open(File.join(config[:tiller_base], 'common.yaml'))))
 
   puts "tiller v#{VERSION} (https://github.com/markround/tiller) <github@markround.com>"
 
@@ -92,8 +102,8 @@ module Tiller
   # Now load all our plugins
   template_sources = Array.new
   data_sources = Array.new
-  template_sources |= config[:common_config]['template_sources']
-  data_sources |= config[:common_config]['data_sources']
+  template_sources |= config['template_sources']
+  data_sources |= config['data_sources']
   template_sources.each { |t| require "tiller/template/#{t}.rb" }
   data_sources.each { |t| require "tiller/data/#{t}.rb" }
 
@@ -127,6 +137,7 @@ module Tiller
 
   # Now we go through each template we've identified, and get the
   # values for each one.
+  all_templates = Hash.new
   templates.each do |template, content|
     values = Hash.new
     target_values = Hash.new
@@ -170,6 +181,12 @@ module Tiller
     target.puts(parsed_template)
     target.close
 
+    # config is redundant in target_values, remove it for the final status hash.
+    all_templates[template]={
+        'merged_values' => tiller,
+        'target_values' => target_values.reject{|k,v| k=='config'}
+    }
+
     # Set permissions if we are running as root
     if Process::Sys.geteuid == 0
       puts "Setting ownership/permissions on #{target_values['target']}" if config[:verbose]
@@ -189,11 +206,25 @@ module Tiller
 
   puts 'Template generation completed'
 
-  if config[:no_exec] == false && config[:common_config].key?('exec')
-    # All templates created, so let's handover to the replacement process then
-    # it's home in time for tea and medals.
-    puts "Executing #{config[:common_config]['exec']}..."
-    exec(config[:common_config]['exec'])
+  # Final status structure for API
+  tiller_api_hash={'config' => config, 'global_values' => global_values, 'templates' => all_templates}
+
+  if config['api_enable']
+    Thread.start{ tiller_api(tiller_api_hash) }
+  end
+
+  if config[:no_exec] == false && config.key?('exec')
+    # All templates created, so let's start the replacement process
+    puts "Executing #{config['exec']}..."
+
+    # Fork and wait so API can continue to run
+    fork do
+      system(config['exec'])
+    end
+
+    puts "Child process forked." if config[:verbose]
+    Process.wait
+    puts "Child process finished, Tiller is stopping." if config[:verbose]
   end
 
 

data/examples/json/common.yaml

@@ -3,3 +3,6 @@ data_sources:
   - file
 template_sources:
   - file
+exec: sleep 600
+
+

data/lib/tiller/api.rb

@@ -0,0 +1,69 @@
+require 'json'
+require 'socket'
+require 'tiller/api/handlers/404'
+require 'tiller/api/handlers/ping'
+require 'tiller/api/handlers/config'
+require 'tiller/api/handlers/globals'
+require 'tiller/api/handlers/templates'
+require 'tiller/api/handlers/template'
+
+
+API_VERSION=1
+API_PORT=6275
+
+# The following is a VERY simple HTTP API, used for querying the status of Tiller
+# after it has generated templates and forked a child process.
+
+def tiller_api(tiller_api_hash)
+  api_port = tiller_api_hash['config']['api_port'] ?
+      tiller_api_hash['config']['api_port'] : API_PORT
+
+  puts "Tiller API starting on port #{api_port}" if tiller_api_hash['config'][:verbose]
+
+  server = TCPServer.new('127.0.0.1', api_port)
+
+  loop do
+    socket = server.accept
+    request = socket.gets
+    (method, uri, http_version) = request.split
+
+    if uri =~ /^\/v([0-9]+)\//
+      api_version = uri.split('/')[1]
+    end
+
+    # Defaults
+    response = handle_404
+
+    # Routing
+    case method
+      when 'GET'
+        case uri
+          when '/ping'
+            response = handle_ping
+          when /^\/v([0-9]+)\/config/
+            response = handle_config(api_version, tiller_api_hash)
+          when /^\/v([0-9]+)\/globals/
+            response = handle_globals(api_version, tiller_api_hash)
+          when /^\/v([0-9]+)\/templates/
+            response = handle_templates(api_version, tiller_api_hash)
+          when /^\/v([0-9]+)\/template\//
+            template = uri.split('/')[3]
+            response = handle_template(api_version, tiller_api_hash, template)
+        end
+    end
+
+    # Response
+    socket.print "HTTP/1.1 #{response[:status]}\r\n" +
+                     "Content-Type: application/json\r\n" +
+                     "Server: Tiller #{VERSION} / API v#{API_VERSION}\r\n"
+                     "Content-Length: #{response[:content].bytesize}\r\n" +
+                     "Connection: close\r\n"
+    socket.print "\r\n"
+    socket.print response[:content]
+    socket.close
+  end
+end
+
+
+
+

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

@@ -0,0 +1,6 @@
+def handle_404
+  {
+      :content => '{ "error" : "not implemented" }',
+      :status => '404 Not Found'
+  }
+end

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

@@ -0,0 +1,14 @@
+require 'json'
+require 'tiller/api/handlers/404'
+
+def handle_config(api_version, tiller_api_hash)
+  case api_version
+    when 'v1'
+      {
+          :content => tiller_api_hash['config'].to_json,
+          :status => '200 OK'
+      }
+    else
+      handle_404
+  end
+end

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

@@ -0,0 +1,14 @@
+require 'json'
+require 'tiller/api/handlers/404'
+
+def handle_globals(api_version, tiller_api_hash)
+  case api_version
+    when 'v1'
+      {
+          :content => tiller_api_hash['global_values'].to_json,
+          :status => '200 OK'
+      }
+    else
+      handle_404
+  end
+end

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

@@ -0,0 +1,6 @@
+def handle_ping
+  {
+      :content => "{ \"ping\": \"Tiller API v#{API_VERSION} OK\" }",
+      :status => '200 OK'
+  }
+end

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

@@ -0,0 +1,19 @@
+require 'json'
+require 'tiller/api/handlers/404'
+
+def handle_template(api_version, tiller_api_hash, template)
+  case api_version
+    when 'v1'
+      if tiller_api_hash['templates'].has_key?(template)
+        {
+            :content => tiller_api_hash['templates'][template].to_json,
+            :status => '200 OK'
+        }
+      else
+        {
+            :content => '{ "error" : "template not found" }',
+            :status => '404 Not Found'
+        }
+      end
+  end
+end

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

@@ -0,0 +1,14 @@
+require 'json'
+require 'tiller/api/handlers/404'
+
+def handle_templates(api_version, tiller_api_hash)
+  case api_version
+    when 'v1'
+        {
+            :content => tiller_api_hash['templates'].keys.to_json,
+            :status => '200 OK'
+        }
+      else
+        handle_404
+      end
+  end

data/lib/tiller/data/file.rb

@@ -18,6 +18,7 @@ class FileDataSource < Tiller::DataSource
   end
 
   def target_values(template_name)
+    # The config element is redundant (not a target value)
     @config_hash.key?(template_name) ? @config_hash[template_name] : Hash.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files in Docker containers from a variety
   of sources. See https://github.com/markround/tiller for examples and documentation.
@@ -31,6 +31,13 @@ files:
 - examples/plugins/lib/tiller/data/dummy.rb
 - examples/plugins/lib/tiller/data/network.rb
 - examples/plugins/lib/tiller/template/dummy.rb
+- lib/tiller/api.rb
+- lib/tiller/api/handlers/404.rb
+- lib/tiller/api/handlers/config.rb
+- lib/tiller/api/handlers/globals.rb
+- lib/tiller/api/handlers/ping.rb
+- lib/tiller/api/handlers/template.rb
+- lib/tiller/api/handlers/templates.rb
 - lib/tiller/data/environment.rb
 - lib/tiller/data/environment_json.rb
 - lib/tiller/data/file.rb