elastic-transport 8.0.0.pre1 → 8.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5f7efa80056792b4d863e1011b652c677df5083db1d328a336e4951e5f66bbb
-  data.tar.gz: ade02810dfcc55b6f48f769019851d51f30018c3dc9b7eb2f95d380e91d9a2aa
+  metadata.gz: e2c04c9ca950389cb71ceda4d1fe1c7e4266c844ed95c73fd3b7815ea28c6134
+  data.tar.gz: 07deccf3f9278235cb4989cfaada2be0e271d21615f72fac8eeaab00e81058c6
 SHA512:
-  metadata.gz: 964cfda300084d06334b4876a0a8f9e50f1f2242e34abc9708b2c771c39ea86846e068d1d9b3fd730ea92ba405d1f2b01cc2856d0ce8c6af65e6b4beb55bd90c
-  data.tar.gz: c1f4b6b9f53bd72d272a041fb2578ff893cf6ddf91bcd3ec52a8c2b5ecdd4929f640fab783bce65ad4458f8914628bf8839476b9dfa846bd9e024125cd21d6a7
+  metadata.gz: 3e27a172d2fa106208b210fd4ab1cdd1bc76f6ef49e4b7aefae6a6a525dd650478e21c1e173335733c703f0119ec5e3935fdd0f46eb477573ae6cbceccc2ff34
+  data.tar.gz: a4cf7f2a840c75a43a6ed74d15f04fcab1c780fa9a2250892af38ca206c3eaa021f8548ed5a53f1339bb344bf41bc2225a92ed077ef227fdecd33d882b43f32e

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 8.0.0
+## 8.0.0.pre2
+
+- Fixes tracing for Manticore [commit](https://github.com/elastic/elastic-transport-ruby/commit/98c81d19de4fee394f9c1a5079a1892ec951e0f9).
+- Implements CA Fingerprinting [pull request](https://github.com/elastic/elastic-transport-ruby/pull/13)
+- Adds `delay_on_retry` to wait between each failed connection, thanks @DinoPullerUqido! [commit](https://github.com/elastic/elastic-transport-ruby/commit/c2f8311409ca63a293588cb7eea5a0c672dbd436)
+- Fixes compression, thanks @johnnyshields! [commit](https://github.com/elastic/elastic-transport-ruby/commit/8b326d643f76f037075500e19bbe096b2c298099)
+
+## 8.0.0.pre1
 
 - Library renamed from [`elasticsearch-transport`](https://github.com/elastic/elasticsearch-ruby/tree/7.x/elasticsearch-transport) to `elastic-transport` and promoted to its own repository.
 

data/Rakefile

@@ -55,7 +55,6 @@ namespace :test do
   end
 end
 
-
 namespace :docker do
   desc <<~DOC
     Start Elasticsearch in a Docker container. Credentials are 'elastic:changeme'.

data/lib/elastic/transport/client.rb

@@ -86,6 +86,8 @@ module Elastic
       #
       # @option arguments [Boolean,Number] :retry_on_failure   Retry X times when request fails before raising and
       #                                                        exception (false by default)
+      # @option arguments [Number] :delay_on_retry  Delay in milliseconds between each retry (0 by default)
+      #
       # @option arguments Array<Number> :retry_on_status Retry when specific status codes are returned
       #
       # @option arguments [Boolean] :reload_on_failure Reload connections after failure (false by default)
@@ -115,6 +117,7 @@ module Elastic
       #
       # @option enable_meta_header [Boolean] :enable_meta_header Enable sending the meta data header to Cloud.
       #                                                          (Default: true)
+      # @option ca_fingerprint [String] :ca_fingerprint provide this value to only trust certificates that are signed by a specific CA certificate
       #
       # @yield [faraday] Access and configure the `Faraday::Connection` instance directly with a block
       #
@@ -125,6 +128,7 @@ module Elastic
         @arguments[:tracer] ||= @arguments[:trace] ? DEFAULT_TRACER.call() : nil
         @arguments[:reload_connections] ||= false
         @arguments[:retry_on_failure]   ||= false
+        @arguments[:delay_on_retry]     ||= 0
         @arguments[:reload_on_failure]  ||= false
         @arguments[:randomize_hosts]    ||= false
         @arguments[:transport_options]  ||= {}
@@ -140,6 +144,7 @@ module Elastic
                                    DEFAULT_HOST)
 
         @send_get_body_as = @arguments[:send_get_body_as] || 'GET'
+        @ca_fingerprint = @arguments.delete(:ca_fingerprint)
 
         if @arguments[:request_timeout]
           @arguments[:transport_options][:request] = { timeout: @arguments[:request_timeout] }
@@ -167,11 +172,45 @@ module Elastic
       #
       def perform_request(method, path, params = {}, body = nil, headers = nil)
         method = @send_get_body_as if 'GET' == method && body
+        validate_ca_fingerprints if @ca_fingerprint
         transport.perform_request(method, path, params, body, headers)
       end
 
       private
 
+      def validate_ca_fingerprints
+        transport.connections.connections.each do |connection|
+          unless connection.host[:scheme] == 'https'
+            raise Elastic::Transport::Transport::Error, 'CA fingerprinting can\'t be configured over http'
+          end
+
+          next if connection.verified
+
+          ctx = OpenSSL::SSL::SSLContext.new
+          socket = TCPSocket.new(connection.host[:host], connection.host[:port])
+          ssl = OpenSSL::SSL::SSLSocket.new(socket, ctx)
+          ssl.connect
+          cert_store = ssl.peer_cert_chain
+          matching_certs = cert_store.select do |cert|
+            OpenSSL::Digest::SHA256.hexdigest(cert.to_der).upcase == @ca_fingerprint.gsub(':', '').upcase
+          end
+          if matching_certs.empty?
+            raise Elastic::Transport::Transport::Error,
+                  'Server certificate CA fingerprint does not match the value configured in ca_fingerprint'
+          end
+
+          connection.verified = true
+        end
+      end
+
+      def add_header(header)
+        headers = @arguments[:transport_options]&.[](:headers) || {}
+        headers.merge!(header)
+        @arguments[:transport_options].merge!(
+          headers: headers
+        )
+      end
+
       def add_header(header)
         headers = @arguments[:transport_options]&.[](:headers) || {}
         headers.merge!(header)

data/lib/elastic/transport/transport/base.rb

@@ -53,6 +53,7 @@ module Elastic
           @options     = arguments[:options] || {}
           @options[:http] ||= {}
           @options[:retry_on_status] ||= []
+          @options[:delay_on_retry]  ||= 0
 
           @block       = block
           @compression = !!@options[:compression]
@@ -232,7 +233,7 @@ module Elastic
         # @api private
         #
         def __convert_to_json(o=nil, options={})
-          o = o.is_a?(String) ? o : serializer.dump(o, options)
+          o.is_a?(String) ? o : serializer.dump(o, options)
         end
 
         # Returns a full URL based on information from host
@@ -273,6 +274,7 @@ module Elastic
           start = Time.now
           tries = 0
           reload_on_failure = opts.fetch(:reload_on_failure, @options[:reload_on_failure])
+          delay_on_retry = opts.fetch(:delay_on_retry, @options[:delay_on_retry])
 
           max_retries = if opts.key?(:retry_on_failure)
             opts[:retry_on_failure] === true ? DEFAULT_MAX_RETRIES : opts[:retry_on_failure]
@@ -281,10 +283,10 @@ module Elastic
           end
 
           params = params.clone
-
           ignore = Array(params.delete(:ignore)).compact.map { |s| s.to_i }
 
           begin
+            sleep(delay_on_retry / 1000.0) if tries > 0
             tries     += 1
             connection = get_connection or raise Error.new('Cannot get new connection from pool.')
 
@@ -293,14 +295,11 @@ module Elastic
             end
 
             url      = connection.full_url(path, params)
-
             response = block.call(connection, url)
-
             connection.healthy! if connection.failures > 0
 
             # Raise an exception so we can catch it for `retry_on_status`
             __raise_transport_error(response) if response.status.to_i >= 300 && @retry_on_status.include?(response.status.to_i)
-
           rescue Elastic::Transport::Transport::ServerError => e
             if response && @retry_on_status.include?(response.status)
               log_warn "[#{e.class}] Attempt #{tries} to get response from #{url}"
@@ -313,7 +312,6 @@ module Elastic
             else
               raise e
             end
-
           rescue *host_unreachable_exceptions => e
             log_error "[#{e.class}] #{e.message} #{connection.host.inspect}"
 
@@ -335,37 +333,27 @@ module Elastic
             else
               raise e
             end
-
           rescue Exception => e
             log_fatal "[#{e.class}] #{e.message} (#{connection.host.inspect if connection})"
             raise e
-
           end #/begin
 
           duration = Time.now - start
 
           if response.status.to_i >= 300
-            __log_response    method, path, params, body, url, response, nil, 'N/A', duration
-            __trace  method, path, params, connection.connection.headers, body, url, response, nil, 'N/A', duration if tracer
+            __log_response(method, path, params, body, url, response, nil, 'N/A', duration)
+            __trace(method, path, params, connection_headers(connection), body, url, response, nil, 'N/A', duration) if tracer
 
             # Log the failure only when `ignore` doesn't match the response status
-            unless ignore.include?(response.status.to_i)
-              log_fatal "[#{response.status}] #{response.body}"
-            end
-
+            log_fatal("[#{response.status}] #{response.body}") unless ignore.include?(response.status.to_i)
             __raise_transport_error response unless ignore.include?(response.status.to_i)
           end
 
           json     = serializer.load(response.body) if response.body && !response.body.empty? && response.headers && response.headers["content-type"] =~ /json/
           took     = (json['took'] ? sprintf('%.3fs', json['took']/1000.0) : 'n/a') rescue 'n/a'
-
-          unless ignore.include?(response.status.to_i)
-            __log_response   method, path, params, body, url, response, json, took, duration
-          end
-
-          __trace  method, path, params, connection.connection.headers, body, url, response, nil, 'N/A', duration if tracer
-
-          warnings(response.headers['warning']) if response.headers&.[]('warning')
+          __log_response(method, path, params, body, url, response, json, took, duration) unless ignore.include?(response.status.to_i)
+          __trace(method, path, params, connection_headers(connection), body, url, response, nil, 'N/A', duration) if tracer
+          log_warn(response.headers['warning']) if response.headers&.[]('warning')
 
           Response.new response.status, json || response.body, response.headers
         ensure
@@ -385,17 +373,38 @@ module Elastic
 
         USER_AGENT_STR = 'User-Agent'.freeze
         USER_AGENT_REGEX = /user\-?\_?agent/
+        ACCEPT_ENCODING = 'Accept-Encoding'.freeze
+        CONTENT_ENCODING = 'Content-Encoding'.freeze
         CONTENT_TYPE_STR = 'Content-Type'.freeze
         CONTENT_TYPE_REGEX = /content\-?\_?type/
         DEFAULT_CONTENT_TYPE = 'application/json'.freeze
         GZIP = 'gzip'.freeze
-        ACCEPT_ENCODING = 'Accept-Encoding'.freeze
         GZIP_FIRST_TWO_BYTES = '1f8b'.freeze
         HEX_STRING_DIRECTIVE = 'H*'.freeze
         RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
 
+        def compress_request(body, headers)
+          if body
+            headers ||= {}
+
+            if gzipped?(body)
+              headers[CONTENT_ENCODING] = GZIP
+            elsif use_compression?
+              headers[CONTENT_ENCODING] = GZIP
+              gzip = Zlib::GzipWriter.new(StringIO.new)
+              gzip << body
+              body = gzip.close.string
+            else
+              headers.delete(CONTENT_ENCODING)
+            end
+          elsif headers
+            headers.delete(CONTENT_ENCODING)
+          end
+
+          [body, headers]
+        end
+
         def decompress_response(body)
-          return body unless use_compression?
           return body unless gzipped?(body)
 
           io = StringIO.new(body)
@@ -408,6 +417,8 @@ module Elastic
         end
 
         def gzipped?(body)
+          return unless body && !body.empty?
+
           body[0..1].unpack(HEX_STRING_DIRECTIVE)[0] == GZIP_FIRST_TWO_BYTES
         end
 
@@ -441,8 +452,12 @@ module Elastic
           end
         end
 
-        def warnings(warning)
-          warn("warning: #{warning}")
+        def connection_headers(connection)
+          if defined?(Elastic::Transport::Transport::HTTP::Manticore) && self.class == Elastic::Transport::Transport::HTTP::Manticore
+            @request_options[:headers]
+          else
+            connection.connection.headers
+          end
         end
       end
     end

data/lib/elastic/transport/transport/connections/connection.rb

@@ -33,6 +33,7 @@ module Elastic
           DEFAULT_RESURRECT_TIMEOUT = 60
 
           attr_reader :host, :connection, :options, :failures, :dead_since
+          attr_accessor :verified
 
           # @option arguments [Hash]   :host       Host information (example: `{host: 'localhost', port: 9200}`)
           # @option arguments [Object] :connection The transport-specific physical connection or "session"
@@ -42,6 +43,7 @@ module Elastic
             @host       = arguments[:host].is_a?(Hash) ? Redacted.new(arguments[:host]) : arguments[:host]
             @connection = arguments[:connection]
             @options    = arguments[:options] || {}
+            @verified   = false
             @state_mutex = Mutex.new
 
             @options[:resurrect_timeout] ||= DEFAULT_RESURRECT_TIMEOUT

data/lib/elastic/transport/transport/http/curb.rb

@@ -25,23 +25,23 @@ module Elastic
         #
         class Curb
           include Base
-
           # Performs the request by invoking {Transport::Base#perform_request} with a block.
           #
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
           def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
-            super do |connection, url|
+            super do |connection, _url|
               connection.connection.url = connection.full_url(path, params)
+              body = body ? __convert_to_json(body) : nil
+              body, headers = compress_request(body, headers)
 
               case method
                 when 'HEAD'
                   connection.connection.set :nobody, true
                 when 'GET', 'POST', 'PUT', 'DELETE'
                   connection.connection.set :nobody, false
-
-                  connection.connection.put_data = __convert_to_json(body) if body
+                  connection.connection.put_data = body if body
 
                   if headers
                     if connection.connection.headers

data/lib/elastic/transport/transport/http/faraday.rb

@@ -43,11 +43,15 @@ module Elastic
                         else
                           headers
                         end
+              body = body ? __convert_to_json(body) : nil
+              body, headers = compress_request(body, headers)
 
-              response = connection.connection.run_request(method.downcase.to_sym,
-                                                           url,
-                                                           ( body ? __convert_to_json(body) : nil ),
-                                                           headers)
+              response = connection.connection.run_request(
+                method.downcase.to_sym,
+                url,
+                body,
+                headers
+              )
 
               Response.new response.status, decompress_response(response.body), response.headers
             end
@@ -60,7 +64,7 @@ module Elastic
           def __build_connection(host, options={}, block=nil)
             client = ::Faraday.new(__full_url(host), options, &block)
             apply_headers(client, options)
-            Connections::Connection.new :host => host, :connection => client
+            Connections::Connection.new(host: host, connection: client)
           end
 
           # Returns an array of implementation specific connection errors.

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

@@ -83,7 +83,10 @@ module Elastic
           #
           def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
             super do |connection, url|
-              params[:body] = __convert_to_json(body) if body
+              body = body ? __convert_to_json(body) : nil
+              body, headers = compress_request(body, @request_options[:headers])
+
+              params[:body] = body if body
               params[:headers] = headers if headers
               params = params.merge @request_options
               case method

data/lib/elastic/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elastic
   module Transport
-    VERSION = '8.0.0.pre1'.freeze
+    VERSION = '8.0.0.pre2'.freeze
   end
 end

data/lib/elastic/transport.rb

@@ -20,6 +20,7 @@ require 'multi_json'
 require 'time'
 require 'timeout'
 require 'uri'
+require 'zlib'
 
 require 'elastic/transport/transport/loggable'
 require 'elastic/transport/transport/serializer/multi_json'

data/spec/{elasticsearch → elastic}/transport/client_spec.rb

@@ -1172,28 +1172,19 @@ describe Elastic::Transport::Client do
     end
 
     context 'when Elasticsearch response includes a warning header' do
+      let(:logger) { double('logger', warn: '', warn?: '', info?: '', info: '', debug?: '', debug: '') }
       let(:client) do
-        Elastic::Transport::Client.new(hosts: hosts)
+        Elastic::Transport::Client.new(hosts: hosts, logger: logger)
       end
 
       let(:warning) { 'Elasticsearch warning: "deprecation warning"' }
 
       it 'prints a warning' do
-        allow_any_instance_of(Elastic::Transport::Transport::Response).to receive(:headers) do
-          { 'warning' => warning }
-        end
-
-        begin
-          stderr      = $stderr
-          fake_stderr = StringIO.new
-          $stderr     = fake_stderr
-
-          client.perform_request('GET', '/')
-          fake_stderr.rewind
-          expect(fake_stderr.string).to eq("warning: #{warning}\n")
-        ensure
-          $stderr = stderr
+        expect_any_instance_of(Faraday::Connection).to receive(:run_request) do
+          Elastic::Transport::Transport::Response.new(200, {}, { 'warning' => warning })
         end
+        client.perform_request('GET', '/')
+        expect(logger).to have_received(:warn).with(warning)
       end
     end
   end
@@ -1337,6 +1328,29 @@ describe Elastic::Transport::Client do
         end
       end
 
+      context 'when retry_on_failure is true and delay_on_retry is specified' do
+        context 'when a node is unreachable' do
+          let(:hosts) do
+            [ELASTICSEARCH_HOSTS.first, "foobar1", "foobar2"]
+          end
+
+          let(:options) do
+            { retry_on_failure: true, delay_on_retry: 3000 }
+          end
+
+          let(:responses) do
+            5.times.collect do
+              client.perform_request('GET', '_nodes/_local')
+            end
+          end
+
+          it 'retries on failure' do
+            allow_any_instance_of(Object).to receive(:sleep).with(3000 / 1000)
+            expect(responses.all? { true }).to be(true)
+          end
+        end
+      end
+
       context 'when reload_on_failure is true' do
         let(:hosts) do
           [ELASTICSEARCH_HOSTS.first, 'foobar1', 'foobar2']
@@ -1391,7 +1405,7 @@ describe Elastic::Transport::Client do
             end
 
             it 'sets the Accept-Encoding header' do
-              expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+              expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
             end
 
             it 'preserves the other headers' do
@@ -1409,7 +1423,7 @@ describe Elastic::Transport::Client do
             end
 
             it 'sets the Accept-Encoding header' do
-              expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+              expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
             end
 
             it 'preserves the other headers' do
@@ -1427,7 +1441,7 @@ describe Elastic::Transport::Client do
             end
 
             it 'sets the Accept-Encoding header' do
-              expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+              expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
             end
 
             it 'preserves the other headers' do
@@ -1445,7 +1459,7 @@ describe Elastic::Transport::Client do
             end
 
             it 'sets the Accept-Encoding header' do
-              expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+              expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
             end
 
             it 'preserves the other headers' do
@@ -1463,7 +1477,7 @@ describe Elastic::Transport::Client do
             end
 
             it 'sets the Accept-Encoding header' do
-              expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+              expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
             end
 
             it 'preserves the other headers' do
@@ -1485,7 +1499,7 @@ describe Elastic::Transport::Client do
         end
 
         it 'sets the Accept-Encoding header' do
-          expect(client.transport.connections[0].connection.headers['Accept-Encoding'])
+          expect(client.transport.connections[0].connection.headers['Accept-Encoding']).to eq 'gzip'
         end
 
         it 'preserves the other headers' do
@@ -1648,4 +1662,71 @@ describe Elastic::Transport::Client do
       end
     end
   end
+
+  context 'CA Fingerprinting' do
+    context 'when setting a ca_fingerprint' do
+      let(:certificate) do
+        system(
+          'openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=BE/O=Test/CN=Test"' \
+          ' -keyout certificate.key -out certificate.crt',
+          err: File::NULL
+        )
+        OpenSSL::X509::Certificate.new File.read('./certificate.crt')
+      end
+
+      let(:client) do
+        Elastic::Transport::Client.new(
+          host: 'https://elastic:changeme@localhost:9200',
+          ca_fingerprint: OpenSSL::Digest::SHA256.hexdigest(certificate.to_der)
+        )
+      end
+
+      it 'validates CA fingerprints on perform request' do
+        expect(client.transport.connections.connections.map(&:verified).uniq).to eq [false]
+        allow(client.transport).to receive(:perform_request) { 'Hello' }
+
+        server = double('server').as_null_object
+        allow(TCPSocket).to receive(:new) { server }
+        socket = double('socket')
+        allow(OpenSSL::SSL::SSLSocket).to receive(:new) { socket }
+        allow(socket).to receive(:connect) { nil }
+        allow(socket).to receive(:peer_cert_chain) { [certificate] }
+
+        response = client.perform_request('GET', '/')
+        expect(client.transport.connections.connections.map(&:verified).uniq).to eq [true]
+        expect(response).to eq 'Hello'
+      end
+    end
+
+    context 'when using an http host' do
+      let(:client) do
+        Elastic::Transport::Client.new(
+          host: 'http://elastic:changeme@localhost:9200',
+          ca_fingerprint: 'test'
+        )
+      end
+
+      it 'raises an error' do
+        expect do
+          client.perform_request('GET', '/')
+        end.to raise_exception(Elastic::Transport::Transport::Error)
+      end
+    end
+
+    context 'when not setting a ca_fingerprint' do
+      let(:client) do
+        Elastic::Transport::Client.new(
+          host: 'http://elastic:changeme@localhost:9200'
+        )
+      end
+
+      it 'has unvalidated connections' do
+        allow(client).to receive(:validate_ca_fingerprints) { nil }
+        allow(client.transport).to receive(:perform_request) { nil }
+
+        client.perform_request('GET', '/')
+        expect(client).to_not have_received(:validate_ca_fingerprints)
+      end
+    end
+  end
 end

data/spec/elastic/transport/http/curb_spec.rb

@@ -0,0 +1,126 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+unless defined?(JRUBY_VERSION)
+  require_relative '../../../spec_helper'
+
+  describe Elastic::Transport::Transport::HTTP::Curb do
+    let(:client) do
+      Elastic::Transport::Client.new(transport_class: described_class)
+    end
+
+    describe '#perform_request' do
+      subject(:perform_request) { client.perform_request(*args) }
+      let(:args) do
+        ['POST', '/', {}, body, headers]
+      end
+      let(:body) { '{"foo":"bar"}' }
+      let(:headers) { { 'Content-Type' => 'application/x-ndjson' } }
+
+      before do
+        allow_any_instance_of(Curl::Easy).to receive(:http).and_return(true)
+      end
+
+      it 'convert body to json' do
+        expect(client.transport).to receive(:__convert_to_json).with(body)
+        perform_request
+      end
+
+      it 'call compress_request' do
+        expect(client.transport).to receive(:compress_request).with(body, headers)
+        perform_request
+      end
+
+      it 'return response' do
+        expect(perform_request).to be_kind_of(Elastic::Transport::Transport::Response)
+      end
+
+      it 'put body' do
+        expect(client.transport.connections.first.connection).to receive('put_data=').with(body)
+        perform_request
+      end
+
+      context 'when body nil' do
+        let(:body) { nil }
+
+        it 'convert body to json' do
+          expect(client.transport).not_to receive(:__convert_to_json)
+          perform_request
+        end
+
+        it 'call compress_request' do
+          expect(client.transport).to receive(:compress_request).with(body, headers)
+          perform_request
+        end
+
+        it 'put body' do
+          expect(client.transport.connections.first.connection).not_to receive('put_data=')
+          perform_request
+        end
+      end
+
+      context 'when body is hash' do
+        let(:body) { { foo: 'bar' } }
+        let(:body_string) { '{"foo":"bar"}' }
+
+        it 'convert body to json' do
+          expect(client.transport).to receive(:__convert_to_json).with(body)
+          perform_request
+        end
+
+        it 'call compress_request' do
+          expect(client.transport).to receive(:compress_request).with(body_string, headers)
+          perform_request
+        end
+
+        it 'put body' do
+          expect(client.transport.connections.first.connection).to receive('put_data=').with(body_string)
+          perform_request
+        end
+      end
+
+      context 'when compression enabled' do
+        let(:client) do
+          Elastic::Transport::Client.new(transport_class: described_class, compression: true)
+        end
+        let(:body_string) { '{"foo":"bar"}' }
+        let(:compressed_body) do
+          gzip = Zlib::GzipWriter.new(StringIO.new)
+          gzip << body_string
+          gzip.close.string
+        end
+
+        before { allow(client.transport).to receive(:decompress_response).and_return('') }
+
+        it 'put compressed body' do
+          expect(client.transport.connections.first.connection).to receive('put_data=').with(compressed_body)
+          perform_request
+        end
+
+        it 'set Content-Encoding header' do
+          perform_request
+          expect(client.transport.connections.first.connection.headers).to include('Content-Encoding')
+        end
+
+        it 'set Content-Encoding to gzip' do
+          perform_request
+          expect(client.transport.connections.first.connection.headers['Content-Encoding']).to eql('gzip')
+        end
+      end
+    end
+  end
+end

data/spec/elastic/transport/http/faraday_spec.rb

@@ -0,0 +1,141 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../../../spec_helper'
+
+describe Elastic::Transport::Transport::HTTP::Faraday do
+  let(:client) do
+    Elastic::Transport::Client.new(transport_class: described_class)
+  end
+
+  describe '#perform_request' do
+    subject(:perform_request) { client.perform_request(*args) }
+    let(:args) do
+      ['POST', '/', {}, body, headers]
+    end
+    let(:body) { '{"foo":"bar"}' }
+    let(:headers) { { 'Content-Type' => 'application/x-ndjson' } }
+    let(:response) { instance_double('Faraday::Response', status: 200, body: '', headers: headers) }
+    let(:expected_headers) do
+      client.transport.connections.first.connection.headers.merge(headers)
+    end
+
+    before do
+      allow_any_instance_of(Faraday::Connection).to receive(:run_request).and_return(response)
+    end
+
+    it 'convert body to json' do
+      expect(client.transport).to receive(:__convert_to_json).with(body)
+      perform_request
+    end
+
+    it 'call compress_request' do
+      expect(client.transport).to receive(:compress_request).with(body, expected_headers)
+      perform_request
+    end
+
+    it 'return response' do
+      expect(perform_request).to be_kind_of(Elastic::Transport::Transport::Response)
+    end
+
+    it 'run body with preper params' do
+      expect(
+        client.transport.connections.first.connection
+      ).to receive(:run_request).with(:post, 'http://localhost:9200/', body, expected_headers).and_return(response)
+      perform_request
+    end
+
+    context 'when body nil' do
+      let(:body) { nil }
+      let(:request_params) { [:post, 'http://localhost:9200/', body, expected_headers] }
+
+      it 'convert body to json' do
+        expect(client.transport).not_to receive(:__convert_to_json)
+        perform_request
+      end
+
+      it 'call compress_request' do
+        expect(client.transport).to receive(:compress_request).with(body, expected_headers)
+        perform_request
+      end
+
+      it 'run body with preper params' do
+        expect(
+          client.transport.connections.first.connection
+        ).to receive(:run_request).with(*request_params).and_return(response)
+        perform_request
+      end
+    end
+
+    context 'when body is hash' do
+      let(:body) { { foo: 'bar' } }
+      let(:body_string) { '{"foo":"bar"}' }
+      let(:request_params) { [:post, 'http://localhost:9200/', body_string, expected_headers] }
+
+      it 'convert body to json' do
+        expect(client.transport).to receive(:__convert_to_json).with(body)
+        perform_request
+      end
+
+      it 'call compress_request' do
+        expect(client.transport).to receive(:compress_request).with(body_string, expected_headers)
+        perform_request
+      end
+
+      it 'run body with preper params' do
+        expect(
+          client.transport.connections.first.connection
+        ).to receive(:run_request).with(*request_params).and_return(response)
+        perform_request
+      end
+    end
+
+    context 'when compression enabled' do
+      let(:client) do
+        Elastic::Transport::Client.new(transport_class: described_class, compression: true)
+      end
+      let(:body_string) { '{"foo":"bar"}' }
+      let(:expected_headers) { super().merge({ 'Content-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip' }) }
+      let(:request_params) { [:post, 'http://localhost:9200/', compressed_body, expected_headers] }
+      let(:compressed_body) do
+        gzip = Zlib::GzipWriter.new(StringIO.new)
+        gzip << body_string
+        gzip.close.string
+      end
+
+      it 'run body with preper params' do
+        expect(
+          client.transport.connections.first.connection
+        ).to receive(:run_request).with(*request_params).and_return(response)
+        perform_request
+      end
+
+      context 'when client makes second request with nil boby' do
+        before { perform_request }
+
+        it 'remove Content-Encoding header' do
+          expected_headers.delete('Content-Encoding')
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:run_request).with(:post, 'http://localhost:9200/', nil, expected_headers)
+                                    .and_return(response)
+          client.perform_request('POST', '/', {}, nil, headers)
+        end
+      end
+    end
+  end
+end

data/spec/elastic/transport/http/manticore_spec.rb

@@ -0,0 +1,146 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+if defined?(JRUBY_VERSION)
+  require_relative '../../../spec_helper'
+
+  describe Elastic::Transport::Transport::HTTP::Manticore do
+    let(:client) do
+      Elastic::Transport::Client.new(transport_class: described_class)
+    end
+
+    describe '#perform_request' do
+      subject(:perform_request) { client.perform_request(*args) }
+      let(:args) do
+        ['POST', '/', {}, body, headers]
+      end
+      let(:body) { '{"foo":"bar"}' }
+      let(:headers) { { 'Content-Type' => 'application/json' } }
+      let(:response) { instance_double('Manticore::Response', code: 200, read_body: '', headers: headers) }
+      let(:expected_headers) do
+        client.transport.instance_variable_get('@request_options')[:headers].merge(headers)
+      end
+
+      before do
+        allow_any_instance_of(Manticore::Client).to receive(:post).and_return(response)
+      end
+
+      it 'convert body to json' do
+        expect(client.transport).to receive(:__convert_to_json).with(body)
+        perform_request
+      end
+
+      it 'call compress_request' do
+        expect(client.transport).to receive(:compress_request).with(body, expected_headers)
+        perform_request
+      end
+
+      it 'return response' do
+        expect(perform_request).to be_kind_of(Elastic::Transport::Transport::Response)
+      end
+
+      it 'run body with preper params' do
+        expect(
+          client.transport.connections.first.connection
+        ).to receive(:post).with(
+          'http://localhost:9200/',
+          { body: body, headers: expected_headers }
+        ).and_return(response)
+        perform_request
+      end
+
+      context 'when body nil' do
+        let(:body) { nil }
+        let(:request_params) { ['http://localhost:9200/', { body: body, headers: expected_headers }] }
+
+        it 'convert body to json' do
+          expect(client.transport).not_to receive(:__convert_to_json)
+          perform_request
+        end
+
+        it 'call compress_request' do
+          expect(client.transport).to receive(:compress_request).with(body, expected_headers)
+          perform_request
+        end
+
+        it 'run body with preper params' do
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:post).with('http://localhost:9200/', { headers: expected_headers }).and_return(response)
+          perform_request
+        end
+      end
+
+      context 'when body is hash' do
+        let(:body) { { foo: 'bar' } }
+        let(:body_string) { '{"foo":"bar"}' }
+        let(:request_params) { ['http://localhost:9200/', { body: body_string, headers: expected_headers }] }
+
+        it 'convert body to json' do
+          expect(client.transport).to receive(:__convert_to_json).with(body)
+          perform_request
+        end
+
+        it 'call compress_request' do
+          expect(client.transport).to receive(:compress_request).with(body_string, expected_headers)
+          perform_request
+        end
+
+        it 'run body with preper params' do
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:post).with(*request_params).and_return(response)
+          perform_request
+        end
+      end
+
+      context 'when compression enabled' do
+        let(:client) do
+          Elastic::Transport::Client.new(transport_class: described_class, compression: true)
+        end
+        let(:body_string) { '{"foo":"bar"}' }
+        let(:expected_headers) { super().merge({ 'Content-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip' }) }
+        let(:request_params) { ['http://localhost:9200/', { body: compressed_body, headers: expected_headers }] }
+        let(:compressed_body) do
+          gzip = Zlib::GzipWriter.new(StringIO.new)
+          gzip << body_string
+          gzip.close.string
+        end
+
+        it 'run body with preper params' do
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:post).with(*request_params).and_return(response)
+          perform_request
+        end
+
+        context 'when client makes second request with nil boby' do
+          before { perform_request }
+
+          it 'remove Content-Encoding header' do
+            expected_headers.delete('Content-Encoding')
+            expect(
+              client.transport.connections.first.connection
+            ).to receive(:post).with('http://localhost:9200/', { headers: expected_headers })
+                               .and_return(response)
+            client.perform_request('POST', '/', {}, nil, headers)
+          end
+        end
+      end
+    end
+  end
+end

data/test/integration/jruby_test.rb

@@ -0,0 +1,46 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+if JRUBY
+  require 'elastic/transport/transport/http/manticore'
+
+  class Elastic::Transport::ClientManticoreIntegrationTest < Minitest::Test
+    context "Transport" do
+      setup do
+        uri = URI(HOST)
+        @host = {
+          host: uri.host,
+          port: uri.port,
+          user: uri.user,
+          password: uri.password
+        }
+      end
+
+      should 'allow to customize the Faraday adapter to Manticore' do
+        client = Elastic::Transport::Client.new(
+          transport_class: Elastic::Transport::Transport::HTTP::Manticore,
+          trace: true,
+          hosts: [@host]
+        )
+        response = client.perform_request 'GET', ''
+        assert_respond_to(response.body, :to_hash)
+      end
+    end
+  end
+end

data/test/integration/transport_test.rb

@@ -93,6 +93,6 @@ class Elastic::Transport::ClientIntegrationTest < Minitest::Test
       assert_respond_to(response.body, :to_hash)
       assert_not_nil response.body['name']
       assert_equal 'application/json', response.headers['content-type']
-    end unless JRUBY
+    end unless jruby?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre1
+  version: 8.0.0.pre2
 platform: ruby
 authors:
 - Karel Minarik
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -347,13 +347,17 @@ files:
 - lib/elastic/transport/transport/serializer/multi_json.rb
 - lib/elastic/transport/transport/sniffer.rb
 - lib/elastic/transport/version.rb
-- spec/elasticsearch/connections/collection_spec.rb
-- spec/elasticsearch/connections/selector_spec.rb
-- spec/elasticsearch/transport/base_spec.rb
-- spec/elasticsearch/transport/client_spec.rb
-- spec/elasticsearch/transport/meta_header_spec.rb
-- spec/elasticsearch/transport/sniffer_spec.rb
+- spec/elastic/connections/collection_spec.rb
+- spec/elastic/connections/selector_spec.rb
+- spec/elastic/transport/base_spec.rb
+- spec/elastic/transport/client_spec.rb
+- spec/elastic/transport/http/curb_spec.rb
+- spec/elastic/transport/http/faraday_spec.rb
+- spec/elastic/transport/http/manticore_spec.rb
+- spec/elastic/transport/meta_header_spec.rb
+- spec/elastic/transport/sniffer_spec.rb
 - spec/spec_helper.rb
+- test/integration/jruby_test.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
@@ -393,13 +397,17 @@ signing_key:
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
 test_files:
-- spec/elasticsearch/connections/collection_spec.rb
-- spec/elasticsearch/connections/selector_spec.rb
-- spec/elasticsearch/transport/base_spec.rb
-- spec/elasticsearch/transport/client_spec.rb
-- spec/elasticsearch/transport/meta_header_spec.rb
-- spec/elasticsearch/transport/sniffer_spec.rb
+- spec/elastic/connections/collection_spec.rb
+- spec/elastic/connections/selector_spec.rb
+- spec/elastic/transport/base_spec.rb
+- spec/elastic/transport/client_spec.rb
+- spec/elastic/transport/http/curb_spec.rb
+- spec/elastic/transport/http/faraday_spec.rb
+- spec/elastic/transport/http/manticore_spec.rb
+- spec/elastic/transport/meta_header_spec.rb
+- spec/elastic/transport/sniffer_spec.rb
 - spec/spec_helper.rb
+- test/integration/jruby_test.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb