consul-template-generator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be4b2612c0cdde3c4ddc78e08af58fddae3fb12
-  data.tar.gz: 594615f00d8f7f8ee0c97923d78666b600fd8755
+  metadata.gz: aaef7a186c5c1fca60d93587c591ae1784f43fc5
+  data.tar.gz: 2a718fbc572f86694d7baa45d3fe2fe00e6d116c
 SHA512:
-  metadata.gz: c7aeee64cbdfe213d140a5f2a3c13d2cbfed1988a5e4bcf8fb1522abfc5ae68f755cde2156bafa5a6d8c3baef426f419b58f989562dce00b618a61e688e20396
-  data.tar.gz: e449b39989b443d9f19a0f1405658c50ed96163cfc1fcf271a151e3dc0841d4ccb0256204768286e50f3a01d9a37daffd7c583b351b15077842b6506a123752b
+  metadata.gz: 0ec46a6583238a47068a2ecb2d9a248c03fcd37484c780f742eb152f79aeb639aa7526249d31384d1a1057aaae91d7b881dd2a03bf2e8fe2d87e0e06371654c1
+  data.tar.gz: fe1eea1260ecc10e3247ecabcf92ab1e05b4e74663c3afdfe6913ba96c36a4c48c704d8f51764df6cdf5d3b8dd0f9fefae0dc2e9399a9da38c83d15f8ce680bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consul-template-generator (0.1.0)
+    consul-template-generator (0.1.2)
       diplomat (~> 0.12.0)
       popen4 (~> 0.1.2)
 

data/lib/consul/template/generator.rb

@@ -52,11 +52,13 @@ module Consul
         def renew_session(sess_id)
           # There is an outstanding bug in Diplomat::Session.renew with a PR to fix
           # https://github.com/WeAreFarmGeek/diplomat/issues/43
-          # Until it's merged and release, we have to skip renewing sessions...
           begin
-            #Diplomat::Session.renew sess_id
+            Diplomat::Session.renew sess_id
           rescue Faraday::ResourceNotFound
             raise ConsulSessionExpired
+          rescue Exception => e
+            # Letting this go for the time being, until the above issue is fixed
+            self.config.logger.error "Unknown error occoured: #{e.message}"
           end
         end
 

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

@@ -51,6 +51,8 @@ module Consul
               config.logger.error "Received interrupt signal, exiting..."
               break
             end
+          ensure
+            runner.destroy_session
           end until false
           0
         end

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

@@ -6,11 +6,28 @@ module Consul
 
         def initialize(consul_session_id = nil)
           if consul_session_id.nil?
-            consul_session_id = Consul::Template::Generator.create_session 'consul-template-generator'
+            create_session
+          else
+            @session = consul_session_id
           end
-          @session = consul_session_id
           @config = Consul::Template::Generator.config
         end
+
+        def create_session
+          unless @session.nil?
+            destroy_session
+          end
+            @session = Consul::Template::Generator.create_session 'consul-template-generator'
+        end
+
+        def destroy_session
+          begin
+            Consul::Template::Generator.destroy_session @session
+          rescue
+            Consul::Template::Generator.config.logger.info "Failed to destroy session: #{@session}"
+          end
+          @session = nil
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Consul
   module Template
     module Generator
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

data/spec/init_spec.rb

@@ -6,20 +6,44 @@ require 'consul/template/generator'
 include Consul::Template::Generator
 
 describe 'Consul::Template::Generator::CTRunner' '#initialize' do
-  before do
+  before(:each) do
     Consul::Template::Generator.configure do |config|
       config.template = 'test-session-template.ctmpl'
       config.template_key = 'test-session-template'
       config.node = 'test-node'
+      config.log_level = :off
       config.consul_template_binary = 'consul-template'
     end
   end
 
   context 'initialization of Consul::Template::Generator::CTRunner' do
     it "creates session if token isn't passed" do
-      @runner = Consul::Template::Generator::CTRunner.new
-      expect(WebMock).to_not have_requested(:put, 'http://127.0.0.1:8500/v1/kv/session/create').with(:body => "{\"Node\": \"test-node\", \"Name\": \"consul-template-generator\"}")
-      expect(@runner.session).to eql('test-session-id')
+      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"}')
+      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
+
+    it "destroys previous session on create" do
+      runner = Consul::Template::Generator::CTRunner.new 'destroyed-session'
+      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"}')
+      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
+    end
+
+    it "handles filed session destroys" 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"}')
+      expect(WebMock).to have_requested(:put, 'http://127.0.0.1:8500/v1/session/destroy/failed-destroyed-session')
+      expect(runner.session).to eql('test-session-id')
     end
   end
 end

data/spec/spec_helper.rb

@@ -30,6 +30,10 @@ class ConsulApiRack
     case env['PATH_INFO']
     when /\/v1\/session\/create/
       code, ret = 200, "{\"ID\": \"test-session-id\"}"
+    when /\/v1\/session\/destroy\/failed-destroyed-session/
+      code, ret = 500, 'false'
+    when /\/v1\/session\/destroy/
+      code, ret = 200, 'true'
     when /\/v1\/kv\/lock\//
       code, ret = process_lock(env['QUERY_STRING'])
     when /\/v1\/kv\//

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-template-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler