Updates elasticsearch gem integration tests

Author: picandocodigo

elasticsearch/spec/integration/characters_escaping_spec.rb

@@ -18,51 +18,45 @@
 require 'spec_helper'
 require 'uri'
 
-ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
-
-context 'Elasticsearch client' do
-  let(:client) do
-    Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')
-  end
+context 'Elasticsearch CLIENT' do
   let(:index) { 'tvs' }
 
   after do
-    client.indices.delete(index: index)
+    CLIENT.indices.delete(index: index)
   end
 
   context 'escaping spaces in ids' do
     it 'escapes spaces for id when using index' do
-      response = client.index(index: index, id: 'a test 1', body: { name: 'A test 1' }, refresh: true)
+      response = CLIENT.index(index: index, id: 'a test 1', body: { name: 'A test 1' }, refresh: true)
       expect(response.body['_id']).to eq 'a test 1'
 
-      response = client.search(index: index)
+      response = CLIENT.search(index: index)
       expect(response.body['hits']['hits'].first['_id']).to eq 'a test 1'
 
       # Raises exception, _id is unrecognized
       expect do
-        client.index(index: index, _id: 'a test 2', body: { name: 'A test 2' })
+        CLIENT.index(index: index, _id: 'a test 2', body: { name: 'A test 2' })
       end.to raise_exception Elastic::Transport::Transport::Errors::BadRequest
 
       # Raises exception, id is a query parameter
       expect do
-        client.index(index: index, body: { name: 'A test 3', _id: 'a test 3' })
+        CLIENT.index(index: index, body: { name: 'A test 3', _id: 'a test 3' })
       end.to raise_exception Elastic::Transport::Transport::Errors::BadRequest
     end
 
     it 'escapes spaces for id when using create' do
       # Works with create
-      response = client.create(index: index, id: 'a test 4', body: { name: 'A test 4' })
+      response = CLIENT.create(index: index, id: 'a test 4', body: { name: 'A test 4' })
       expect(response.body['_id']).to eq 'a test 4'
     end
 
     it 'escapes spaces for id when using bulk' do
       body = [
         { create: { _index: index, _id: 'a test 5', data: { name: 'A test 5' } } }
       ]
-      expect(client.bulk(body: body, refresh: true).status).to eq 200
+      expect(CLIENT.bulk(body: body, refresh: true).status).to eq 200
 
-      response = client.search(index: index)
+      response = CLIENT.search(index: index)
       expect(
         response.body['hits']['hits'].select { |a| a['_id'] == 'a test 5' }.size
       ).to eq 1
@@ -71,23 +65,23 @@
 
   context 'it doesnae escape plus signs in id' do
     it 'escapes spaces for id when using index' do
-      response = client.index(index: index, id: 'a+test+1', body: { name: 'A test 1' })
+      response = CLIENT.index(index: index, id: 'a+test+1', body: { name: 'A test 1' })
       expect(response.body['_id']).to eq 'a+test+1'
     end
 
     it 'escapes spaces for id when using create' do
       # Works with create
-      response = client.create(index: index, id: 'a+test+2', body: { name: 'A test 2' })
+      response = CLIENT.create(index: index, id: 'a+test+2', body: { name: 'A test 2' })
       expect(response.body['_id']).to eq 'a+test+2'
     end
 
     it 'escapes spaces for id when using bulk' do
       body = [
         { create: { _index: index, _id: 'a+test+3', data: { name: 'A test 3' } } }
       ]
-      expect(client.bulk(body: body, refresh: true).status).to eq 200
+      expect(CLIENT.bulk(body: body, refresh: true).status).to eq 200
 
-      response = client.search(index: index)
+      response = CLIENT.search(index: index)
       expect(
         response.body['hits']['hits'].select { |a| a['_id'] == 'a+test+3' }.size
       ).to eq 1

elasticsearch/spec/integration/client_integration_spec.rb

@@ -24,40 +24,31 @@
 context 'Elasticsearch client' do
   let(:logger) { Logger.new($stderr) }
 
-  let(:client) do
-    Elasticsearch::Client.new(
-      host: ELASTICSEARCH_URL,
-      logger: logger,
-      user: 'elastic',
-      password: 'changeme'
-    )
-  end
-
   context 'Integrates with elasticsearch API' do
     it 'should perform the API methods' do
       expect do
         # Index a document
-        client.index(index: 'test-index', id: '1', body: { title: 'Test' })
+        CLIENT.index(index: 'test-index', id: '1', body: { title: 'Test' })
 
         # Refresh the index
-        client.indices.refresh(index: 'test-index')
+        CLIENT.indices.refresh(index: 'test-index')
 
         # Search
-        response = client.search(index: 'test-index', body: { query: { match: { title: 'test' } } })
+        response = CLIENT.search(index: 'test-index', body: { query: { match: { title: 'test' } } })
 
         expect(response['hits']['total']['value']).to eq 1
         expect(response['hits']['hits'][0]['_source']['title']).to eq 'Test'
 
         # Delete the index
-        client.indices.delete(index: 'test-index')
+        CLIENT.indices.delete(index: 'test-index')
       end.not_to raise_error
     end
   end
 
   context 'Reports the right meta header' do
     it 'Reports es service name and gem version' do
-      headers = client.transport.connections.first.connection.headers
-      version = Class.new.extend(Elastic::Transport::MetaHeader).send(:client_meta_version, Elasticsearch::VERSION)
+      headers = CLIENT.transport.connections.first.connection.headers
+      version = Class.new.extend(Elastic::Transport::MetaHeader).send(:CLIENT_meta_version, Elasticsearch::VERSION)
       expect(headers['x-elastic-client-meta']).to match /^es=#{version}/
     end
   end

elasticsearch/spec/integration/opentelemetry_spec.rb

@@ -27,26 +27,18 @@
     after { exporter.reset }
     let(:span) { exporter.finished_spans[0] }
 
-    let(:client) do
-      Elasticsearch::Client.new(
-        host: ELASTICSEARCH_URL,
-        user: 'elastic',
-        password: 'changeme'
-      )
-    end
-
     after do
-      client.delete(index: 'myindex', id: 1); rescue
+      CLIENT.delete(index: 'myindex', id: 1); rescue
     end
 
     context 'when a request is instrumented' do
       it 'sets the span name to the endpoint id' do
-        client.search(body: { query: { match: { a: 1 } } })
+        CLIENT.search(body: { query: { match: { a: 1 } } })
         expect(span.name).to eq 'search'
       end
 
       it 'sets the path parts' do
-        client.index(index: 'myindex', id: 1, body: { title: 'Test' })
+        CLIENT.index(index: 'myindex', id: 1, body: { title: 'Test' })
         expect(span.attributes['db.elasticsearch.path_parts.index']).to eq 'myindex'
         expect(span.attributes['db.elasticsearch.path_parts.id']).to eq 1
       end

elasticsearch/spec/spec_helper.rb

@@ -16,6 +16,7 @@
 # under the License.
 
 require 'elasticsearch'
+require 'openssl'
 require 'rspec'
 
 RSpec.configure do |config|
@@ -41,3 +42,18 @@ def jruby?
     c.add_span_processor span_processor
   end
 end
+
+CERTS_PATH = File.expand_path('../../.buildkite/certs', __dir__)
+host = ENV['TEST_ES_SERVER'] || 'http://localhost:9200'
+raise URI::InvalidURIError unless host =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
+password = ENV['ELASTIC_PASSWORD'] || 'changeme'
+HOST_URI = URI.parse(host)
+raw_certificate = File.read("#{CERTS_PATH}/testnode.crt")
+certificate = OpenSSL::X509::Certificate.new(raw_certificate)
+raw_key = File.read("#{CERTS_PATH}/testnode.key")
+key = OpenSSL::PKey::RSA.new(raw_key)
+ca_file = File.expand_path("#{CERTS_PATH}/ca.crt")
+TRANSPORT_OPTIONS = { ssl: { verify: false, client_cert: certificate, client_key: key, ca_file: ca_file } }
+HOST = "https://elastic:#{password}@#{HOST_URI.host}:#{HOST_URI.port}"
+CLIENT = Elasticsearch::Client.new(host: HOST, transport_options: TRANSPORT_OPTIONS)