elasticsearch-api 7.15.0 → 7.17.0

data/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb

@@ -26,7 +26,7 @@ module Elasticsearch
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/clean-up-snapshot-repo-api.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/clean-up-snapshot-repo-api.html
         #
         def cleanup_repository(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/clone.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The snapshot clone definition (*Required*)
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def clone(arguments = {})
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]

data/lib/elasticsearch/api/actions/snapshot/create.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The snapshot definition
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def create(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/create_repository.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body The repository definition (*Required*)
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def create_repository(arguments = {})
           raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]

data/lib/elasticsearch/api/actions/snapshot/delete.rb

@@ -26,7 +26,7 @@ module Elasticsearch
         # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def delete(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/delete_repository.rb

@@ -26,7 +26,7 @@ module Elasticsearch
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def delete_repository(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/get.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :verbose Whether to show verbose snapshot info or only show the basic info found in the repository index blob
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def get(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/get_repository.rb

@@ -26,7 +26,7 @@ module Elasticsearch
         # @option arguments [Boolean] :local Return local information, do not retrieve the state from master node (default: false)
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def get_repository(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/snapshot/repository_analyze.rb

@@ -35,7 +35,7 @@ module Elasticsearch
         # @option arguments [Boolean] :rarely_abort_writes Whether to rarely abort writes before they complete. Defaults to 'true'.
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def repository_analyze(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/restore.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         # @option arguments [Hash] :headers Custom HTTP headers
         # @option arguments [Hash] :body Details of what to restore
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def restore(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/snapshot/status.rb

@@ -27,7 +27,7 @@ module Elasticsearch
         # @option arguments [Boolean] :ignore_unavailable Whether to ignore unavailable snapshots, defaults to false which means a SnapshotMissingException is thrown
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def status(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/snapshot/verify_repository.rb

@@ -26,7 +26,7 @@ module Elasticsearch
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/modules-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-snapshots.html
         #
         def verify_repository(arguments = {})
           raise ArgumentError, "Required argument 'repository' missing" unless arguments[:repository]

data/lib/elasticsearch/api/actions/tasks/cancel.rb

@@ -32,7 +32,7 @@ module Elasticsearch
         # @option arguments [Boolean] :wait_for_completion Should the request block until the cancellation of the task and its descendant tasks is completed. Defaults to false
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/tasks.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/tasks.html
         #
         def cancel(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/tasks/get.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/tasks.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/tasks.html
         #
         def get(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/tasks/list.rb

@@ -34,7 +34,7 @@ module Elasticsearch
         # @option arguments [Time] :timeout Explicit operation timeout
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/tasks.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/tasks.html
         #
         def list(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/termvectors.rb

@@ -42,7 +42,7 @@ module Elasticsearch
       # Deprecated since version 7.0.0
       #
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/docs-termvectors.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/docs-termvectors.html
       #
       def termvectors(arguments = {})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]

data/lib/elasticsearch/api/actions/update.rb

@@ -43,7 +43,7 @@ module Elasticsearch
       # Deprecated since version 7.0.0
       #
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/docs-update.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/docs-update.html
       #
       def update(arguments = {})
         raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]

data/lib/elasticsearch/api/actions/update_by_query.rb

@@ -43,9 +43,6 @@ module Elasticsearch
       # @option arguments [Number] :size Deprecated, please use `max_docs` instead
       # @option arguments [Number] :max_docs Maximum number of documents to process (default: all documents)
       # @option arguments [List] :sort A comma-separated list of <field>:<direction> pairs
-      # @option arguments [List] :_source True or false to return the _source field or not, or a list of fields to return
-      # @option arguments [List] :_source_excludes A list of fields to exclude from the returned _source field
-      # @option arguments [List] :_source_includes A list of fields to extract and return from the _source field
       # @option arguments [Number] :terminate_after The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.
       # @option arguments [List] :stats Specific 'tag' of the request for logging and statistical purposes
       # @option arguments [Boolean] :version Specify whether to return document version as part of a hit
@@ -66,7 +63,7 @@ module Elasticsearch
       # Deprecated since version 7.0.0
       #
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/docs-update-by-query.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/docs-update-by-query.html
       #
       def update_by_query(arguments = {})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
@@ -115,9 +112,6 @@ module Elasticsearch
         :size,
         :max_docs,
         :sort,
-        :_source,
-        :_source_excludes,
-        :_source_includes,
         :terminate_after,
         :stats,
         :version,

data/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb

@@ -24,7 +24,7 @@ module Elasticsearch
       # @option arguments [Number] :requests_per_second The throttle to set on this request in floating sub-requests per second. -1 means set no throttle. (*Required*)
       # @option arguments [Hash] :headers Custom HTTP headers
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.15/docs-update-by-query.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.17/docs-update-by-query.html
       #
       def update_by_query_rethrottle(arguments = {})
         raise ArgumentError, "Required argument 'task_id' missing" unless arguments[:task_id]

data/lib/elasticsearch/api/utils.rb

@@ -14,14 +14,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+require 'erb'
 
 module Elasticsearch
   module API
-
     # Generic utility methods
     #
     module Utils
-
       # URL-escape a string
       #
       # @example
@@ -31,7 +30,7 @@ module Elasticsearch
       # @api private
       def __escape(string)
         return string if string == '*'
-        defined?(EscapeUtils) ? EscapeUtils.escape_url(string.to_s) : CGI.escape(string.to_s)
+        ERB::Util.url_encode(string.to_s)
       end
 
       # Create a "list" of values from arguments, ignoring nil values and encoding special characters.
@@ -282,6 +281,11 @@ module Elasticsearch
         end
       end
 
+      def ndjson_headers(headers)
+        headers.merge!('Content-Type' => 'application/x-ndjson') unless ['1', 'true'].include?(ENV['ELASTIC_CLIENT_APIVERSIONING'])
+        headers
+      end
+
       extend self
     end
   end

data/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = '7.15.0'.freeze
+    VERSION = '7.17.0'.freeze
   end
 end

data/spec/elasticsearch/api/actions/count_spec.rb

@@ -18,10 +18,9 @@
 require 'spec_helper'
 
 describe 'client#count' do
-
   let(:expected_args) do
     [
-      'POST',
+      'GET',
       '_count',
       {},
       nil,
@@ -34,10 +33,9 @@ describe 'client#count' do
   end
 
   context 'when an index and type are specified' do
-
     let(:expected_args) do
       [
-        'POST',
+        'GET',
         'foo,bar/t1,t2/_count',
         {},
         nil,
@@ -51,7 +49,6 @@ describe 'client#count' do
   end
 
   context 'when there is a query provided' do
-
     let(:expected_args) do
       [
         'POST',

data/spec/elasticsearch/api/actions/nodes/clear_repositories_metering_archive_spec.rb

@@ -18,7 +18,7 @@
 require 'spec_helper'
 
 
-describe 'client.nodes#clear_repositories_metering_archive' do
+describe 'client.nodes#clear_metering_archive' do
   let(:expected_args) do
     [
       'DELETE',

data/spec/elasticsearch/api/actions/nodes/get_repositories_metering_info_spec.rb

@@ -17,7 +17,7 @@
 
 require 'spec_helper'
 
-describe 'client.nodes#get_repositories_metering_info' do
+describe 'client.nodes#get_metering_info' do
   let(:expected_args) do
     [
       'GET',

data/spec/elasticsearch/api/actions/search_mvt_spec.rb

@@ -20,7 +20,7 @@ require 'spec_helper'
 describe 'client#search_mvt' do
   let(:expected_args) do
     [
-      method,
+      'POST',
       url,
       params,
       body,
@@ -29,7 +29,6 @@ describe 'client#search_mvt' do
   end
 
   context 'with right parameters' do
-    let(:method) { 'POST' }
     let(:url) { 'foo/_mvt/field/10/57.2127/6.2348' }
     let(:params) { {} }
     let(:body) { nil }

data/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -50,13 +50,12 @@ describe 'Rest API YAML tests' do
 
             # Runs once before each test in a test file
             before(:all) do
-              Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
               test_file.setup
             end
 
             after(:all) do
               test_file.teardown
-              Elasticsearch::RestAPIYAMLTests::TestFile.wipe_cluster(ADMIN_CLIENT)
+              Elasticsearch::RestAPIYAMLTests::WipeCluster.run(ADMIN_CLIENT)
             end
 
             test.task_groups.each do |task_group|

data/spec/elasticsearch/api/utils_spec.rb

@@ -30,7 +30,7 @@ describe Elasticsearch::API::Utils do
     end
 
     it 'encodes special characters' do
-      expect(utils.__escape('foo bar')).to eq('foo+bar')
+      expect(utils.__escape('foo bar')).to eq('foo%20bar')
       expect(utils.__escape('foo/bar')).to eq('foo%2Fbar')
       expect(utils.__escape('foo^bar')).to eq('foo%5Ebar')
     end
@@ -38,18 +38,6 @@ describe Elasticsearch::API::Utils do
     it 'does not encode asterisks' do
       expect(utils.__escape('*')).to eq('*')
     end
-
-    it 'users CGI.escape by default' do
-      expect(CGI).to receive(:escape).and_call_original
-      expect(utils.__escape('foo bar')).to eq('foo+bar')
-    end
-
-    it 'uses the escape_utils gem when available', unless: defined?(JRUBY_VERSION) do
-      require 'escape_utils'
-      expect(CGI).not_to receive(:escape)
-      expect(EscapeUtils).to receive(:escape_url).and_call_original
-      expect(utils.__escape('foo bar')).to eq('foo+bar')
-    end
   end
 
   describe '#__listify' do
@@ -77,7 +65,7 @@ describe Elasticsearch::API::Utils do
     context 'when the escape option is set to false' do
 
       it 'does not escape the characters' do
-        expect(utils.__listify(['foo', 'bar^bam'], :escape => false)).to eq('foo,bar^bam')
+        expect(utils.__listify(['foo', 'bar^bam'], escape: false)).to eq('foo,bar^bam')
       end
     end
   end
@@ -107,19 +95,19 @@ describe Elasticsearch::API::Utils do
 
       let(:result) do
         utils.__bulkify [
-          { :index =>  { :_index => 'myindexA', :_type => 'mytype', :_id => '1', :data => { :title => 'Test' } } },
-          { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
-          { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } }
+          { index: { _index: 'myindexA', _id: '1', data: { title: 'Test' } } },
+          { update: { _index: 'myindexB', _id: '2', data: { doc: { title: 'Update' } } } },
+          { delete: { _index: 'myindexC', _id: '3' } }
         ]
       end
 
       let(:expected_string) do
         <<-PAYLOAD.gsub(/^\s+/, '')
-                {"index":{"_index":"myindexA","_type":"mytype","_id":"1"}}
+                {"index":{"_index":"myindexA","_id":"1"}}
                 {"title":"Test"}
-                {"update":{"_index":"myindexB","_type":"mytype","_id":"2"}}
+                {"update":{"_index":"myindexB","_id":"2"}}
                 {"doc":{"title":"Update"}}
-                {"delete":{"_index":"myindexC","_type":"mytypeC","_id":"3"}}
+                {"delete":{"_index":"myindexC","_id":"3"}}
         PAYLOAD
       end
 
@@ -379,7 +367,7 @@ describe Elasticsearch::API::Utils do
       end
 
       let(:unsupported_params) do
-        [ { :foo => { :explanation => 'NOT_SUPPORTED'} }, :moo ]
+        [ { foo: { explanation: 'NOT_SUPPORTED'} }, :moo ]
       end
 
 

data/spec/rest_yaml_tests_helper.rb

@@ -17,10 +17,13 @@
 
 require "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/test_file"
 require "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/rspec_matchers"
+require "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/wipe_cluster"
 include Elasticsearch::RestAPIYAMLTests
 
 TRANSPORT_OPTIONS = {}
 PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
+STACK_VERSION = ENV['STACK_VERSION']
+require 'elasticsearch/xpack'
 
 if (hosts = ELASTICSEARCH_URL)
   split_hosts = hosts.split(',').map do |host|
@@ -33,21 +36,69 @@ else
   TEST_HOST, TEST_PORT = 'localhost', '9200'
 end
 
+test_suite = ENV['TEST_SUITE'] || 'free'
+password = ENV['ELASTIC_PASSWORD'] || 'changeme'
+user = ENV['ELASTIC_USER'] || 'elastic'
+
 if defined?(TEST_HOST) && defined?(TEST_PORT)
-  URL = "http://#{TEST_HOST}:#{TEST_PORT}"
+  URL = "http://#{TEST_HOST}:#{TEST_PORT}".freeze
+
+  if STACK_VERSION.match?(/^8\./)
+    if ENV['TEST_SUITE'] == 'platinum'
+      raw_certificate = File.read(File.join(PROJECT_PATH, '../.ci/certs/testnode.crt'))
+      certificate = OpenSSL::X509::Certificate.new(raw_certificate)
+      raw_key = File.read(File.join(PROJECT_PATH, '../.ci/certs/testnode.key'))
+      key = OpenSSL::PKey::RSA.new(raw_key)
+      ca_file = File.expand_path(File.join(PROJECT_PATH, '/.ci/certs/ca.crt'))
+      host = "https://elastic:#{password}@#{uri.host}:#{uri.port}".freeze
+      transport_options = { ssl: { verify: false, client_cert: certificate, client_key: key, ca_file: ca_file } }
+    else
+      host = "http://elastic:#{password}@#{uri.host}:#{uri.port}".freeze
+      transport_options = {}
+    end
 
-  ADMIN_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+    ADMIN_CLIENT = Elasticsearch::Client.new(host: host, transport_options: transport_options)
 
-  if ENV['QUIET'] == 'true'
-    DEFAULT_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+    DEFAULT_CLIENT = if ENV['QUIET'] == 'true'
+                       Elasticsearch::Client.new(host: host, transport_options: transport_options)
+                     else
+                       Elasticsearch::Client.new(
+                         host: host,
+                         tracer: Logger.new($stdout),
+                         transport_options: transport_options
+                       )
+                     end
+
+    if ENV['QUIET'] == 'true'
+      DEFAULT_CLIENT = Elasticsearch::Client.new(
+        host: URL,
+        transport_options: TRANSPORT_OPTIONS,
+        user: user,
+        password: password
+      )
+    else
+      DEFAULT_CLIENT = Elasticsearch::Client.new(
+        host: URL,
+        transport_options: TRANSPORT_OPTIONS,
+        user: user,
+        password: password,
+        tracer: Logger.new($stdout)
+      )
+    end
   else
-    DEFAULT_CLIENT = Elasticsearch::Client.new(host: URL,
-                                               transport_options: TRANSPORT_OPTIONS,
-                                               tracer: Logger.new($stdout))
+    ADMIN_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+
+    if ENV['QUIET'] == 'true'
+      DEFAULT_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+    else
+      DEFAULT_CLIENT = Elasticsearch::Client.new(host: URL,
+                                                 transport_options: TRANSPORT_OPTIONS,
+                                                 tracer: Logger.new($stdout))
+    end
   end
 end
 
-YAML_FILES_DIRECTORY = "#{PROJECT_PATH}/../tmp/rest-api-spec/test/free"
+YAML_FILES_DIRECTORY = "#{PROJECT_PATH}/../tmp/rest-api-spec/#{STACK_VERSION.match?(/^8\./) ? 'compatTest' : 'test'}/free"
 
 SINGLE_TEST = if ENV['SINGLE_TEST'] && !ENV['SINGLE_TEST'].empty?
                 test_target = ENV['SINGLE_TEST']

data/spec/spec_helper.rb

@@ -25,6 +25,10 @@ else
   require 'pry-byebug'
 end
 require 'ansi'
+require 'yaml'
+require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
+require 'jbuilder'
+require 'jsonify'
 require 'elasticsearch'
 require 'elasticsearch-api'
 require 'elasticsearch-transport'
@@ -67,7 +71,7 @@ end
 RSpec.configure do |config|
   config.include(HelperModule)
   config.formatter = 'documentation'
-  config.color = true
+  config.color_mode = :on
   config.add_formatter('RspecJunitFormatter', 'tmp/elasticsearch-api-junit.xml')
 end
 

data/utils/thor/.rubocop.yml

@@ -1,2 +1,4 @@
 Layout/EndAlignment:
   AutoCorrect: true
+Metrics/LineLength:
+  Max: 160

data/utils/thor/generate_source.rb

@@ -148,6 +148,7 @@ module Elasticsearch
 
       def __http_method
         return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+        return post_and_get if @endpoint_name == 'count'
 
         default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
         if @spec['body'] && default_method == 'GET'
@@ -155,19 +156,23 @@ module Elasticsearch
           if @spec['body']['required']
             'Elasticsearch::API::HTTP_POST'
           else
-            <<~SRC
-              if arguments[:body]
-                Elasticsearch::API::HTTP_POST
-              else
-                Elasticsearch::API::HTTP_GET
-              end
-            SRC
+            post_and_get
           end
         else
           "Elasticsearch::API::HTTP_#{default_method}"
         end
       end
 
+      def post_and_get
+        <<~SRC
+          if arguments[:body]
+            Elasticsearch::API::HTTP_POST
+          else
+            Elasticsearch::API::HTTP_GET
+          end
+        SRC
+      end
+
       def __http_path
         return "\"#{__parse_path(@paths.first)}\"" if @paths.size == 1
         return termvectors_path if @method_name == 'termvectors'
@@ -194,9 +199,9 @@ module Elasticsearch
 
       def __parse_path(path)
         path.gsub(/^\//, '')
-            .gsub(/\/$/, '')
-            .gsub('{', "\#{#{__utils}.__listify(_")
-            .gsub('}', ')}')
+          .gsub(/\/$/, '')
+          .gsub('{', "\#{#{__utils}.__listify(_")
+          .gsub('}', ')}')
       end
 
       def __path_variables
@@ -291,7 +296,7 @@ module Elasticsearch
       end
 
       def __utils
-        (@current_api == :xpack) ? 'Elasticsearch::API::Utils' : 'Utils'
+        @current_api == :xpack ? 'Elasticsearch::API::Utils' : 'Utils'
       end
 
       def run_rubocop(api)

data/utils/thor/generator/endpoint_specifics.rb

@@ -27,6 +27,7 @@ module Elasticsearch
         exists
         indices.exists
         indices.exists_alias
+        indices.exists_index_template
         indices.exists_template
         indices.exists_type
       ].freeze
@@ -37,8 +38,9 @@ module Elasticsearch
         delete
         get
         indices.flush_synced
-        indices.delete_template
         indices.delete
+        indices.delete_index_template
+        indices.delete_template
         security.get_role
         security.get_user
         snapshot.status

data/utils/thor/templates/_perform_request.erb

@@ -34,7 +34,7 @@ when 'mtermvectors'
 <%- end -%>
 <%- if ['bulk', 'msearch', 'msearch_template', 'find_structure'].include? @method_name -%>
   <%= self.send("#{@method_name}_body_helper".to_s) %>
-  headers.merge!("Content-Type" => "application/x-ndjson")
+  headers = <%= __utils %>.ndjson_headers(headers)
   <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, headers).body
 <%- elsif @method_name == 'ping' -%>
   <%= ping_perform_request %>