consul-template-generator 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZiNGE1Yzc5NGZhMTMwYWJmNDhmMjg0NDRhODM4MDU4N2UxYzcwOA==
+    N2YzMmY3Y2Y5NzhlMzY2YjZiNjgxZWQ4ZWFiYzVkOGNlOGM0ODZlZA==
   data.tar.gz: !binary |-
-    MmU1ODM0M2QyYjlkYzlhMzIzY2JiMThkZDE3OTQ0ODE1M2MxZDVmMQ==
+    MjJjODFlNzRjM2EyNzk0MjM4ODViMWFjZGM5MGNmOTg0Mzc3YTUzMg==
 SHA512:
   metadata.gz: !binary |-
-    ZGMwYmI1YTI3YTVkMzQ0OTcxZDkxM2Y5NTIzMTkzYmM0YzE5NjA3YjU2NmIz
-    Mjk5ZmJiOWFhYjIwZjFjNDUxMDAyNWYwMmJjMGVjNjRiOTM2YmMyYzc5YjZh
-    OWIyN2U3ZWNkMmY2NWY1ZTkyNTkzNjY2NTg0NmM4MzRmYTkxZWY=
+    YjMyZjZkYmMzNzRiOWYwMmU2MjQwZTZhYTgxMjJkYzdhZWExZjI1MzkxYTY5
+    Zjg3Y2EyNzhiNDMxNjRkMzY3NzEwMGRhYzdjYjU2ZDc3MDVlNWIwMjBmMjcw
+    NzliYTQyMmYxYTlmNjA1NjNiNDlmZmIxYTc2ODg1ODVlMGUzMjI=
   data.tar.gz: !binary |-
-    ZDA1MmI3M2QxZGJmODU1MmMwYmEzZTBjMThkMjc2Y2FlMGNjM2IyZjNjYTFi
-    ODkyZDMxY2JmNWQ4MjI2YWQxZTdmNWY0ZTdmYmYwYWU4OGQzNTZjYmZlYTFh
-    Yjg0ZjBlNDI3NGQzNjM3NTAzYTA4YmZmMDRmNTYzZmExZjBhZmE=
+    YWVkYWEwN2ZkZDgwN2QyZTdkNzk5MzE2YjRmNjFjYWEwZjZkMTk4ZDI4ZjFh
+    MWNmYTBjZjkyNWVmNGMyODM5MjQyZWFiOTM4OGQ4MmMxOTYwNGJkN2FmMzQy
+    NWNkYzI0ZmMwMDQ3ODQ0YzgzZjQ4ZjRiY2UxMzk2ZjBhZWM0MjE=

data/Gemfile.lock

@@ -2,9 +2,9 @@ PATH
   remote: .
   specs:
     consul-template-generator (0.3.4)
-      differ (~> 0.1.2)
-      diplomat (~> 0.13.0)
-      popen4 (~> 0.1.2)
+      diffy (~> 3.0)
+      diplomat (~> 0.13)
+      popen4 (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -15,12 +15,12 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    differ (0.1.2)
+    diffy (3.0.7)
     diplomat (0.13.1)
       faraday (~> 0.9)
       json (~> 1.8)
     docile (1.1.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     hirb (0.7.3)
     json (1.8.3)

data/bin/consul-template-generator

@@ -62,6 +62,11 @@ EOC
     options[:session_key] = l
   end
 
+  options[:session_ttl] = 30
+  opts.on(nil, '--session-ttl SESSION_TTL', "Set a TTL for consul sessions (sets an implicit ttl on locks created by consul-template-generator [default: 30]") do |ttl|
+    options[:session_ttl] = ttl.to_i
+  end
+
   options[:unset_proxy] = false
   opts.on(nil, '--unset-proxy', "Use if 'http_proxy' is set in your environment, but you don't want to use it...") do |u|
     options[:unset_proxy] = true
@@ -123,6 +128,7 @@ CMD.configure(
     options[:graphite_host],
     options[:graphite_paths],
     options[:diff_changes],
+    options[:session_ttl]
 )
 
 ec = 1

data/lib/consul/template/generator.rb

@@ -42,8 +42,14 @@ module Consul
           end
         end
 
-        def create_session(name)
-          Diplomat::Session.create({:Node => self.config.node, :Name => name, :Behavior => 'release'})
+        def create_session(name, ttl_seconds = 30)
+          opts = {
+            :Node => self.config.node,
+            :Name => name,
+            :Behavior => 'release',
+            :TTL => "#{ttl_seconds}s"
+          }
+          Diplomat::Session.create(opts)
         end
 
         def renew_session(sess_id)

data/lib/consul/template/generator/cmd.rb

@@ -7,11 +7,12 @@ module Consul
         include Consul::Template::Generator
         class << self
 
-          def configure(consul_host, templates, session_key, log_level, graphite_host = nil, graphite_paths = nil, diff_changes = false)
+          def configure(consul_host, templates, session_key, log_level, graphite_host = nil, graphite_paths = nil, diff_changes = false, session_ttl = nil)
             Consul::Template::Generator.configure do |config|
               config.log_level = log_level
               config.templates = templates
               config.session_key = session_key
+              config.session_ttl = session_ttl || 30
               config.consul_host = consul_host
               config.graphite_host = graphite_host
               config.graphite_paths = graphite_paths || {}

data/lib/consul/template/generator/configuration.rb

@@ -39,8 +39,8 @@ module Consul
       end
 
       class Configuration
-        attr_accessor :templates, :session_key, :consul_template_binary, :logger, :log_level, :graphite_host, :graphite_paths, :diff_changes
-        attr_accessor :consul_host, :node, :client_options
+        attr_accessor :templates, :session_key, :session_ttl, :consul_template_binary, :logger, :log_level, :graphite_host
+        attr_accessor :consul_host, :node, :client_options, :diff_changes, :graphite_paths
 
         def initialize
           @log_level = :debug
@@ -49,6 +49,7 @@ module Consul
           @templates = {}
           @graphite_paths = {}
           @session_key = 'consul-template-generator'
+          @session_ttl = 30
           @client_options = {}
           @logger = Consul::Template::Generator::STDLogger
           @graphite_host = nil

data/lib/consul/template/generator/init.rb

@@ -17,7 +17,7 @@ module Consul
           unless @session.nil?
             destroy_session
           end
-          @session = Consul::Template::Generator.create_session @config.session_name
+          @session = Consul::Template::Generator.create_session @config.session_name, @config.session_ttl
         end
 
         def destroy_session

data/lib/consul/template/generator/run.rb

@@ -22,10 +22,10 @@ module Consul
               @config.logger.debug "Existing hash: #{comp_hash || 'nil'}, new hash: #{hash}"
 
               if diff_changes
-                  @config.logger.info "Diffing templates..."
-                  curr_template = retrieve_template template_key
-                  diff = Diffy::Diff.new(curr_template, body, :include_diff_info => true, :context => 5).to_s(:text)
-                  @config.logger.info diff
+                @config.logger.info "Diffing templates..."
+                curr_template = retrieve_template template_key
+                diff = Diffy::Diff.new(curr_template, body, :include_diff_info => true, :context => 5).to_s(:text)
+                @config.logger.info diff
               end
 
               uploaded = upload_template(template_key, body)

data/lib/consul/template/generator/version.rb

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.3.4'
+      VERSION = '0.3.5'
     end
   end
 end

data/spec/init_spec.rb

@@ -21,7 +21,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       runner = Consul::Template::Generator::CTRunner.new
       expect(runner.session).to eql('test-session-id')
       runner.destroy_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release","TTL":"30s"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/test-session-id')
       expect(runner.session).to be_nil
     end
@@ -31,7 +31,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       expect(runner.session).to eql('destroyed-session')
       runner.create_session
       runner.destroy_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release","TTL":"30s"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/destroyed-session')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/test-session-id')
       expect(runner.session).to be_nil
@@ -41,7 +41,7 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       runner = Consul::Template::Generator::CTRunner.new 'failed-destroyed-session'
       expect(runner.session).to eql('failed-destroyed-session')
       runner.create_session
-      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release","TTL":"30s"}')
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/failed-destroyed-session').times(5)
       expect(runner.session).to eql('test-session-id')
     end
@@ -53,5 +53,19 @@ describe 'Consul::Template::Generator::CTRunner' '#initialize' do
       runner.destroy_session
       expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/').times(0)
     end
+
+    it "allows setting session ttl" do
+      Consul::Template::Generator.configure do |config|
+        config.templates = {'test-session-template.ctmpl' => 'test-session-template' }
+        config.node = 'test-node'
+        config.log_level = :off
+        config.session_key = '/session/consul-template-generator'
+        config.session_ttl = 10
+        config.consul_template_binary = 'consul-template'
+      end
+      runner = Consul::Template::Generator::CTRunner.new 'ttl-session'
+      runner.create_session
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/create').with(:body => '{"Node":"test-node","Name":"consul-template-generator","Behavior":"release","TTL":"10s"}')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler