elasticsearch 7.15.0 → 7.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76ffd45f5f83c91c089fb7e627adf3f7ac79f88dee48d20e0b95938269a797e
-  data.tar.gz: 5dacc32bac7bc899f60d90ad6a69fcbe60b8d906da2670787cadc37e108fcca6
+  metadata.gz: e17512df008ead07fcc1c4b5d127959ea5c2d0c8b900245600d7c8b7195234d0
+  data.tar.gz: b3b495229c695a1b8142051fa6868e051b20637ead9a6500991efdd7abaa6cd0
 SHA512:
-  metadata.gz: 92121776b9b8b373f6ecc20ee45599b19df9d25dd58e6d7bb1f05b0d1ff0b1d79e33b379f6f5da473fab7aa52a8b179297932127c4ab8b5fa5a3471dac0262ff
-  data.tar.gz: d464d2cc22b7c831325e386dc9e760a15d207c48f110c2fc4d6829636af03d4f19c2b1c6a0f21600eb6c1c6f347012ce317b8f2939dfdd7e9d2a09267bf4d97d
+  metadata.gz: 7e877a6669c39f6f4e24bbba43ee4fedc4c3dd63bca23e87988ec4ecb0806b9f282c44c7a82298bd9a6d417833a105b835b5bd74f55d7633d8114b46444f511f
+  data.tar.gz: 29cd41dc80a83f48b8617c3d8947ec2e89d85b8e4469600040c77c78c94a48b44c6add0c274f1f7f315b46b3e7dda499d711d8c9e86fc0422b9838312a78c73d

data/elasticsearch.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.authors       = ['Karel Minarik']
   s.email         = ['karel.minarik@elasticsearch.org']
   s.summary       = 'Ruby integrations for Elasticsearch'
-  s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html'
+  s.homepage      = 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html'
   s.license       = 'Apache-2.0'
   s.metadata = {
-    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html',
-    'changelog_uri' => 'https://github.com/elastic/elasticsearch-ruby/blob/7.x/CHANGELOG.md',
-    'source_code_uri' => 'https://github.com/elastic/elasticsearch-ruby/tree/7.x',
+    'homepage_uri' => 'https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html',
+    'changelog_uri' => 'https://github.com/elastic/elasticsearch-ruby/blob/7.16/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/elastic/elasticsearch-ruby/tree/7.16',
     'bug_tracker_uri' => 'https://github.com/elastic/elasticsearch-ruby/issues'
   }
   s.files         = `git ls-files`.split($/)
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency 'elasticsearch-transport', '7.15.0'
-  s.add_dependency 'elasticsearch-api',       '7.15.0'
+  s.add_dependency 'elasticsearch-transport', '7.17.0'
+  s.add_dependency 'elasticsearch-api',       '7.17.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 = '7.15.0'.freeze
+  VERSION = '7.17.0'.freeze
 end

data/lib/elasticsearch.rb

@@ -50,7 +50,8 @@ module Elasticsearch
       begin
         response = elasticsearch_validation_request
       rescue Elasticsearch::Transport::Transport::Errors::Unauthorized,
-             Elasticsearch::Transport::Transport::Errors::Forbidden
+             Elasticsearch::Transport::Transport::Errors::Forbidden,
+             Elasticsearch::Transport::Transport::Errors::RequestEntityTooLarge
         @verified = true
         warn(SECURITY_PRIVILEGES_VALIDATION_WARNING)
         return

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['_id']).to eq 'a test 1'
+
+      response = client.search(index: index)
+      expect(response['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 ArgumentError
+
+      # 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 Elasticsearch::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['_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))
+
+      response = client.search(index: index)
+      expect(
+        response['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['_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['_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))
+
+      response = client.search(index: index)
+      expect(
+        response['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 }
@@ -38,7 +38,7 @@ describe 'Elasticsearch: Validation' do
   def error_requests_and_expectations(message = Elasticsearch::NOT_ELASTICSEARCH_WARNING)
     expect { client.count }.to raise_error Elasticsearch::UnsupportedProductError, message
     assert_requested :get, host
-    assert_not_requested :post, "#{host}/_count"
+    assert_not_requested :get, "#{host}/_count"
     expect { client.cluster.health }.to raise_error Elasticsearch::UnsupportedProductError, message
     expect(client.instance_variable_get('@verified')).to be false
     expect { client.cluster.health }.to raise_error Elasticsearch::UnsupportedProductError, message
@@ -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
@@ -96,6 +96,27 @@ describe 'Elasticsearch: Validation' do
     end
   end
 
+  context 'When Elasticsearch replies with status 403' do
+    let(:status) { 413 }
+    let(:body) { {}.to_json }
+
+    it 'Verifies the request but shows a warning' do
+      stderr      = $stderr
+      fake_stderr = StringIO.new
+      $stderr     = fake_stderr
+
+      verify_request_stub
+      count_request_stub
+
+      valid_requests_and_expectations
+
+      fake_stderr.rewind
+      expect(fake_stderr.string).to eq("#{Elasticsearch::SECURITY_PRIVILEGES_VALIDATION_WARNING}\n")
+    ensure
+      $stderr = stderr
+    end
+  end
+
   context 'When the Elasticsearch version is >= 7.14' do
     context 'With a valid Elasticsearch response' do
       let(:body) { { 'version' => { 'number' => '7.14.0' } }.to_json }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.15.0
+  version: 7.17.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-transport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.15.0
+        version: 7.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.15.0
+        version: 7.17.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.15.0
+        version: 7.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.15.0
+        version: 7.17.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,18 +200,19 @@ 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/integration/validation_integration_spec.rb
 - spec/spec_helper.rb
 - spec/unit/elasticsearch_product_validation_spec.rb
 - spec/unit/wrapper_gem_spec.rb
-homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
+homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
 licenses:
 - Apache-2.0
 metadata:
-  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
-  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/7.x/CHANGELOG.md
-  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/7.x
+  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.16/index.html
+  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/7.16/CHANGELOG.md
+  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/7.16
   bug_tracker_uri: https://github.com/elastic/elasticsearch-ruby/issues
 post_install_message: 
 rdoc_options:
@@ -229,11 +230,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 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/integration/validation_integration_spec.rb
 - spec/spec_helper.rb