elasticsearch-transport 7.13.3 → 7.16.0

data/spec/elasticsearch/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 Elasticsearch::Transport::Transport::HTTP::Faraday do
+  let(:client) do
+    Elasticsearch::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(Elasticsearch::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
+        Elasticsearch::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/elasticsearch/transport/http/manticore_spec.rb

@@ -0,0 +1,143 @@
+# 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 Elasticsearch::Transport::Transport::HTTP::Manticore do
+    let(:client) do
+      Elasticsearch::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(Elasticsearch::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
+          Elasticsearch::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/spec/elasticsearch/transport/meta_header_spec.rb

@@ -16,6 +16,7 @@
 # under the License.
 
 require 'spec_helper'
+require 'elasticsearch'
 
 describe Elasticsearch::Transport::Client do
   context 'meta-header' do
@@ -109,11 +110,17 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :net_http_persistent }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},np=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(Net::HTTP::Persistent)
+          if was_required
+            @klass = Net::HTTP::Persistent.clone
+            Net::HTTP.send(:remove_const, :Persistent)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},np=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          Net::HTTP::Persistent = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
@@ -128,15 +135,22 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :httpclient }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},hc=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(HTTPClient)
+          if was_required
+            @klass = HTTPClient.clone
+            Object.send(:remove_const, :HTTPClient)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},hc=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          HTTPClient = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
           require 'httpclient'
+
           expect(headers['x-elastic-client-meta']).to match(regexp)
           meta = "#{meta_header},hc=#{HTTPClient::VERSION}"
           expect(headers).to include('x-elastic-client-meta' => meta)
@@ -147,11 +161,17 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :typhoeus }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},ty=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(Typhoeus)
+          if was_required
+            @klass = Typhoeus.clone
+            Object.send(:remove_const, :Typhoeus)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},ty=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          Typhoeus = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
@@ -167,11 +187,17 @@ describe Elasticsearch::Transport::Client do
 
         context 'using patron without requiring it' do
           it 'sets adapter in the meta header version to 0 when not loaded' do
-            fork {
-              expect(headers['x-elastic-client-meta']).to match(regexp)
-              meta = "#{meta_header},pt=0"
-              expect(headers).to include('x-elastic-client-meta' => meta)
-            }
+            was_required = defined?(Patron)
+            if was_required
+              @klass = Patron.clone
+              Object.send(:remove_const, :Patron)
+            end
+
+            expect(headers['x-elastic-client-meta']).to match(regexp)
+            meta = "#{meta_header},pt=0"
+            expect(headers).to include('x-elastic-client-meta' => meta)
+
+            Patron = @klass if was_required
           end
         end
 
@@ -206,7 +232,9 @@ describe Elasticsearch::Transport::Client do
     if defined?(JRUBY_VERSION)
       context 'when using manticore' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
         let(:subject) { client.transport.connections.first.connection.instance_variable_get("@options")[:headers]}
 
@@ -218,7 +246,9 @@ describe Elasticsearch::Transport::Client do
     else
       context 'when using curb' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
 
         it 'sets curb in the metaheader' do
@@ -229,12 +259,14 @@ describe Elasticsearch::Transport::Client do
     end
 
     context 'when using custom transport implementation' do
-      class MyTransport
-        include Elasticsearch::Transport::Transport::Base
-        def initialize(args); end
+      let(:transport_class) do
+        Class.new do
+          def initialize(args)
+          end
+        end
       end
-      let(:client) { Elasticsearch::Client.new(transport_class: MyTransport) }
-      let(:subject){ client.instance_variable_get("@arguments")[:transport_options][:headers] }
+      let(:client) { Elasticsearch::Transport::Client.new(transport_class: transport_class) }
+      let(:subject) { client.instance_variable_get('@arguments')[:transport_options][:headers] }
       let(:meta_header) do
         if jruby?
           "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
@@ -254,7 +286,11 @@ describe Elasticsearch::Transport::Client do
         stub_const('Elastic::ELASTICSEARCH_SERVICE_VERSION', [:ent, '8.0.0'])
       end
 
-      let(:client) { Elasticsearch::Client.new }
+      let(:client) do
+        described_class.new.tap do |client|
+          client.instance_variable_set('@verified', true)
+        end
+      end
 
       it 'sets the service version in the metaheader' do
         expect(subject['x-elastic-client-meta']).to match(regexp)

data/spec/spec_helper.rb

@@ -14,8 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+if ENV['COVERAGE'] && ENV['CI'].nil?
+  require 'simplecov'
+  SimpleCov.start { add_filter %r{^/test|spec/} }
+end
 
-require 'elasticsearch'
 require 'elasticsearch-transport'
 require 'logger'
 require 'ansi/code'
@@ -32,10 +35,12 @@ end
 # The hosts to use for creating a elasticsearch client.
 #
 # @since 7.0.0
-ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS']
+ELASTICSEARCH_HOSTS = if (hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS'])
                         hosts.split(',').map do |host|
                           /(http\:\/\/)?(\S+)/.match(host)[2]
                         end
+                      else
+                        ['localhost:9200']
                       end.freeze
 
 TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
@@ -55,7 +60,8 @@ end
 #
 # @since 7.0.0
 def node_names
-  $node_names ||= default_client.nodes.stats['nodes'].collect do |name, stats|
+  node_stats = default_client.perform_request('GET', '_nodes/stats').body
+  $node_names ||= node_stats['nodes'].collect do |name, stats|
     stats['name']
   end
 end
@@ -70,9 +76,7 @@ def default_client
 end
 
 module Config
-
   def self.included(context)
-
     # Get the hosts to use to connect an elasticsearch client.
     #
     # @since 7.0.0

data/test/integration/jruby_test.rb

@@ -0,0 +1,43 @@
+# 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 'elasticsearch/transport/transport/http/manticore'
+
+  class Elasticsearch::Transport::ClientManticoreIntegrationTest < Elasticsearch::Test::IntegrationTestCase
+    context "Transport" do
+      setup do
+        @host, @port = ELASTICSEARCH_HOSTS.first.split(':')
+      end
+
+      shutdown do
+        begin; Object.send(:remove_const, :Manticore); rescue NameError; end
+      end
+
+      should 'allow to customize the Faraday adapter to Manticore' do
+        client = Elasticsearch::Transport::Client.new(
+          transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore,
+          trace: true,
+          hosts: [ { host: @host, port: @port } ]
+        )
+        response = client.perform_request 'GET', ''
+        assert_respond_to(response.body, :to_hash)
+      end
+    end
+  end
+end

data/test/integration/transport_test.rb

@@ -29,6 +29,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
   context "Transport" do
     setup do
       @host, @port = ELASTICSEARCH_HOSTS.first.split(':')
+      @hosts = { hosts: [ { host: @host, port: @port } ] }
       begin; Object.send(:remove_const, :Patron);   rescue NameError; end
     end
 
@@ -36,11 +37,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       require 'typhoeus'
       require 'typhoeus/adapters/faraday'
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-        :hosts => [ { host: @host, port: @port } ] do |f|
-          f.response :logger
-          f.adapter  :typhoeus
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+        f.response :logger
+        f.adapter  :typhoeus
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
@@ -49,8 +49,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     should "allow to customize the Faraday adapter to NetHttpPersistent" do
       require 'net/http/persistent'
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                                                                       :hosts => [ { host: @host, port: @port } ] do |f|
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
         f.response :logger
         f.adapter  :net_http_persistent
       end
@@ -60,13 +59,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     end
 
     should "allow to define connection parameters and pass them" do
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                    :hosts => [ { host: @host, port: @port } ],
-                    :options => { :transport_options => {
-                                    :params => { :format => 'yaml' }
-                                  }
-                                }
-
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(
+        hosts: [ { host: @host, port: @port } ],
+        options: { transport_options: { params: { :format => 'yaml' } } }
+      )
       client = Elasticsearch::Transport::Client.new transport: transport
       response = client.perform_request 'GET', ''
 
@@ -76,24 +72,20 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     should "use the Curb client" do
       require 'curb'
       require 'elasticsearch/transport/transport/http/curb'
-
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+        curl.verbose = true
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
-    end unless JRUBY
+    end unless jruby?
 
     should "deserialize JSON responses in the Curb client" do
       require 'curb'
       require 'elasticsearch/transport/transport/http/curb'
-
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+        curl.verbose = true
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       response = client.perform_request 'GET', ''
@@ -101,7 +93,6 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       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