elasticsearch-transport 6.8.3 → 7.0.0.pre

data/lib/elasticsearch/transport/transport/http/manticore.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 'manticore'
 
@@ -67,7 +80,7 @@ module Elasticsearch
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
-          def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
+          def perform_request(method, path, params={}, body=nil, headers=nil)
             super do |connection, url|
               params[:body] = __convert_to_json(body) if body
               params[:headers] = headers if headers

data/lib/elasticsearch/transport/transport/loggable.rb

@@ -0,0 +1,85 @@
+# 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 to encapsulate all logging functionality.
+  #
+  # @since 7.0.0
+  module Loggable
+
+    # Log a debug message.
+    #
+    # @example Log a debug message.
+    #   log_debug('Message')
+    #
+    # @param [ String ] message The message to log.
+    #
+    # @since 7.0.0
+    def log_debug(message)
+      logger.debug(message) if logger && logger.debug?
+    end
+
+    # Log an error message.
+    #
+    # @example Log an error message.
+    #   log_error('Message')
+    #
+    # @param [ String ] message The message to log.
+    #
+    # @since 7.0.0
+    def log_error(message)
+      logger.error(message) if logger && logger.error?
+    end
+
+    # Log a fatal message.
+    #
+    # @example Log a fatal message.
+    #   log_fatal('Message')
+    #
+    # @param [ String ] message The message to log.
+    #
+    # @since 7.0.0
+    def log_fatal(message)
+      logger.fatal(message) if logger && logger.fatal?
+    end
+
+    # Log an info message.
+    #
+    # @example Log an info message.
+    #   log_info('Message')
+    #
+    # @param [ String ] message The message to log.
+    #
+    # @since 7.0.0
+    def log_info(message)
+      logger.info(message) if logger && logger.info?
+    end
+
+    # Log a warn message.
+    #
+    # @example Log a warn message.
+    #   log_warn('Message')
+    #
+    # @param [ String ] message The message to log.
+    #
+    # @since 7.0.0
+    def log_warn(message)
+      logger.warn(message) if logger && logger.warn?
+    end
+  end
+end

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.3'
+    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