[GEM] Test for YAML response in validation

Author: picandocodigo

elasticsearch/lib/elasticsearch.rb

@@ -45,40 +45,50 @@ def method_missing(name, *args, &block)
 
     def verify_elasticsearch
       begin
-        response = @transport.perform_request('GET', '/')
+        response = elasticsearch_validation_request
       rescue Elasticsearch::Transport::Transport::Errors::Unauthorized,
              Elasticsearch::Transport::Transport::Errors::Forbidden
         @verified = true
         warn(SECURITY_PRIVILEGES_VALIDATION_WARNING)
         return
       end
 
-      verify_with_version_or_header(response)
+      body = if response.headers['content-type'] == 'application/yaml'
+               require 'yaml'
+               YAML.load(response.body)
+             else
+               response.body
+             end
+      version = body.dig('version', 'number')
+      verify_with_version_or_header(body, version, response.headers)
     end
 
-    def verify_with_version_or_header(response)
-      version = response.body.dig('version', 'number')
+    def verify_with_version_or_header(body, version, headers)
       raise Elasticsearch::NotElasticsearchError 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 response.headers['x-elastic-product'] == 'Elasticsearch'
+        raise Elasticsearch::NotElasticsearchError 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')
+            Gem::Version.new(version) < Gem::Version.new('7.0.0')
         raise Elasticsearch::NotElasticsearchError unless
-          response.body.dig('version', 'tagline') == YOU_KNOW_FOR_SEARCH
+          body.dig('version', '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
-          response.body.dig('version', 'tagline') == YOU_KNOW_FOR_SEARCH &&
-          response.body.dig('version', 'build_flavor') == 'default'
+          body.dig('version', 'tagline') == YOU_KNOW_FOR_SEARCH &&
+          body.dig('version', 'build_flavor') == 'default'
 
         @verified = true
       end
     end
+
+    def elasticsearch_validation_request
+      @transport.perform_request('GET', '/')
+    end
   end
 
   class NotElasticsearchError < StandardError

elasticsearch/spec/unit/elasticsearch_product_validation_spec.rb

@@ -368,4 +368,19 @@ def valid_requests_and_expectations
       end
     end
   end
+
+  context 'When doing a yaml content-type request' do
+    let(:client) do
+      Elasticsearch::Client.new(transport_options: {headers: { accept: 'application/yaml', content_type: 'application/yaml' }})
+    end
+
+    let(:headers) { { 'content-type' => 'application/yaml', 'X-Elastic-Product' => 'Elasticsearch' } }
+    let(:body) { "---\nversion:\n  number: \"7.14.0-SNAPSHOT\"\n" }
+
+    it 'validates' do
+      verify_request_stub
+      count_request_stub
+      valid_requests_and_expectations
+    end
+  end
 end