[Gem] Updates error for unsupported Elasticsearch

Author: picandocodigo

elasticsearch/lib/elasticsearch.rb

@@ -22,6 +22,7 @@
 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. 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
+  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
@@ -66,23 +67,22 @@ def verify_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 @@ def elasticsearch_validation_request
     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

elasticsearch/spec/unit/elasticsearch_product_validation_spec.rb

@@ -35,13 +35,13 @@
     { '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
@@ -240,7 +240,7 @@ def valid_requests_and_expectations
         verify_request_stub
         count_request_stub
 
-        error_requests_and_expectations
+        error_requests_and_expectations(Elasticsearch::NOT_SUPPORTED_ELASTICSEARCH_WARNING)
       end
     end
 
@@ -423,7 +423,7 @@ def valid_requests_and_expectations
         verify_request_stub
         count_request_stub
 
-        error_requests_and_expectations
+        error_requests_and_expectations(Elasticsearch::NOT_SUPPORTED_ELASTICSEARCH_WARNING)
       end
     end
   end