elasticsearch-api 7.8.1 → 7.9.0.pre

data/spec/elasticsearch/api/actions/indices/validate_query_spec.rb

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client.cluster#validate_query' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      method,
+      url,
+      params,
+      body,
+      {}
     ]
   end
+  let(:method) { 'GET' }
 
   let(:url) do
     '_validate/query'
@@ -46,7 +46,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when an index is specified' do
-
     let(:url) do
       'foo/_validate/query'
     end
@@ -57,7 +56,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when a type and index are specified' do
-
     let(:url) do
       'foo/bar/_validate/query'
     end
@@ -68,7 +66,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when multiple indicies are specified as a list' do
-
     let(:url) do
       'foo,bar/_validate/query'
     end
@@ -79,7 +76,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when multiple indicies are specified as a string' do
-
     let(:url) do
       'foo,bar/_validate/query'
     end
@@ -90,7 +86,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when parameters are specified' do
-
     let(:params) do
       { explain: true, q: 'foo' }
     end
@@ -105,10 +100,10 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when a body is specified' do
-
     let(:body) do
       { filtered: {} }
     end
+    let(:method) { 'POST' }
 
     it 'performs the request' do
       expect(client_double.indices.validate_query(body: { filtered: {} })).to eq({})
@@ -116,7 +111,6 @@ describe 'client.cluster#validate_query' do
   end
 
   context 'when the path needs to be URL-escaped' do
-
     let(:url) do
       'foo%5Ebar/_validate/query'
     end

data/spec/elasticsearch/api/actions/ingest/simulate_spec.rb

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client.ingest#simulate' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        {},
-        {},
-        {}
+      method,
+      url,
+      {},
+      {},
+      {}
     ]
   end
+  let(:method) { 'POST' }
 
   let(:url) do
     '_ingest/pipeline/_simulate'
@@ -38,7 +38,6 @@ describe 'client.ingest#simulate' do
   end
 
   context 'when a pipeline id is provided' do
-
     let(:url) do
       '_ingest/pipeline/foo/_simulate'
     end

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

@@ -18,16 +18,14 @@
 require 'spec_helper'
 
 describe 'JSON builders' do
-
   context 'JBuilder' do
-
     let(:expected_args) do
       [
-          'GET',
-          '_search',
-          {},
-          body,
-          {}
+        'POST',
+        '_search',
+        {},
+        body,
+        {}
       ]
     end
 
@@ -53,14 +51,13 @@ describe 'JSON builders' do
   end
 
   context 'Jsonify' do
-
     let(:expected_args) do
       [
-          'GET',
-          '_search',
-          {},
-          body,
-          {}
+        'POST',
+        '_search',
+        {},
+        body,
+        {}
       ]
     end
 

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

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#mget' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      'POST',
+      url,
+      params,
+      body,
+      {}
     ]
   end
 

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

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#msearch' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        headers
+      'POST',
+      url,
+      params,
+      body,
+      headers
     ]
   end
 

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

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#msearch_template' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        headers
+      'POST',
+      url,
+      params,
+      body,
+      headers
     ]
   end
 

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

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client#mtermvectors' do
-
   let(:expected_args) do
     [
-        'GET',
-        'my-index/my-type/_mtermvectors',
-        {},
-        body,
-        {}
+      method,
+      'my-index/my-type/_mtermvectors',
+      {},
+      body,
+      {}
     ]
   end
+  let(:method) { 'POST' }
 
   let(:body) do
     { ids: [1, 2, 3] }
@@ -38,7 +38,7 @@ describe 'client#mtermvectors' do
   end
 
   context 'when a list of ids is passed instead of a body' do
-
+    let(:method) { 'GET' }
     it 'performs the request' do
       expect(client_double.mtermvectors(index: 'my-index', type: 'my-type', ids: [1, 2, 3])).to eq({})
     end

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

@@ -21,7 +21,7 @@ describe 'client#render_search_template' do
   context 'when no id is specified' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_render/template',
         {},
         { foo: 'bar' },
@@ -37,7 +37,7 @@ describe 'client#render_search_template' do
   context 'when id is specified' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_render/template/foo',
         {},
         { foo: 'bar' },

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

@@ -37,7 +37,7 @@ describe 'client#scroll' do
   context 'with scroll_id in the body' do
     let(:expected_args) do
       [
-        'GET',
+        'POST',
         '_search/scroll',
         {},
         { scroll_id: 'cXVlcn...' },

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

@@ -18,16 +18,16 @@
 require 'spec_helper'
 
 describe 'client#search' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      method,
+      url,
+      params,
+      body,
+      {}
     ]
   end
+  let(:method) { 'GET' }
 
   let(:body) do
     nil
@@ -46,10 +46,10 @@ describe 'client#search' do
   end
 
   context 'when a request definition is specified' do
-
     let(:body) do
       { query: { match: {} } }
     end
+    let(:method) { 'POST' }
 
     let(:url) do
       '_search'

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

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#search_template' do
-
   let(:expected_args) do
     [
-        'GET',
-        'foo/_search/template',
-        { },
-        { foo: 'bar' },
-        {}
+      'POST',
+      'foo/_search/template',
+      { },
+      { foo: 'bar' },
+      {}
     ]
   end
 

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

@@ -18,14 +18,13 @@
 require 'spec_helper'
 
 describe 'client#termvectors' do
-
   let(:expected_args) do
     [
-        'GET',
-        url,
-        params,
-        body,
-        {}
+      'POST',
+      url,
+      params,
+      body,
+      {}
     ]
   end
 
@@ -56,7 +55,6 @@ describe 'client#termvectors' do
   end
 
   context 'when the older api name \'termvector\' is used' do
-
     let(:url) do
       'foo/bar/123/_termvector'
     end

data/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -52,7 +52,6 @@ describe 'Rest API YAML tests' do
                   end
                 end
               else
-
                 # 'match' is in the task group definition
                 if task_group.has_match_clauses?
                   task_group.match_clauses.each do |match|

data/utils/thor/.rubocop.yml

@@ -0,0 +1,2 @@
+Layout/EndAlignment:
+  AutoCorrect: true

data/utils/thor/generate_source.rb

@@ -50,6 +50,7 @@ module Elasticsearch
       method_option :verbose, type: :boolean, default: false,  desc: 'Output more information'
       method_option :tests,   type: :boolean, default: false,  desc: 'Generate test files'
       method_option :api,     type: :array,   default: %w[oss xpack], desc: 'APIs to generate (oss, x-pack)'
+
       def generate
         self.class.source_root File.expand_path(__dir__)
         @xpack = options[:api].include? 'xpack'
@@ -113,12 +114,13 @@ module Elasticsearch
         names = @endpoint_name.split('.')
         if @current_api == :xpack
           names = (names.first == 'xpack' ? names : ['xpack', names].flatten)
-          # Return an array with 'ml' renamed to 'machine_learning' and 'ilm' to
-          # 'index_lifecycle_management'
+          # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
           names.map do |name|
             name
               .gsub(/^ml$/, 'machine_learning')
               .gsub(/^ilm$/, 'index_lifecycle_management')
+              .gsub(/^ccr/, 'cross_cluster_replication')
+              .gsub(/^slm/, 'snapshot_lifecycle_management')
           end
         else
           names
@@ -146,19 +148,24 @@ module Elasticsearch
       end
 
       def __http_method
-        case @endpoint_name
-        when 'index'
-          '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST'
-        when 'count'
-          <<~SRC
-            if arguments[:body]
-              Elasticsearch::API::HTTP_POST
-            else
-              Elasticsearch::API::HTTP_GET
-            end
-          SRC
+        return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+
+        default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
+        if @spec['body'] && default_method == 'GET'
+          # When default method is GET and body is required, we should always use POST
+          if @spec['body']['required']
+            'Elasticsearch::API::HTTP_POST'
+          else
+            <<~SRC
+              if arguments[:body]
+                Elasticsearch::API::HTTP_POST
+              else
+                Elasticsearch::API::HTTP_GET
+              end
+            SRC
+          end
         else
-          "Elasticsearch::API::HTTP_#{@spec['url']['paths'].map { |a| a['methods'] }.flatten.first}"
+          "Elasticsearch::API::HTTP_#{default_method}"
         end
       end
 
@@ -222,38 +229,12 @@ module Elasticsearch
         info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings'
         tipo = info['type'] ? info['type'].capitalize : 'String'
         description = info['description'] ? info['description'].strip : '[TODO]'
-        options = info['options'] ? "\n    #   (options: #{info['options'].join(', '.strip)})" : nil
+        options = info['options'] ? "\n    #   (options: #{info['options'].join(', '.strip)})\n" : ''
         required = info['required'] ? ' (*Required*)' : ''
         deprecated = info['deprecated'] ? ' *Deprecated*' : ''
         "# @option arguments [#{tipo}] :#{name} #{description} #{required} #{deprecated} #{options}\n"
       end
 
-      def stability_doc_helper(stability)
-        return if stability == 'stable'
-
-        if stability == 'experimental'
-          <<~MSG
-            # This functionality is Experimental and may be changed or removed
-            # completely in a future release. Elastic will take a best effort approach
-            # to fix any issues, but experimental features are not subject to the
-            # support SLA of official GA features.
-          MSG
-        elsif stability == 'beta'
-          <<~MSG
-            # This functionality is in Beta and is subject to change. The design and
-            # code is less mature than official GA features and is being provided
-            # as-is with no warranties. Beta features are not subject to the support
-            # SLA of official GA features.
-          MSG
-        else
-          <<~MSG
-            # This functionality is subject to potential breaking changes within a
-            # minor version, meaning that your referencing code may break when this
-            # library is upgraded.
-          MSG
-        end
-      end
-
       def generate_tests
         copy_file 'templates/test_helper.rb', @output.join('test').join('test_helper.rb')
 
@@ -286,7 +267,7 @@ module Elasticsearch
       end
 
       def run_rubocop(api)
-        system("rubocop --format autogenconf -x #{FilesHelper::output_dir(api)}")
+        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir(api)}")
       end
     end
   end