Fix Faraday removed basic auth option and apply the ES client module name change.

Author: mashhurs

logstash-core/spec/logstash/webserver_spec.rb

@@ -191,7 +191,7 @@ def free_ports(servers)
     context "and invalid basic auth is provided" do
       it 'emits an HTTP 401 with WWW-Authenticate header' do
         response = Faraday.new("http://#{api_host}:#{webserver.port}") do |conn|
-          conn.request :basic_auth, 'john-doe', 'open-sesame'
+          conn.request :authorization, :basic, 'john-doe', 'open-sesame'
         end.get('/')
         aggregate_failures do
           expect(response.status).to eq(401)
@@ -202,7 +202,7 @@ def free_ports(servers)
     context "and valid auth is provided" do
       it "returns a relevant response" do
         response = Faraday.new("http://#{api_host}:#{webserver.port}") do |conn|
-          conn.request :basic_auth, 'a-user', 's3cur3dPas!'
+          conn.request :authorization, :basic, 'a-user', 's3cur3dPas!'
         end.get('/')
         aggregate_failures do
           expect(response.status).to eq(200)

qa/integration/specs/dlq_spec.rb

@@ -83,10 +83,10 @@
       try(60) do
         begin
           result = es_client.search(index: 'test-index', size: 0, q: '*')
-        rescue Elasticsearch::Transport::Transport::Errors::ServiceUnavailable => e
+        rescue Elastic::Transport::Transport::Errors::ServiceUnavailable => e
           puts "Elasticsearch unavailable #{e.inspect}"
           hits = 0
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        rescue Elastic::Transport::Transport::Errors::NotFound => e
           puts "Index not found"
           hits = 0
         end

x-pack/qa/integration/management/multiple_pipelines_spec.rb

@@ -138,7 +138,7 @@ def count_hashes(pipelines)
 
     begin
       res = elasticsearch_client.search(index: '.monitoring-logstash-*', body: query)
-    rescue Elasticsearch::Transport::Transport::Errors::ServiceUnavailable
+    rescue Elastic::Transport::Transport::Errors::ServiceUnavailable
       return nil
     end
 

x-pack/qa/integration/monitoring/es_documents_structure_validation_spec.rb

@@ -19,8 +19,8 @@
   let(:retryable_errors) do
     [NoMethodError,
      RSpec::Expectations::ExpectationNotMetError,
-     Elasticsearch::Transport::Transport::Errors::ServiceUnavailable,
-     Elasticsearch::Transport::Transport::Errors::NotFound]
+     Elastic::Transport::Transport::Errors::ServiceUnavailable,
+     Elastic::Transport::Transport::Errors::NotFound]
   end
 
   describe "metrics" do

x-pack/qa/integration/support/helpers.rb

@@ -124,7 +124,7 @@ def cleanup_system_indices(pipeline_ids)
     pipeline_ids.each do |id|
       begin
         elasticsearch_client.perform_request(:delete, "_logstash/pipeline/#{id}")
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+      rescue Elastic::Transport::Transport::Errors::NotFound => e
         puts ".logstash can be empty #{e.message}"
       end
     end

x-pack/qa/integration/support/shared_examples.rb

@@ -9,8 +9,8 @@
   let(:retryable_errors) do
     [NoMethodError,
      RSpec::Expectations::ExpectationNotMetError,
-     Elasticsearch::Transport::Transport::Errors::ServiceUnavailable,
-     Elasticsearch::Transport::Transport::Errors::NotFound]
+     Elastic::Transport::Transport::Errors::ServiceUnavailable,
+     Elastic::Transport::Transport::Errors::NotFound]
   end
 
   describe "metrics" do