[GEM] Updates elasticsearch gem for elastic-transport

Author: picandocodigo

elasticsearch/Gemfile

@@ -23,7 +23,3 @@ gemspec
 if File.exist? File.expand_path('../../elasticsearch-api/elasticsearch-api.gemspec', __FILE__)
   gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __FILE__), require: false
 end
-
-if File.exist? File.expand_path('../../elasticsearch-transport/elasticsearch-transport.gemspec', __FILE__)
-  gem 'elasticsearch-transport', path: File.expand_path('../../elasticsearch-transport', __FILE__), require: false
-end

elasticsearch/elasticsearch.gemspec

@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'elasticsearch-transport', '8.0.0'
-  s.add_dependency 'elasticsearch-api',       '8.0.0'
+  s.add_dependency 'elastic-transport', '8.0.0.pre1'
+  s.add_dependency 'elasticsearch-api', '8.0.0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'byebug' unless defined?(JRUBY_VERSION) || defined?(Rubinius)

elasticsearch/lib/elasticsearch.rb

@@ -16,7 +16,7 @@
 # under the License.
 
 require 'elasticsearch/version'
-require 'elasticsearch/transport'
+require 'elastic/transport'
 require 'elasticsearch/api'
 
 module Elasticsearch
@@ -48,7 +48,7 @@ def initialize(arguments = {}, &block)
           arguments[:port]
         )
       end
-      @transport = Elasticsearch::Transport::Client.new(arguments, &block)
+      @transport = Elastic::Transport::Client.new(arguments, &block)
     end
 
     def method_missing(name, *args, &block)

elasticsearch/spec/integration/client_integration_spec.rb

@@ -26,7 +26,9 @@
   let(:client) do
     Elasticsearch::Client.new(
       host: ELASTICSEARCH_URL,
-      logger: logger
+      logger: logger,
+      user: 'elastic',
+      password: 'changeme'
     )
   end
 

elasticsearch/spec/unit/api_key_spec.rb

@@ -76,9 +76,9 @@
       let(:adapter_code) { "nh=#{defined?(Net::HTTP::VERSION) ? Net::HTTP::VERSION : Net::HTTP::HTTPVersion}" }
       let(:meta_header) do
         if jruby?
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
+          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
         else
-          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
+          "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},fd=#{Faraday::VERSION},#{adapter_code}"
         end
       end
 

elasticsearch/spec/unit/custom_transport_implementation_spec.rb

@@ -19,7 +19,7 @@
 describe Elasticsearch::Client do
   context 'when using custom transport implementation' do
     class MyTransport
-      include Elasticsearch::Transport::Transport::Base
+      include Elastic::Transport::Transport::Base
       def initialize(args); end
     end
     let(:client) { Elasticsearch::Client.new(transport_class: MyTransport) }
@@ -30,9 +30,9 @@ def initialize(args); end
 
     let(:meta_header) do
       if jruby?
-        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
+        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
       else
-        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION}"
+        "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elastic::Transport::VERSION}"
       end
     end