elasticsearch 8.0.0.pre1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca479af01bac2b0dd8b654294c63f0f1bc675cd69036f9704ae9fd1b22684546
-  data.tar.gz: c2252be5532689f299dfb3084215beab37a797358d41cc355e74fa820c63cf42
+  metadata.gz: b4a75131520baa75c7b646578951dcd420fc640628ee0897a2b60a9f65ce8290
+  data.tar.gz: e0d8973646685dbf3575011e1ebbbd3e5dc599b37242306ef8bdf2a2a12ba5df
 SHA512:
-  metadata.gz: 27abb64b012188c2dd762c4e1a856dd84a80624a7d2c478b55ed84ab7cde54952c507847ac52a13c5c9170c9bfce5114ca4174c0ac5ae0d05fe234bd7a8a8f8a
-  data.tar.gz: 1f4a3e1ef357eba8709fe91a24c0d677835b40586232427c62372c0ce2a45b707cce51c02618235cdaf44567a408ab30c7da5e4172ef6010cdb6a20f9b57fdf1
+  metadata.gz: 7bf711aaed6971e4438f846fe34594cbf6d58921742bd4f49914f27f31453fe451a82e09da4b691468156ec25b6039aaa0bf9ae1c87d38808979b0cd2e9aed53
+  data.tar.gz: 5188206505493fa7e820e7fdfe2cbbe375fd3efd1957db36d2d9b8d01c4d084f0fb7e482edb9429f9eda92969b9beac534901801f03a38764d61ee161e6058c7

data/bin/elastic_ruby_console

@@ -1,27 +1,12 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift(File.expand_path('../../elasticsearch/lib', __dir__))
-$LOAD_PATH.unshift(File.expand_path('../../elasticsearch-dsl/lib', __dir__))
 $LOAD_PATH.unshift(File.expand_path('../../elasticsearch-api/lib', __dir__))
 
 require 'elasticsearch'
 require 'elasticsearch-api'
-require 'elasticsearch-dsl'
-
-gems_not_loaded = ['elasticsearch-dsl'].reject do |gem|
-  begin
-    (require gem) || true
-  rescue LoadError
-    false
-  end
-end
-
-unless gems_not_loaded.empty?
-  warn "The following gems were not loaded: [#{gems_not_loaded.join(', ')}]. Please install and require them explicitly."
-end
 
 include Elasticsearch
-include Elasticsearch::DSL if defined?(Elasticsearch::DSL)
 
 begin
   require 'pry'

data/elasticsearch.gemspec

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

data/lib/elasticsearch/version.rb

@@ -16,5 +16,5 @@
 # under the License.
 
 module Elasticsearch
-  VERSION = '8.0.0.pre1'.freeze
+  VERSION = '8.0.0'.freeze
 end

data/lib/elasticsearch.rb

@@ -22,6 +22,7 @@ require 'elasticsearch/api'
 module Elasticsearch
   NOT_ELASTICSEARCH_WARNING = 'The client noticed that the server is not Elasticsearch and we do not support this unknown product.'.freeze
   SECURITY_PRIVILEGES_VALIDATION_WARNING = 'The client is unable to verify that the server is Elasticsearch due to security privileges on the server side. Some functionality may not be compatible if the server is running an unsupported product.'.freeze
+  VALIDATION_WARNING = 'The client is unable to verify that the server is Elasticsearch. Some functionality may not be compatible if the server is running an unsupported product.'.freeze
 
   # This is the stateful Elasticsearch::Client, using an instance of elastic-transport.
   class Client
@@ -66,10 +67,8 @@ module Elasticsearch
           opaque_id = @opaque_id_prefix ? "#{@opaque_id_prefix}#{opaque_id}" : opaque_id
           args[4] = headers.merge('X-Opaque-Id' => opaque_id)
         end
-        if name == :perform_request
-          verify_elasticsearch unless @verified
-          @transport.perform_request(*args, &block)
-        end
+        verify_elasticsearch unless @verified
+        @transport.perform_request(*args, &block)
       else
         @transport.send(name, *args, &block)
       end
@@ -85,20 +84,27 @@ module Elasticsearch
       begin
         response = elasticsearch_validation_request
       rescue Elastic::Transport::Transport::Errors::Unauthorized,
-             Elastic::Transport::Transport::Errors::Forbidden
+             Elastic::Transport::Transport::Errors::Forbidden,
+             Elastic::Transport::Transport::Errors::RequestEntityTooLarge
         @verified = true
         warn(SECURITY_PRIVILEGES_VALIDATION_WARNING)
         return
+      rescue Elastic::Transport::Transport::Error
+        warn(VALIDATION_WARNING)
+        return
       end
 
       body = if response.headers['content-type'] == 'application/yaml'
                require 'yaml'
-               YAML.load(response.body)
+               YAML.safe_load(response.body)
              else
                response.body
              end
       version = body.dig('version', 'number')
       verify_with_version_or_header(version, response.headers)
+    rescue StandardError => e
+      warn(VALIDATION_WARNING)
+      raise e
     end
 
     def verify_with_version_or_header(version, headers)

data/spec/integration/characters_escaping_spec.rb

@@ -0,0 +1,94 @@
+# 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.
+ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+
+require 'spec_helper'
+
+context 'Elasticsearch client' do
+  let(:client) do
+    Elasticsearch::Client.new(host: ELASTICSEARCH_URL, user: 'elastic', password: 'changeme')
+  end
+  let(:index) { 'tvs' }
+
+  after do
+    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)
+      expect(response.body['_id']).to eq 'a test 1'
+
+      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' })
+      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' })
+      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' })
+      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
+
+      response = client.search(index: index)
+      expect(
+        response.body['hits']['hits'].select { |a| a['_id'] == 'a test 5' }.size
+      ).to eq 1
+    end
+  end
+
+  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' })
+      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' })
+      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
+
+      response = client.search(index: index)
+      expect(
+        response.body['hits']['hits'].select { |a| a['_id'] == 'a+test+3' }.size
+      ).to eq 1
+    end
+  end
+end

data/spec/unit/elasticsearch_product_validation_spec.rb

@@ -25,7 +25,7 @@ describe 'Elasticsearch: Validation' do
       .to_return(status: status, body: body, headers: headers)
   end
   let(:count_request_stub) do
-    stub_request(:post, "#{host}/_count")
+    stub_request(:get, "#{host}/_count")
       .to_return(status: 200, body: nil, headers: {})
   end
   let(:status) { 200 }
@@ -51,7 +51,7 @@ describe 'Elasticsearch: Validation' do
     client.count
     expect(client.instance_variable_get('@verified'))
     assert_requested :get, host
-    assert_requested :post, "#{host}/_count"
+    assert_requested :get, "#{host}/_count"
   end
 
   context 'When Elasticsearch replies with status 401' do
@@ -65,7 +65,6 @@ describe 'Elasticsearch: Validation' do
 
       verify_request_stub
       count_request_stub
-
       valid_requests_and_expectations
 
       fake_stderr.rewind
@@ -86,7 +85,6 @@ describe 'Elasticsearch: Validation' do
 
       verify_request_stub
       count_request_stub
-
       valid_requests_and_expectations
 
       fake_stderr.rewind
@@ -96,6 +94,60 @@ describe 'Elasticsearch: Validation' do
     end
   end
 
+  context 'When Elasticsearch replies with status 413' do
+    let(:status) { 413 }
+    let(:body) { {}.to_json }
+
+    it 'Verifies the request and shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      expect(client.instance_variable_get('@verified')).to be false
+      assert_not_requested :get, host
+      verify_request_stub
+      expect { client.info }.to raise_error Elastic::Transport::Transport::Errors::RequestEntityTooLarge
+      expect(client.instance_variable_get('@verified')).to be true
+
+      fake_stderr.rewind
+      expect(fake_stderr.string.delete("\n"))
+        .to eq(Elasticsearch::SECURITY_PRIVILEGES_VALIDATION_WARNING)
+    ensure
+      $stderr = stderr
+    end
+  end
+
+  context 'When Elasticsearch replies with status 503' do
+    let(:status) { 503 }
+    let(:body) { {}.to_json }
+
+    it 'Does not verify the request and shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      expect(client.instance_variable_get('@verified')).to be false
+      assert_not_requested :get, host
+      verify_request_stub
+      expect { client.info }.to raise_error Elastic::Transport::Transport::Errors::ServiceUnavailable
+      assert_not_requested :post, "#{host}/_count"
+      expect(client.instance_variable_get('@verified')).to be false
+
+      fake_stderr.rewind
+      expect(fake_stderr.string)
+        .to eq(
+              <<~MSG
+            The client is unable to verify that the server is \
+            Elasticsearch. Some functionality may not be compatible \
+            if the server is running an unsupported product.
+          MSG
+            )
+    ensure
+      $stderr = stderr
+    end
+  end
+
+
   context 'When the Elasticsearch version is >= 8.0.0' do
     context 'With a valid Elasticsearch response' do
       let(:body) { { 'version' => { 'number' => '8.0.0' } }.to_json }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre1
+  version: 8.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastic-transport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.pre2
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.pre2
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.pre1
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0.pre1
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/elasticsearch-ruby.rb
 - lib/elasticsearch.rb
 - lib/elasticsearch/version.rb
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/api_key_spec.rb
@@ -229,15 +230,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby integrations for Elasticsearch
 test_files:
+- spec/integration/characters_escaping_spec.rb
 - spec/integration/client_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/api_key_spec.rb