elasticsearch-transport 7.17.0 → 7.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fc7f318edc5730a123909637ce8cf74f32c4ddb2c9571e6744b4ad864e5c5d8
-  data.tar.gz: 11549daa6e4586a272f01e64ae56c01a510a57687fc0a06ecec58b35906f21d3
+  metadata.gz: 6ea7420173cd55a8274cf0ca677e18c70b8b0dc03b953a18d6188b00d998ad4d
+  data.tar.gz: 5f4931be00b530844479f5fba66256f69039096d59e452d150743a609193f624
 SHA512:
-  metadata.gz: f5ea6b69fcb79dc9502b057195ef71bd6f60aca21170cae677e92510f01091199391ac38ce081af54fb269fa1600aeee81b586565317eac3065ff308c177f703
-  data.tar.gz: 9274659714937b8505a1a2252da28658900458982b3abe338838dbe8328e5408481351edb10623378a3e6f48cf8ca48a55a14f9739cc7e6e5650627b4a03a587
+  metadata.gz: 1c6a925f6e13374a1e8c7d8a314d55866602debd782717a4d052a5e076a59f0b4320a98e5ba0b9a0f0695dedceca770fa0d911ceff99485803382f51480bed20
+  data.tar.gz: 13e5515c79629637dd1a4e300de065f11f12a7a4027bb0f088e3af1eaaa789f652fa31485d70942af57cd6386217ef65c88936c8d9cf7bb9d5ad254f26500551

data/lib/elasticsearch/transport/transport/base.rb

@@ -18,7 +18,6 @@
 module Elasticsearch
   module Transport
     module Transport
-
       # @abstract Module with common functionality for transport implementations.
       #
       module Base
@@ -431,7 +430,7 @@ module Elasticsearch
         end
 
         def find_value(hash, regex)
-          key_value = hash.find { |k,v| k.to_s.downcase =~ regex }
+          key_value = hash.find { |k, _| k.to_s.downcase =~ regex }
           if key_value
             hash.delete(key_value[0])
             key_value[1]

data/lib/elasticsearch/transport/transport/http/manticore.rb

@@ -62,14 +62,20 @@ module Elasticsearch
         class Manticore
           include Base
 
-          def initialize(arguments={}, &block)
-            @request_options = { headers: (arguments.dig(:transport_options, :headers) || {}) }
+          def initialize(arguments = {}, &block)
+            @request_options = {
+              headers: (
+                arguments.dig(:transport_options, :headers) ||
+                arguments.dig(:options, :transport_options, :headers) ||
+                {}
+              )
+            }
             @manticore = build_client(arguments[:options] || {})
             super(arguments, &block)
           end
 
           # Should just be run once at startup
-          def build_client(options={})
+          def build_client(options = {})
             client_options = options[:transport_options] || {}
             client_options[:ssl] = options[:ssl] || {}
 
@@ -88,22 +94,22 @@ module Elasticsearch
 
               params[:body] = body if body
               params[:headers] = headers if headers
-              params = params.merge @request_options
+              params = params.merge(@request_options)
               case method
-              when "GET"
+              when 'GET'
                 resp = connection.connection.get(url, params)
-              when "HEAD"
+              when 'HEAD'
                 resp = connection.connection.head(url, params)
-              when "PUT"
+              when 'PUT'
                 resp = connection.connection.put(url, params)
-              when "POST"
+              when 'POST'
                 resp = connection.connection.post(url, params)
-              when "DELETE"
+              when 'DELETE'
                 resp = connection.connection.delete(url, params)
               else
                 raise ArgumentError.new "Method #{method} not supported"
               end
-              Response.new resp.code, resp.read_body, resp.headers
+              Response.new(resp.code, resp.read_body, resp.headers)
             end
           end
 
@@ -113,23 +119,21 @@ module Elasticsearch
           # @return [Connections::Collection]
           #
           def __build_connections
-            apply_headers(@request_options, options[:transport_options])
-            apply_headers(@request_options, options)
+            apply_headers(options)
 
-            Connections::Collection.new \
-              :connections => hosts.map { |host|
-                host[:protocol]   = host[:scheme] || DEFAULT_PROTOCOL
-                host[:port]     ||= DEFAULT_PORT
+            Connections::Collection.new(
+              connections: hosts.map do |host|
+                host[:protocol] = host[:scheme] || DEFAULT_PROTOCOL
+                host[:port] ||= DEFAULT_PORT
 
                 host.delete(:user)     # auth is not supported here.
                 host.delete(:password) # use the headers
 
-                Connections::Connection.new \
-                  :host => host,
-                  :connection => @manticore
-              },
-              :selector_class => options[:selector_class],
-              :selector => options[:selector]
+                Connections::Connection.new(host: host, connection: @manticore)
+              end,
+              selector_class: options[:selector_class],
+              selector: options[:selector]
+            )
           end
 
           # Closes all connections by marking them as dead
@@ -157,16 +161,16 @@ module Elasticsearch
 
           private
 
-          def apply_headers(request_options, options)
-            headers = options&.[](:headers) || {}
+          def apply_headers(options)
+            headers = options[:headers] || options.dig(:transport_options, :headers) || {}
             headers[CONTENT_TYPE_STR] = find_value(headers, CONTENT_TYPE_REGEX) || DEFAULT_CONTENT_TYPE
-            headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || user_agent_header
+            headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || find_value(@request_options[:headers], USER_AGENT_REGEX) || user_agent_header
             headers[ACCEPT_ENCODING] = GZIP if use_compression?
-            request_options[:headers].merge!(headers)
+            @request_options[:headers].merge!(headers)
           end
 
           def user_agent_header
-            @user_agent ||= begin
+            @user_agent_header ||= begin
               meta = ["RUBY_VERSION: #{JRUBY_VERSION}"]
               if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
                 meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"

data/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = '7.17.0'.freeze
+    VERSION = '7.17.1'.freeze
   end
 end

data/test/unit/transport_manticore_test.rb

@@ -206,29 +206,8 @@ if JRUBY
                 }
 
                 ::Manticore::Client.expects(:new).with(options)
-                transport = Manticore.new hosts: [{ host: 'foobar', port: 1234 }], options: options
-              end
-
-              should 'allow custom headers' do
-                transport_options = { headers: { 'Authorization' => 'Basic token' } }
-                transport = Manticore.new(
-                  hosts: [{ host: 'foobar', port: 1234 }],
-                  transport_options: transport_options
-                )
-
-                assert_equal(
-                  transport.instance_variable_get(:@request_options)[:headers]['Authorization'],
-                  'Basic token'
-                )
-                transport.connections.first.connection
-                  .expects(:get)
-                  .with do |_host, _options|
-                  assert_equal('Basic token', _options[:headers]['Authorization'])
-                  true
-                end
-                  .returns(stub_everything)
-
-                transport.perform_request('GET', '/', {})
+                transport = Manticore.new(hosts: [{ host: 'foobar', port: 1234 }], options: options)
+                assert_equal(transport.options[:ssl][:truststore_password], 'test')
               end
 
               should 'pass :transport_options to Manticore::Client' do
@@ -238,6 +217,45 @@ if JRUBY
 
                 ::Manticore::Client.expects(:new).with(potatoes: 1, ssl: {})
                 transport = Manticore.new(hosts: [{ host: 'foobar', port: 1234 }], options: options)
+                assert_equal(transport.options[:transport_options][:potatoes], 1)
+              end
+
+              context 'custom headers' do
+                should 'allow authorization headers' do
+                  transport_options = { headers: { 'Authorization' => 'Basic token' } }
+                  transport = Manticore.new(
+                    hosts: [{ host: 'foobar', port: 1234 }],
+                    transport_options: transport_options
+                  )
+
+                  assert_equal(
+                    transport.instance_variable_get(:@request_options)[:headers]['Authorization'],
+                    'Basic token'
+                  )
+                  transport.connections.first.connection.expects(:get).with do |_host, options|
+                    assert_equal('Basic token', options[:headers]['Authorization'])
+                    true
+                  end.returns(stub_everything)
+                  transport.perform_request('GET', '/', {})
+                end
+
+                should 'allow user agent headers' do
+                  transport_options = { headers: { 'User-Agent' => 'Custom UA' } }
+                  transport = Manticore.new(
+                    hosts: [{ host: 'localhost' }],
+                    transport_options: transport_options
+                  )
+                  transport.connections.first.connection.expects(:get).with do |_host, options|
+                    assert_equal('Custom UA', options[:headers]['User-Agent'])
+                    true
+                  end.returns(stub_everything)
+                  transport.perform_request('GET', '/', {})
+
+                  assert_equal(
+                    transport.instance_variable_get('@request_options')[:headers]['User-Agent'],
+                    'Custom UA'
+                  )
+                end
               end
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.17.0
+  version: 7.17.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.