elasticsearch-transport 6.8.3 → 7.0.0.pre

data/spec/elasticsearch/transport/client_spec.rb

@@ -1,7 +1,3 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
-
 # 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
@@ -49,99 +45,31 @@ describe Elasticsearch::Transport::Client do
     expect(client.transport.hosts[0][:host]).to eq('localhost')
   end
 
-  context 'when an encoded api_key is provided' do
-    let(:client) do
-      described_class.new(api_key: 'an_api_key')
-    end
-    let(:authorization_header) do
-      client.transport.connections.first.connection.headers['Authorization']
-    end
-
-    it 'Adds the ApiKey header to the connection' do
-      expect(authorization_header).to eq('ApiKey an_api_key')
-    end
-  end
-
-  context 'when an un-encoded api_key is provided' do
-    let(:client) do
-      described_class.new(api_key: { id: 'my_id', api_key: 'my_api_key' })
-    end
-    let(:authorization_header) do
-      client.transport.connections.first.connection.headers['Authorization']
-    end
-
-    it 'Adds the ApiKey header to the connection' do
-      expect(authorization_header).to eq("ApiKey #{Base64.strict_encode64('my_id:my_api_key')}")
-    end
-  end
-
-  context 'when basic auth and api_key are provided' do
-    let(:client) do
-      described_class.new(
-        api_key: { id: 'my_id', api_key: 'my_api_key' },
-        host: 'http://elastic:password@localhost:9200'
-      )
-    end
-    let(:authorization_header) do
-      client.transport.connections.first.connection.headers['Authorization']
-    end
-
-    it 'removes basic auth credentials' do
-      expect(authorization_header).not_to match(/^Basic/)
-      expect(authorization_header).to match(/^ApiKey/)
-    end
-  end
-
   describe 'adapter' do
-    context 'when no adapter is specified' do
-      let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
 
-      it 'uses Faraday NetHttp' do
-        expect(adapter).to eq Faraday::Adapter::NetHttp
-      end
-    end
+    context 'when no adapter is specified' do
 
-    context 'when the adapter is patron' do
       let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
-
-      let(:client) do
-        described_class.new(adapter: :patron, enable_meta_header: false)
+        client.transport.connections.all.first.connection.builder.handlers
       end
 
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
+      it 'uses Faraday NetHttp' do
+        expect(adapter).to include(Faraday::Adapter::NetHttp)
       end
     end
 
-    context 'when the adapter is typhoeus' do
-      let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
-
-      let(:client) do
-        described_class.new(adapter: :typhoeus, enable_meta_header: false)
-      end
+    context 'when the adapter is specified' do
 
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Typhoeus
-      end
-    end
-
-    context 'when the adapter is specified as a string key' do
       let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
+        client.transport.connections.all.first.connection.builder.handlers
       end
 
       let(:client) do
-        described_class.new('adapter' => :patron, enable_meta_header: false)
+        described_class.new(adapter: :typhoeus)
       end
 
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
+      it 'uses Faraday' do
+        expect(adapter).to include(Faraday::Adapter::Typhoeus)
       end
     end
 
@@ -153,11 +81,11 @@ describe Elasticsearch::Transport::Client do
       end
 
       let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
+        client.transport.connections.all.first.connection.builder.handlers
       end
 
       it 'uses the detected adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
+        expect(adapter).to include(Faraday::Adapter::Patron)
       end
     end
 
@@ -165,21 +93,17 @@ describe Elasticsearch::Transport::Client do
 
       let(:client) do
         described_class.new do |faraday|
-          faraday.adapter :patron
+          faraday.adapter :typhoeus
           faraday.response :logger
         end
       end
 
-      let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
-
       let(:handlers) do
         client.transport.connections.all.first.connection.builder.handlers
       end
 
       it 'sets the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
+        expect(handlers).to include(Faraday::Adapter::Typhoeus)
       end
 
       it 'sets the logger' do
@@ -230,6 +154,7 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when credentials are specified' do
+
         let(:host) do
           'http://USERNAME:PASSWORD@myhost:8080'
         end
@@ -686,43 +611,10 @@ describe Elasticsearch::Transport::Client do
         expect(request).to be(true)
       end
     end
-
-    context 'when x-opaque-id is set' do
-      let(:client) { described_class.new(host: hosts) }
-
-      it 'uses x-opaque-id on a request' do
-        expect(client.perform_request('GET', '/', { opaque_id: '12345' }).headers['x-opaque-id']).to eq('12345')
-      end
-    end
-
-    context 'when an x-opaque-id prefix is set on initialization' do
-      let(:prefix) { 'elastic_cloud' }
-      let(:client) do
-        described_class.new(host: hosts, opaque_id_prefix: prefix)
-      end
-
-      it 'uses x-opaque-id on a request' do
-        expect(client.perform_request('GET', '/', { opaque_id: '12345' }).headers['x-opaque-id']).to eq("#{prefix}12345")
-      end
-
-      context 'when using an API call' do
-        let(:client) { described_class.new(host: hosts) }
-
-        it 'doesnae raise an ArgumentError' do
-          expect { client.search(opaque_id: 'no_error') }.not_to raise_error
-        end
-
-        it 'uses X-Opaque-Id in the header' do
-          allow(client).to receive(:perform_request) { OpenStruct.new(body: '') }
-          expect { client.search(opaque_id: 'opaque_id') }.not_to raise_error
-          expect(client).to have_received(:perform_request)
-            .with('GET', '_search', { opaque_id: 'opaque_id' }, nil)
-        end
-      end
-    end
   end
 
   context 'when the client connects to Elasticsearch' do
+
     let(:logger) do
       Logger.new(STDERR).tap do |logger|
         logger.formatter = proc do |severity, datetime, progname, msg|
@@ -738,7 +630,7 @@ describe Elasticsearch::Transport::Client do
     end
 
     let(:port) do
-      (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
+      TEST_PORT
     end
 
     let(:transport_options) do
@@ -760,7 +652,7 @@ describe Elasticsearch::Transport::Client do
       end
 
       it 'connects to the cluster' do
-        expect(response.body['number_of_nodes']).to be >(1)
+        expect(response.body['number_of_nodes']).to be >= (1)
       end
     end
 
@@ -800,14 +692,15 @@ describe Elasticsearch::Transport::Client do
         end
 
         context 'when the Faraday adapter is set in the block' do
+
           let(:client) do
             Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
               client.adapter(:net_http_persistent)
             end
           end
 
-          let(:handler_name) do
-            client.transport.connections.first.connection.builder.adapter.name
+          let(:connection_handler) do
+            client.transport.connections.first.connection.builder.handlers.first
           end
 
           let(:response) do
@@ -815,7 +708,7 @@ describe Elasticsearch::Transport::Client do
           end
 
           it 'sets the adapter' do
-            expect(handler_name).to eq('Faraday::Adapter::NetHttpPersistent')
+            expect(connection_handler.name).to eq('Faraday::Adapter::NetHttpPersistent')
           end
 
           it 'uses the adapter to connect' do
@@ -865,7 +758,7 @@ describe Elasticsearch::Transport::Client do
           expect(client.perform_request('GET', '_nodes/_local'))
           expect {
             client.perform_request('GET', '_nodes/_local')
-          }.to raise_exception(Faraday::ConnectionFailed)
+          }.to raise_exception(Faraday::Error::ConnectionFailed)
         end
       end
 
@@ -888,7 +781,7 @@ describe Elasticsearch::Transport::Client do
         it 'reloads the connections' do
           expect(client.transport.connections.size).to eq(3)
           expect(responses.all? { true }).to be(true)
-          expect(client.transport.connections.size).to eq(2)
+          expect(client.transport.connections.size).to be >= (1)
         end
       end
 
@@ -899,7 +792,7 @@ describe Elasticsearch::Transport::Client do
         end
 
         let(:logger) do
-          double('logger', :fatal => false)
+          double('logger', :debug? => false, :warn? => true, :fatal? => false, :error? => false)
         end
 
         before do
@@ -921,7 +814,7 @@ describe Elasticsearch::Transport::Client do
         before do
           client.perform_request('DELETE', '_all')
           client.perform_request('DELETE', 'myindex') rescue
-              client.perform_request('PUT', 'myindex', {}, { settings: { number_of_shards: 10 } })
+          client.perform_request('PUT', 'myindex', {}, { settings: { number_of_shards: 2, number_of_replicas: 0 } })
           client.perform_request('PUT', 'myindex/mydoc/1', { routing: 'XYZ', timeout: '1s' }, { foo: 'bar' })
           client.perform_request('GET', '_cluster/health?wait_for_status=green', {})
         end
@@ -1014,39 +907,12 @@ describe Elasticsearch::Transport::Client do
           { adapter: :patron }
         end
 
-        let(:adapter) do
-          client.transport.connections.first.connection.builder.adapter
-        end
-
-        it 'uses the patron connection handler' do
-          expect(adapter).to eq('Faraday::Adapter::Patron')
-        end
-
-        it 'keeps connections open' do
-          response = client.perform_request('GET', '_nodes/stats/http')
-          connections_before = response.body['nodes'].values.find { |n| n['name'] == node_names.first }['http']['total_opened']
-          client.transport.reload_connections!
-          response = client.perform_request('GET', '_nodes/stats/http')
-          connections_after = response.body['nodes'].values.find { |n| n['name'] == node_names.first }['http']['total_opened']
-          expect(connections_after).to be >= (connections_before)
-        end
-      end
-
-      context 'when typhoeus is used as an adapter', unless: jruby? do
-        before do
-          require 'typhoeus'
-        end
-
-        let(:options) do
-          { adapter: :typhoeus }
-        end
-
-        let(:adapter) do
-          client.transport.connections.first.connection.builder.adapter
+        let(:connection_handler) do
+          client.transport.connections.first.connection.builder.handlers.first
         end
 
         it 'uses the patron connection handler' do
-          expect(adapter).to eq('Faraday::Adapter::Typhoeus')
+          expect(connection_handler).to eq('Faraday::Adapter::Patron')
         end
 
         it 'keeps connections open' do
@@ -1060,4 +926,4 @@ describe Elasticsearch::Transport::Client do
       end
     end
   end
-end
+end

data/spec/elasticsearch/transport/sniffer_spec.rb

@@ -229,6 +229,25 @@ describe Elasticsearch::Transport::Transport::Sniffer do
       it 'correctly parses the port' do
         expect(hosts[0][:port]).to eq('9250')
       end
+
+      context 'when the address is IPv6' do
+
+        let(:publish_address) do
+          'example.com/[::1]:9250'
+        end
+
+        it 'parses the response' do
+          expect(hosts.size).to eq(1)
+        end
+
+        it 'uses the hostname' do
+          expect(hosts[0][:host]).to eq('example.com')
+        end
+
+        it 'correctly parses the port' do
+          expect(hosts[0][:port]).to eq('9250')
+        end
+      end
     end
 
     context 'when the address is IPv6' do

data/spec/spec_helper.rb

@@ -1,20 +1,9 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
-
 require 'elasticsearch'
 require 'elasticsearch-transport'
 require 'logger'
 require 'ansi/code'
 require 'hashie/mash'
 require 'pry-nav'
-if defined?(JRUBY_VERSION)
-  require 'elasticsearch/transport/transport/http/manticore'
-  require 'pry-nav'
-else
-  require 'elasticsearch/transport/transport/http/curb'
-  require 'curb'
-end
 
 # The hosts to use for creating a elasticsearch client.
 #
@@ -25,6 +14,8 @@ ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOS
                         end
                       end.freeze
 
+TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
+
 # Are we testing on JRuby?
 #
 # @return [ true, false ] Whether JRuby is being used.

data/test/integration/transport_test.rb

@@ -1,6 +1,19 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
+# 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'
 
@@ -52,7 +65,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       require 'elasticsearch/transport/transport/http/curb'
 
       transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ]  do |curl|
+        :hosts => [ { host: @host, port: @port } ] do |curl|
           curl.verbose = true
         end
 
@@ -65,7 +78,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       require 'elasticsearch/transport/transport/http/curb'
 
       transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ]  do |curl|
+        :hosts => [ { host: @host, port: @port } ] do |curl|
           curl.verbose = true
         end
 

data/test/profile/client_benchmark_test.rb

@@ -1,6 +1,19 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
+# 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'