vault-tools 0.5.15 → 0.5.16

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    vault-tools (0.5.15)
+    vault-tools (0.5.16)
       aws-sdk
+      excon
       fernet (= 2.0.rc2)
       heroku-api
       honeybadger
@@ -25,7 +26,7 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    excon (0.41.0)
+    excon (0.42.1)
     fernet (2.0.rc2)
       valcro (= 0.1)
     ffi (1.9.6)
@@ -72,7 +73,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.1.2)
+    rdoc (4.2.0)
       json (~> 1.4)
     rr (1.1.2)
     scrolls (0.3.8)

data/lib/vault-tools/log.rb

@@ -59,6 +59,7 @@ module Vault
     def self.log(data, &block)
       data['source'] ||= Config.app_deploy if Config.app_deploy
       data['app'] ||= Config.app_name if Config.app_name
+      data['request-id'] = Thread.current[:request_id] if Thread.current[:request_id]
       Scrolls.log(data, &block)
     end
   end

data/lib/vault-tools/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Tools
-    VERSION = '0.5.15'
+    VERSION = '0.5.16'
   end
 end

data/lib/vault-tools/web.rb

@@ -6,7 +6,43 @@ module Vault
     # List of paths that are not protected thus overriding protected!
     set :unprotected_paths, []
 
+    # Work with request id out of the box
+    def call(env)
+      Thread.current[:request_id] = env['HTTP_X_REQUEST_ID'] || SecureRandom.uuid
+      if defined? Excon
+        decorate_excon!
+        Excon.defaults[:headers]['X-Request-ID'] = Thread.current[:request_id]
+      end
+      env['HTTP_X_REQUEST_ID'] = Thread.current[:request_id]
+      status, headers, response = super(env)
+      headers['Request-ID'] = Thread.current[:request_id]
+      [status, headers, response]
+    end
+
+    def decorate_excon!
+      return unless defined? Excon
+      begin
+        return if Excon.request_id_decorated?
+      rescue
+        Excon.module_eval do
+          def self.request_id_decorated?
+            true
+          end
+        end
+        Excon::Connection.class_eval do
+          alias :stock_initialize :initialize
+          def initialize(params={})
+            stock_initialize(params)
+            if Excon.defaults[:headers].key? 'X-Request-ID'
+              @data[:headers]['X-Request-ID'] ||= Excon.defaults[:headers]['X-Request-ID']
+            end
+          end
+        end
+      end
+    end
+
     class << self
+
       # Store the action for logging purposes.
       def route(verb, action, *)
         condition { @action = action }

data/test/web_test.rb

@@ -22,6 +22,7 @@ class WebTest < Vault::TestCase
   # Always reload the web class to eliminate test leakage
   def setup
     super
+    Excon.defaults[:mock] = true
     set_env('APP_NAME', 'test-app')
     set_env('APP_DEPLOY', 'testing')
     reload_web!
@@ -29,6 +30,7 @@ class WebTest < Vault::TestCase
 
   def teardown
     super
+    Excon.stubs.clear
     @app = nil
   end
 
@@ -194,4 +196,38 @@ class WebTest < Vault::TestCase
     get '/health'
     assert_equal(200, last_response.status)
   end
+
+  def test_that_request_id_gets_logged
+    request_id = 'JKJK-123'
+    mock(Scrolls).log({
+      'request-id' => request_id,
+      'msg' => 'Hit logging test!',
+      'source' => 'testing',
+      'app' => 'test-app'
+    })
+    app.get '/logging-test' do
+      Vault::Log.log('msg' => 'Hit logging test!')
+    end
+
+    header 'X_REQUEST_ID', request_id
+    get '/logging-test'
+    assert_equal request_id, last_response.headers['Request-ID']
+  end
+
+  def test_that_excon_proxies_request_id
+    request_id = 'JKJK-123'
+    Excon.stub(
+      { method: :get, host: 'example.com', path: '/',
+        headers: {'X-Request-ID' => request_id}},
+      { body: request_id, status: 200 })
+    app.get '/proxy-test' do
+      conn = Excon.new('http://example.com/')
+      conn.get.body
+    end
+
+    header 'X_REQUEST_ID', request_id
+    get '/proxy-test'
+    assert_equal request_id, last_response.headers['Request-ID']
+    assert_equal request_id, last_response.body
+  end
 end

data/vault-tools.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rdoc'
   gem.add_dependency 'yard'
   gem.add_dependency 'aws-sdk'
+  gem.add_dependency 'excon'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls
@@ -172,6 +172,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Basic tools for Heroku Vault's Ruby projects
 email:
 - christopher.continanza@gmail.com
@@ -241,12 +257,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1742273413553349512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1742273413553349512
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23