elasticsearch 7.14.0.pre → 7.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e005cdbfff8d8486e0cf54d74a9c68173235bd00ea1c42371438ba76433d78b
-  data.tar.gz: 50bd687f7cea41c62e5d53672e438467cb522890a707efe68b228521cf0dd170
+  metadata.gz: 716743889b9b5e25022814cceb17d97ac242891c91ca86f8de4dd77003ee8e13
+  data.tar.gz: e11579ee6907a87f131b689979e6c35df9079177bbf7df0419370c2294f8d86b
 SHA512:
-  metadata.gz: 2f1641346dca4764402a543fdd86976804137b5bcadb696b306c3bb3683ba3b03f3605e56beaf14c310f72220c52874e973f18980867f83b4244464890f4fcbf
-  data.tar.gz: 02b2e651a97e7f5ffa3ca5548cf56e0e8a3c281728dd8b2ff94f8172f4db36f639860b6b3662d67ded42ec41369152e36cbb38885cf3a349bef5b90f76f704b5
+  metadata.gz: 53f6244770f02a67315852e6d67cab6f13f6b7ce72ea8c60a93caf2a4ddc47eeb4764ca2fd65cc74413cb4f90f0f1f1792697f874dd0bffa754c9bd1c8fa1cb6
+  data.tar.gz: daac32d9daac91a0353bbe73ccdbdee5fdb47a39b41f63c4b2fbd50fa532ee1f5771b371053c417e968f98a6e44bbb55da79f09dd1e4f6ad63d5f9b7145b46fc

data/elasticsearch.gemspec

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

data/lib/elasticsearch.rb

@@ -20,9 +20,10 @@ require 'elasticsearch/transport'
 require 'elasticsearch/api'
 
 module Elasticsearch
-  SECURITY_PRIVILEGES_VALIDATION_WARNING = 'The client is unable to verify that the server is Elasticsearch due to security privileges on the server side.'.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
   NOT_ELASTICSEARCH_WARNING = 'The client noticed that the server is not Elasticsearch and we do not support this unknown product.'.freeze
-  YOU_KNOW_FOR_SEARCH = 'You know, for Search'.freeze
+  NOT_SUPPORTED_ELASTICSEARCH_WARNING = 'The client noticed that the server is not a supported distribution of Elasticsearch.'.freeze
+  YOU_KNOW_FOR_SEARCH = 'You Know, for Search'.freeze
 
   class Client
     include Elasticsearch::API
@@ -66,23 +67,22 @@ module Elasticsearch
     end
 
     def verify_with_version_or_header(body, version, headers)
-      raise Elasticsearch::NotElasticsearchError if version.nil? || version < '6.0.0'
+      raise Elasticsearch::UnsupportedProductError if version.nil? || version < '6.0.0'
 
       if version == '7.x-SNAPSHOT' || Gem::Version.new(version) >= Gem::Version.new('7.14-SNAPSHOT')
-        raise Elasticsearch::NotElasticsearchError unless headers['x-elastic-product'] == 'Elasticsearch'
+        raise Elasticsearch::UnsupportedProductError unless headers['x-elastic-product'] == 'Elasticsearch'
 
         @verified = true
       elsif Gem::Version.new(version) > Gem::Version.new('6.0.0') &&
             Gem::Version.new(version) < Gem::Version.new('7.0.0')
-        raise Elasticsearch::NotElasticsearchError unless
+        raise Elasticsearch::UnsupportedProductError unless
           body['tagline'] == YOU_KNOW_FOR_SEARCH
 
         @verified = true
       elsif Gem::Version.new(version) >= Gem::Version.new('7.0.0') &&
             Gem::Version.new(version) < Gem::Version.new('7.14-SNAPSHOT')
-        raise Elasticsearch::NotElasticsearchError unless
-          body['tagline'] == YOU_KNOW_FOR_SEARCH &&
-          body.dig('version', 'build_flavor') == 'default'
+        raise Elasticsearch::UnsupportedProductError unless body['tagline'] == YOU_KNOW_FOR_SEARCH
+        raise Elasticsearch::UnsupportedProductError.new(NOT_SUPPORTED_ELASTICSEARCH_WARNING) unless body.dig('version', 'build_flavor') == 'default'
 
         @verified = true
       end
@@ -93,9 +93,9 @@ module Elasticsearch
     end
   end
 
-  class NotElasticsearchError < StandardError
-    def initialize
-      super(NOT_ELASTICSEARCH_WARNING)
+  class UnsupportedProductError < StandardError
+    def initialize(message = NOT_ELASTICSEARCH_WARNING)
+      super(message)
     end
   end
 end

data/lib/elasticsearch/version.rb

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

data/spec/integration/client_integration_spec.rb

@@ -51,7 +51,7 @@ context 'Elasticsearch client' do
   context 'Reports the right meta header' do
     it 'Reports es service name and gem version' do
       headers = client.transport.transport.connections.first.connection.headers
-      expect(headers['x-elastic-client-meta']).to match Elastic.client_meta_version
+      expect(headers['x-elastic-client-meta']).to match /^es=#{Elasticsearch::VERSION}/
     end
   end
 end

data/spec/unit/elasticsearch_product_validation_spec.rb

@@ -35,13 +35,13 @@ describe 'Elasticsearch: Validation' do
     { 'content-type' => 'json' }
   end
 
-  def error_requests_and_expectations
-    expect { client.count }.to raise_error Elasticsearch::NotElasticsearchError
+  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"
-    expect { client.cluster.health }.to raise_error Elasticsearch::NotElasticsearchError
+    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::NotElasticsearchError
+    expect { client.cluster.health }.to raise_error Elasticsearch::UnsupportedProductError, message
   end
 
   def valid_requests_and_expectations
@@ -105,6 +105,7 @@ describe 'Elasticsearch: Validation' do
           'content-type' => 'json'
         }
       end
+
       it 'Makes requests and passes validation' do
         verify_request_stub
         count_request_stub
@@ -134,6 +135,7 @@ describe 'Elasticsearch: Validation' do
           'content-type' => 'json'
         }
       end
+
       it 'Makes requests and passes validation' do
         verify_request_stub
         count_request_stub
@@ -234,6 +236,25 @@ describe 'Elasticsearch: Validation' do
         }.to_json
       end
 
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations(Elasticsearch::NOT_SUPPORTED_ELASTICSEARCH_WARNING)
+      end
+    end
+
+    context 'When the tagline is different' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.4.0',
+            'build_flavor' => 'default'
+          },
+          'tagline' => 'You Know, for other stuff'
+        }.to_json
+      end
+
       it 'Fails validation' do
         verify_request_stub
         count_request_stub
@@ -249,7 +270,7 @@ describe 'Elasticsearch: Validation' do
             'number' => '7.4.0',
             'build_flavor' => 'default'
           },
-          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+          'tagline' => 'You Know, for Search'
         }.to_json
       end
 
@@ -286,7 +307,7 @@ describe 'Elasticsearch: Validation' do
           'version' => {
             'number' => '6.8.10'
           },
-          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+          'tagline' => 'You Know, for Search'
         }.to_json
       end
 
@@ -310,6 +331,25 @@ describe 'Elasticsearch: Validation' do
         error_requests_and_expectations
       end
     end
+
+    context 'When the tagline is different' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '6.8.10',
+            'build_flavor' => 'default'
+          },
+          'tagline' => 'You Know, for Stuff'
+        }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
   end
 
   context 'When Elasticsearch version is between 7.0.0 and 7.14.0' do
@@ -320,7 +360,7 @@ describe 'Elasticsearch: Validation' do
             'number' => '7.10.0',
             'build_flavor' => 'default'
           },
-          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+          'tagline' => 'You Know, for Search'
         }.to_json
       end
 
@@ -350,13 +390,32 @@ describe 'Elasticsearch: Validation' do
       end
     end
 
+    context 'When the tagline is different' do
+      let(:body) do
+        {
+          'version' => {
+            'number' => '7.10.0',
+            'build_flavor' => 'default'
+          },
+          'tagline' => 'You Know, for other stuff'
+        }.to_json
+      end
+
+      it 'Fails validation' do
+        verify_request_stub
+        count_request_stub
+
+        error_requests_and_expectations
+      end
+    end
+
     context 'When the build_flavor is not present' do
       let(:body) do
         {
           'version' => {
             'number' => '7.10.0'
           },
-          'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
+          'tagline' => 'You Know, for Search'
         }.to_json
       end
 
@@ -364,7 +423,7 @@ describe 'Elasticsearch: Validation' do
         verify_request_stub
         count_request_stub
 
-        error_requests_and_expectations
+        error_requests_and_expectations(Elasticsearch::NOT_SUPPORTED_ELASTICSEARCH_WARNING)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch
 version: !ruby/object:Gem::Version
-  version: 7.14.0.pre
+  version: 7.14.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-08-04 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.14.0.pre
+        version: 7.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.0.pre
+        version: 7.14.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.0.pre
+        version: 7.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.14.0.pre
+        version: 7.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -225,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.15
 signing_key: