elasticsearch-api 8.0.0.pre1 → 8.1.2

data/spec/elasticsearch/api/utils_spec.rb

@@ -28,7 +28,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
@@ -36,18 +36,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
@@ -73,7 +61,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
@@ -100,19 +88,19 @@ describe Elasticsearch::API::Utils do
     context 'when the input is an array of hashes' 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
 
@@ -316,7 +304,7 @@ describe Elasticsearch::API::Utils do
       end
 
       let(:unsupported_params) do
-        [ { :foo => { :explanation => 'NOT_SUPPORTED'} }, :moo ]
+        [ { foo: { explanation: 'NOT_SUPPORTED'} }, :moo ]
       end
 
 

data/spec/skipped_tests_free.yml

@@ -22,3 +22,11 @@
 -
   :file:        'indices.get_alias/10_basic.yml'
   :description: 'Get alias against closed indices'
+
+# https://github.com/elastic/elasticsearch-ruby/issues/1563
+-
+  :file:        'tsdb/80_index_resize.yml'
+  :description: 'shrink'
+-
+  :file:        'tsdb/80_index_resize.yml'
+  :description: 'clone'

data/spec/spec_helper.rb

@@ -25,6 +25,7 @@ else
   require 'pry-byebug'
 end
 require 'yaml'
+require 'active_support/isolated_execution_state' unless RUBY_VERSION < '2.7.0'
 require 'jbuilder'
 require 'jsonify'
 require 'elasticsearch'

data/spec/unit_tests_platinum/unit/security/oidc_authenticate_test.rb

@@ -0,0 +1,40 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class SecurityOidcAuthenticateTest < Minitest::Test
+      context 'Security: OIDC Authenticate' do
+        subject { FakeClient.new }
+
+        should 'perform correct request' do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal('POST', method)
+            assert_equal('_security/oidc/authenticate', url)
+            assert_equal({}, params)
+            assert_equal(body, {})
+            true
+          end.returns(FakeResponse.new)
+
+          subject.security.oidc_authenticate(body: {})
+        end
+      end
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/security/oidc_logout_test.rb

@@ -0,0 +1,40 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class SecurityOidcLogoutTest < Minitest::Test
+      context 'Security: OIDC Logout' do
+        subject { FakeClient.new }
+
+        should 'perform correct request' do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal('POST', method)
+            assert_equal('_security/oidc/logout', url)
+            assert_equal({}, params)
+            assert_equal(body, {})
+            true
+          end.returns(FakeResponse.new)
+
+          subject.security.oidc_logout(body: {})
+        end
+      end
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/security/oidc_prepare_authentication_test.rb

@@ -0,0 +1,40 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    class SecurityOidcPrepareAuthenticationTest < Minitest::Test
+      context 'Security: OIDC Prepare_Authentication' do
+        subject { FakeClient.new }
+
+        should 'perform correct request' do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal('POST', method)
+            assert_equal('_security/oidc/prepare', url)
+            assert_equal({}, params)
+            assert_equal(body, {})
+            true
+          end.returns(FakeResponse.new)
+
+          subject.security.oidc_prepare_authentication(body: {})
+        end
+      end
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/transform/reset_transform_spec.rb

@@ -0,0 +1,34 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+
+describe 'client.transform#reset_transform' do
+  let(:expected_args) do
+    [
+      'POST',
+      '_transform/1/_reset',
+      {},
+      nil,
+      {}
+    ]
+  end
+
+  it 'performs the request' do
+    expect(client_double.transform.reset_transform(transform_id: 1)).to be_a Elasticsearch::API::Response
+  end
+end

data/utils/README.md

@@ -18,6 +18,11 @@ $ thor code:generate
 
 - The Ruby code will be generated in `elasticsearch-api/lib/elasticsearch/api/actions`.
 - The generator runs Rubocop to autolint and clean up the generated files.
+- You can use the environment variable `IGNORE_VERSION` to ignore the current version of the client when generating the source code documentation urls. This is currently used when generating code from `main`:
+
+```bash
+$ IGNORE_VERSION=true thor code:generate
+```
 
 ### Development
 

data/utils/thor/generate_source.rb

@@ -74,6 +74,10 @@ module Elasticsearch
           @full_namespace   = __full_namespace
           @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size - 1 : 0
           @module_namespace = @full_namespace[0, @namespace_depth]
+
+          # Don't generate code for internal APIs:
+          next if @module_namespace.flatten.first == '_internal'
+
           @method_name      = @full_namespace.last
           @parts            = __endpoint_parts
           @params           = @spec['params'] || {}
@@ -136,6 +140,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'
@@ -143,20 +148,24 @@ module Elasticsearch
           if @spec['body']['required']
             'Elasticsearch::API::HTTP_POST'
           else
-            # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
-            <<~SRC
-              if 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
+        # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
+        <<~SRC
+          if 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
 
@@ -182,9 +191,9 @@ module Elasticsearch
 
       def __parse_path(path)
         path.gsub(/^\//, '')
-            .gsub(/\/$/, '')
-            .gsub('{', "\#{Utils.__listify(_")
-            .gsub('}', ')}')
+          .gsub(/\/$/, '')
+          .gsub('{', "\#{Utils.__listify(_")
+          .gsub('}', ')}')
       end
 
       def __path_variables

data/utils/thor/generator/files_helper.rb

@@ -49,7 +49,7 @@ module Elasticsearch
         regex = /([0-9]{1,2}\.[0-9x]{1,2})/
         version = Elasticsearch::API::VERSION.match(regex)[0]
         # TODO - How do we fix this so it doesn't depend on which branch we're running from
-        if version == '8.0'
+        if ENV['IGNORE_VERSION']
           documentation_url
         else
           documentation_url.gsub(/\/(current|master|main)\//, "/#{version}/")

data/utils/thor/templates/_method_setup.erb

@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 %>
-<%= '  '*(@namespace_depth+4) %>arguments = arguments.clone
 <%- if @method_name == 'search' -%>
   arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
 <%- end -%>

data/utils/thor/templates/method.erb

@@ -33,12 +33,14 @@ module Elasticsearch
   <%= '  '*(@namespace_depth+2) %>end
 <%- else -%>
   <%- if @method_name == 'get_field_mapping' %>
+    arguments = arguments.clone
     _fields = arguments.delete(:field) || arguments.delete(:fields)
     raise ArgumentError, "Required argument 'field' missing" unless _fields
   <%- else -%>
     <%- @required_parts.each do |required| %><%# Arguments -%>
       <%= '  '*(@namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
+    arguments = arguments.clone
     <%- end -%>
     headers = arguments.delete(:headers) || {}
     <%- #Body %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre1
+  version: 8.1.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: escape_utils
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -414,6 +428,8 @@ files:
 - lib/elasticsearch/api/actions/features/reset_features.rb
 - lib/elasticsearch/api/actions/field_caps.rb
 - lib/elasticsearch/api/actions/fleet/global_checkpoints.rb
+- lib/elasticsearch/api/actions/fleet/msearch.rb
+- lib/elasticsearch/api/actions/fleet/search.rb
 - lib/elasticsearch/api/actions/get.rb
 - lib/elasticsearch/api/actions/get_script.rb
 - lib/elasticsearch/api/actions/get_script_context.rb
@@ -534,6 +550,7 @@ files:
 - lib/elasticsearch/api/actions/machine_learning/get_influencers.rb
 - lib/elasticsearch/api/actions/machine_learning/get_job_stats.rb
 - lib/elasticsearch/api/actions/machine_learning/get_jobs.rb
+- lib/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats.rb
 - lib/elasticsearch/api/actions/machine_learning/get_model_snapshots.rb
 - lib/elasticsearch/api/actions/machine_learning/get_overall_buckets.rb
 - lib/elasticsearch/api/actions/machine_learning/get_records.rb
@@ -647,6 +664,9 @@ files:
 - lib/elasticsearch/api/actions/security/has_privileges.rb
 - lib/elasticsearch/api/actions/security/invalidate_api_key.rb
 - lib/elasticsearch/api/actions/security/invalidate_token.rb
+- lib/elasticsearch/api/actions/security/oidc_authenticate.rb
+- lib/elasticsearch/api/actions/security/oidc_logout.rb
+- lib/elasticsearch/api/actions/security/oidc_prepare_authentication.rb
 - lib/elasticsearch/api/actions/security/put_privileges.rb
 - lib/elasticsearch/api/actions/security/put_role.rb
 - lib/elasticsearch/api/actions/security/put_role_mapping.rb
@@ -700,6 +720,7 @@ files:
 - lib/elasticsearch/api/actions/transform/get_transform_stats.rb
 - lib/elasticsearch/api/actions/transform/preview_transform.rb
 - lib/elasticsearch/api/actions/transform/put_transform.rb
+- lib/elasticsearch/api/actions/transform/reset_transform.rb
 - lib/elasticsearch/api/actions/transform/start_transform.rb
 - lib/elasticsearch/api/actions/transform/stop_transform.rb
 - lib/elasticsearch/api/actions/transform/update_transform.rb
@@ -806,6 +827,8 @@ files:
 - spec/elasticsearch/api/actions/features/reset_features_spec.rb
 - spec/elasticsearch/api/actions/field_caps_spec.rb
 - spec/elasticsearch/api/actions/fleet/global_checkpoints_spec.rb
+- spec/elasticsearch/api/actions/fleet/msearch_spec.rb
+- spec/elasticsearch/api/actions/fleet/search_spec.rb
 - spec/elasticsearch/api/actions/get_document_source_spec.rb
 - spec/elasticsearch/api/actions/get_document_spec.rb
 - spec/elasticsearch/api/actions/get_script_spec.rb
@@ -858,6 +881,7 @@ files:
 - spec/elasticsearch/api/actions/ingest/put_pipeline_spec.rb
 - spec/elasticsearch/api/actions/ingest/simulate_spec.rb
 - spec/elasticsearch/api/actions/json_builders_spec.rb
+- spec/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/get_trained_model_deployment_stats_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/infer_trained_model_deployment_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part_spec.rb
@@ -1045,12 +1069,16 @@ files:
 - spec/unit_tests_platinum/unit/security/grant_api_key_test.rb
 - spec/unit_tests_platinum/unit/security/has_privileges_test.rb
 - spec/unit_tests_platinum/unit/security/invalidate_token_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_authenticate_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_logout_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_prepare_authentication_test.rb
 - spec/unit_tests_platinum/unit/security/put_privileges_test.rb
 - spec/unit_tests_platinum/unit/security/put_role_mapping_test.rb
 - spec/unit_tests_platinum/unit/security/put_role_test.rb
 - spec/unit_tests_platinum/unit/security/put_user_test.rb
 - spec/unit_tests_platinum/unit/ssl/certificates_test.rb
 - spec/unit_tests_platinum/unit/text_structure/find_structure_test.rb
+- spec/unit_tests_platinum/unit/transform/reset_transform_spec.rb
 - spec/unit_tests_platinum/unit/transform/upgrade_transforms_spec.rb
 - spec/unit_tests_platinum/unit/usage_test.rb
 - spec/unit_tests_platinum/unit/watcher/ack_watch_test.rb
@@ -1099,11 +1127,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby API for Elasticsearch.
@@ -1155,6 +1183,8 @@ test_files:
 - spec/elasticsearch/api/actions/features/reset_features_spec.rb
 - spec/elasticsearch/api/actions/field_caps_spec.rb
 - spec/elasticsearch/api/actions/fleet/global_checkpoints_spec.rb
+- spec/elasticsearch/api/actions/fleet/msearch_spec.rb
+- spec/elasticsearch/api/actions/fleet/search_spec.rb
 - spec/elasticsearch/api/actions/get_document_source_spec.rb
 - spec/elasticsearch/api/actions/get_document_spec.rb
 - spec/elasticsearch/api/actions/get_script_spec.rb
@@ -1207,6 +1237,7 @@ test_files:
 - spec/elasticsearch/api/actions/ingest/put_pipeline_spec.rb
 - spec/elasticsearch/api/actions/ingest/simulate_spec.rb
 - spec/elasticsearch/api/actions/json_builders_spec.rb
+- spec/elasticsearch/api/actions/machine_learning/get_model_snapshot_upgrade_stats_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/get_trained_model_deployment_stats_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/infer_trained_model_deployment_spec.rb
 - spec/elasticsearch/api/actions/machine_learning/put_trained_model_definition_part_spec.rb
@@ -1394,12 +1425,16 @@ test_files:
 - spec/unit_tests_platinum/unit/security/grant_api_key_test.rb
 - spec/unit_tests_platinum/unit/security/has_privileges_test.rb
 - spec/unit_tests_platinum/unit/security/invalidate_token_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_authenticate_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_logout_test.rb
+- spec/unit_tests_platinum/unit/security/oidc_prepare_authentication_test.rb
 - spec/unit_tests_platinum/unit/security/put_privileges_test.rb
 - spec/unit_tests_platinum/unit/security/put_role_mapping_test.rb
 - spec/unit_tests_platinum/unit/security/put_role_test.rb
 - spec/unit_tests_platinum/unit/security/put_user_test.rb
 - spec/unit_tests_platinum/unit/ssl/certificates_test.rb
 - spec/unit_tests_platinum/unit/text_structure/find_structure_test.rb
+- spec/unit_tests_platinum/unit/transform/reset_transform_spec.rb
 - spec/unit_tests_platinum/unit/transform/upgrade_transforms_spec.rb
 - spec/unit_tests_platinum/unit/usage_test.rb
 - spec/unit_tests_platinum/unit/watcher/ack_watch_test.rb