elasticsearch-transport 6.8.2 → 7.0.0.pre

data/lib/elasticsearch/transport/transport/response.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.
 
 module Elasticsearch
   module Transport

data/lib/elasticsearch/transport/transport/serializer/multi_json.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.
 
 module Elasticsearch
   module Transport

data/lib/elasticsearch/transport/transport/sniffer.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.
 
 module Elasticsearch
   module Transport
@@ -32,8 +45,7 @@ module Elasticsearch
         #
         def hosts
           Timeout::timeout(timeout, SnifferTimeoutError) do
-            nodes = transport.perform_request('GET', '_nodes/http', {}, nil, nil,
-                                              reload_on_failure: false).body
+            nodes = transport.perform_request('GET', '_nodes/http').body
 
             hosts = nodes['nodes'].map do |id, info|
               if info[PROTOCOL]

data/lib/elasticsearch/transport/version.rb

@@ -1,9 +1,22 @@
-# 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.
 
 module Elasticsearch
   module Transport
-    VERSION = '6.8.2'
+    VERSION = "7.0.0.pre"
   end
 end

data/spec/elasticsearch/transport/base_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
@@ -22,8 +18,11 @@
 require 'spec_helper'
 
 describe Elasticsearch::Transport::Transport::Base do
+
   context 'when a host is printed in a logged message' do
+
     shared_examples_for 'a redacted string' do
+
       let(:client) do
         Elasticsearch::Transport::Client.new(arguments)
       end
@@ -34,7 +33,6 @@ describe Elasticsearch::Transport::Transport::Base do
 
       it 'does not include the password in the logged string' do
         expect(logger).not_to receive(:error).with(/secret_password/)
-
         expect {
           client.cluster.stats
         }.to raise_exception(Faraday::ConnectionFailed)
@@ -49,6 +47,7 @@ describe Elasticsearch::Transport::Transport::Base do
     end
 
     context 'when the user and password are provided as separate arguments' do
+
       let(:arguments) do
         { hosts: 'fake',
           logger: logger,
@@ -60,8 +59,9 @@ describe Elasticsearch::Transport::Transport::Base do
     end
 
     context 'when the user and password are provided in the string URI' do
+
       let(:arguments) do
-        { hosts: 'https://test:secret_password@fake_local_elasticsearch',
+        { hosts: 'http://test:secret_password@fake.com',
           logger: logger }
       end
 
@@ -69,192 +69,13 @@ describe Elasticsearch::Transport::Transport::Base do
     end
 
     context 'when the user and password are provided in the URI object' do
+
       let(:arguments) do
-        { hosts: URI.parse('https://test:secret_password@fake_local_elasticsearch'),
+        { hosts: URI.parse('http://test:secret_password@fake.com'),
           logger: logger }
       end
 
       it_behaves_like 'a redacted string'
     end
   end
-
-  context 'when reload_on_failure is true and and hosts are unreachable' do
-
-    let(:client) do
-      Elasticsearch::Transport::Client.new(arguments)
-    end
-
-    let(:arguments) do
-      {
-          hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-          reload_on_failure: true,
-          sniffer_timeout: 5
-      }
-    end
-
-    it 'raises an exception' do
-      expect {
-        client.info
-      }.to raise_exception(Faraday::ConnectionFailed)
-    end
-  end
-
-  context 'when the client has `retry_on_failure` set to an integer' do
-
-    let(:client) do
-      Elasticsearch::Transport::Client.new(arguments)
-    end
-
-    let(:arguments) do
-      {
-          hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-          retry_on_failure: 2
-      }
-    end
-
-    context 'when `perform_request` is called without a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(3).times.and_call_original
-      end
-
-      it 'uses the client `retry_on_failure` value' do
-        expect {
-          client.transport.perform_request('GET', '/info')
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-
-    context 'when `perform_request` is called with a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(6).times.and_call_original
-      end
-
-      it 'uses the option `retry_on_failure` value' do
-        expect {
-          client.transport.perform_request('GET', '/info', {}, nil, nil, retry_on_failure: 5)
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-  end
-
-  context 'when the client has `retry_on_failure` set to true' do
-
-    let(:client) do
-      Elasticsearch::Transport::Client.new(arguments)
-    end
-
-    let(:arguments) do
-      {
-          hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-          retry_on_failure: true
-      }
-    end
-
-    context 'when `perform_request` is called without a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(4).times.and_call_original
-      end
-
-      it 'uses the default `MAX_RETRIES` value' do
-        expect {
-          client.transport.perform_request('GET', '/info')
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-
-    context 'when `perform_request` is called with a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(6).times.and_call_original
-      end
-
-      it 'uses the option `retry_on_failure` value' do
-        expect {
-          client.transport.perform_request('GET', '/info', {}, nil, nil, retry_on_failure: 5)
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-  end
-
-  context 'when the client has `retry_on_failure` set to false' do
-
-    let(:client) do
-      Elasticsearch::Transport::Client.new(arguments)
-    end
-
-    let(:arguments) do
-      {
-          hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-          retry_on_failure: false
-      }
-    end
-
-    context 'when `perform_request` is called without a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).once.and_call_original
-      end
-
-      it 'does not retry' do
-        expect {
-          client.transport.perform_request('GET', '/info')
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-
-    context 'when `perform_request` is called with a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(6).times.and_call_original
-      end
-
-      it 'uses the option `retry_on_failure` value' do
-        expect {
-          client.transport.perform_request('GET', '/info', {}, nil, nil, retry_on_failure: 5)
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-  end
-
-  context 'when the client has no `retry_on_failure` set' do
-
-    let(:client) do
-      Elasticsearch::Transport::Client.new(arguments)
-    end
-
-    let(:arguments) do
-      {
-          hosts: ['http://unavailable:9200', 'http://unavailable:9201'],
-      }
-    end
-
-    context 'when `perform_request` is called without a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(1).times.and_call_original
-      end
-
-      it 'does not retry' do
-        expect {
-          client.transport.perform_request('GET', '/info')
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-
-    context 'when `perform_request` is called with a `retry_on_failure` option value' do
-
-      before do
-        expect(client.transport).to receive(:get_connection).exactly(6).times.and_call_original
-      end
-
-      it 'uses the option `retry_on_failure` value' do
-        expect {
-          client.transport.perform_request('GET', '/info', {}, nil, nil, retry_on_failure: 5)
-        }.to raise_exception(Faraday::ConnectionFailed)
-      end
-    end
-  end
 end

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,87 +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
+        client.transport.connections.all.first.connection.builder.handlers
       end
 
       it 'uses Faraday NetHttp' do
-        expect(adapter).to eq Faraday::Adapter::NetHttp
+        expect(adapter).to include(Faraday::Adapter::NetHttp)
       end
     end
 
     context 'when the adapter is specified' do
 
       let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
-
-      let(:client) do
-        described_class.new(adapter: :patron)
-      end
-
-      it 'uses Faraday with the adapter' do
-        expect(adapter).to eq Faraday::Adapter::Patron
-      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)
+        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
 
@@ -141,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
 
@@ -153,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
@@ -675,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|
@@ -727,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
@@ -749,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
 
@@ -789,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
@@ -804,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
@@ -854,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
 
@@ -877,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
 
@@ -888,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
@@ -910,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
@@ -1003,12 +907,12 @@ describe Elasticsearch::Transport::Client do
           { adapter: :patron }
         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::Patron')
+          expect(connection_handler).to eq('Faraday::Adapter::Patron')
         end
 
         it 'keeps connections open' do
@@ -1022,4 +926,4 @@ describe Elasticsearch::Transport::Client do
       end
     end
   end
-end
+end