routemaster-drain 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 704afcba6a7b48237368e3a5f93896a152a2a081
-  data.tar.gz: bb825aa6d94898131fa8185d4c5264296c5c2aed
+  metadata.gz: 1961fe701af902402b83e7eaa4a76fb54bf06f93
+  data.tar.gz: ae8913a88b7f1da4379ee03f0900ec0e5b896f65
 SHA512:
-  metadata.gz: 44916cd9440ba47737a567527755a085034c222e892e311ecc848a114634c25d44c81219ef1c58290e8b2d10ad18f23bdb57a939d9d84072cf3ef4a7665a9bf2
-  data.tar.gz: f19f4000b1250ddcccce85e6dcf4c0d3fde1c741f68f314da336525f228c619f15f98e682b8f3b059f2eed46c562033864582957ad149e3201e5cd21afb1b112
+  metadata.gz: d851f45539fc6af2e302ffc9497a0e18f71c6c261254bd0f7681d8a8996da2fd9b96659019f8d3c3012cc79a692c0d903d31d3ed2e50236fdc6fd13405baeba7
+  data.tar.gz: 44aff14e7d23468f10a3214a31e6ee3920401421629230f2b7d19461b43f93a54573441895d2d3d06d041220cd554c3a1b90074447afa5eec0514d37dd91f297

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 _A description of your awesome changes here!_
 
+### 3.6.1 (2018-10-09)
+
+Features:
+
+- Clients can now set User Agent when placing requests
+
 ### 3.6.0 (2018-07-23)
 
 Features:

data/lib/routemaster/api_client.rb

@@ -111,10 +111,11 @@ module Routemaster
     def _request(method, url:, body: nil, headers:, params: {})
       uri = _assert_uri(url)
       auth = auth_header(uri.host)
+      headers = [*user_agent_header, *auth, *headers].to_h
       connection.public_send(method) do |req|
         req.url uri.to_s
         req.params.merge! params
-        req.headers = headers.merge(auth)
+        req.headers = headers
         req.body = body
       end
     end
@@ -155,6 +156,11 @@ module Routemaster
       { 'Authorization' => "Basic #{Base64.strict_encode64(auth_string)}" }
     end
 
+    def user_agent_header
+      agent = @source_peer || "Faraday v#{Faraday::VERSION}"
+      { 'User-Agent' => agent }
+    end
+
     def response_cache_opt_headers(value)
       { Routemaster::Middleware::ResponseCaching::RESPONSE_CACHING_OPT_HEADER => value.to_s }
     end

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.6.0'.freeze
+    VERSION = '3.6.1'.freeze
   end
 end

data/spec/routemaster/api_client_spec.rb

@@ -55,6 +55,32 @@ describe Routemaster::APIClient do
         expect(req.headers).to include('X-Custom-Header')
       end
     end
+
+    describe 'source peer' do
+      context 'with a source peer' do
+        let(:options) { { source_peer: 'ServiceA' } }
+        let(:fetcher) { described_class.new(options) }
+
+        it 'should set the user agent header to the source peer' do
+          subject.status
+          assert_requested(:get, /example/) do |req|
+            expect(req.headers).to include('User-Agent' => 'ServiceA')
+          end
+        end
+      end
+
+      context 'without a source peer' do
+        let(:options) { { source_peer: nil } }
+        let(:fetcher) { described_class.new(options) }
+
+        it 'should set the user agent header to the faraday version' do
+          subject.status
+          assert_requested(:get, /example/) do |req|
+            expect(req.headers).to include('User-Agent' => "Faraday v#{Faraday::VERSION}" )
+          end
+        end
+      end
+    end
   end
 
   shared_examples 'a wrappable response' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable