Separate es-ruby client v8 availibility with a method.

Author: mashhurs

spec/filters/elasticsearch_spec.rb

@@ -60,16 +60,17 @@
         allow(plugin).to receive(:get_client).and_return(filter_client)
         allow(filter_client).to receive(:serverless?).and_return(true)
         allow(filter_client).to receive(:client).and_return(es_client)
-        begin
-        allow(es_client).to receive(:info)
-                              .with(a_hash_including(
-                                      :headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
-                              .and_raise(Elasticsearch::Transport::Transport::Errors::BadRequest.new)
-        rescue NameError # we get NameError: uninitialized constant Elasticsearch::Transport with 7.x
+
+        if elastic_ruby_v8_client_available?
           allow(es_client).to receive(:info)
                                 .with(a_hash_including(
                                         :headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
                                 .and_raise(Elastic::Transport::Transport::Errors::BadRequest.new)
+        else
+          allow(es_client).to receive(:info)
+                                .with(a_hash_including(
+                                        :headers => LogStash::Filters::ElasticsearchClient::DEFAULT_EAV_HEADER))
+                                .and_raise(Elasticsearch::Transport::Transport::Errors::BadRequest.new)
         end
       end
 
@@ -111,12 +112,10 @@
 
     before(:each) do
       allow(LogStash::Filters::ElasticsearchClient).to receive(:new).and_return(client)
-      begin
-        require "elasticsearch/transport/transport/http/manticore"
-        allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
-      rescue LoadError
-        require "elastic/transport/transport/http/manticore"
+      if elastic_ruby_v8_client_available?
         allow(client).to receive(:es_transport_client_type).and_return('elastic_transport')
+      else
+        allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
       end
       allow(client).to receive(:search).and_return(response)
       allow(plugin).to receive(:test_connection!)
@@ -362,11 +361,10 @@
 
       before do
         allow(plugin).to receive(:get_client).and_return(client_double)
-        begin
-          require "elasticsearch/transport/transport/http/manticore"
-          allow(client_double).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
-        rescue LoadError
+        if elastic_ruby_v8_client_available?
           allow(client_double).to receive(:es_transport_client_type).and_return('elastic_transport')
+        else
+          allow(client_double).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
         end
         allow(client_double).to receive(:client).and_return(transport_double)
       end
@@ -527,12 +525,11 @@ def wait_receive_request
       # this spec is a safeguard to trigger an assessment of thread-safety should
       # we choose a different transport adapter in the future.
       transport_class = extract_transport(client).options.fetch(:transport_class)
-      begin
-        ::Elasticsearch::Transport::Transport::HTTP::Manticore
-        expect(transport_class).to equal ::Elasticsearch::Transport::Transport::HTTP::Manticore
-      rescue NameError
+      if elastic_ruby_v8_client_available?
         allow(client).to receive(:es_transport_client_type).and_return("elastic_transport")
         expect(transport_class).to equal ::Elastic::Transport::Transport::HTTP::Manticore
+      else
+        expect(transport_class).to equal ::Elasticsearch::Transport::Transport::HTTP::Manticore
       end
     end
 
@@ -848,11 +845,10 @@ def wait_receive_request
 
     before(:each) do
       allow(LogStash::Filters::ElasticsearchClient).to receive(:new).and_return(client)
-      begin
-        require "elasticsearch/transport/transport/http/manticore"
-        allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
-      rescue LoadError
+      if elastic_ruby_v8_client_available?
         allow(client).to receive(:es_transport_client_type).and_return('elastic_transport')
+      else
+        allow(client).to receive(:es_transport_client_type).and_return('elasticsearch_transport')
       end
       allow(plugin).to receive(:test_connection!)
       allow(plugin).to receive(:setup_serverless)
@@ -868,11 +864,19 @@ def wait_receive_request
     end
   end
 
-  # @note can be removed once gem depends on elasticsearch >= 6.x
-  def extract_transport(client) # on >7.x client.transport is a ES::Transport::Client
+  def extract_transport(client)
+    # on 7x: client.transport.transport
+    # on >=8.x: client.transport
     client.transport.respond_to?(:transport) ? client.transport.transport : client.transport
   end
 
+  def elastic_ruby_v8_client_available?
+    Elasticsearch::Transport
+    false
+  rescue NameError # NameError: uninitialized constant Elasticsearch::Transport if Elastic Ruby client is not available
+    true
+  end
+
   class MockResponse
     attr_reader :code, :headers