elasticsearch-api 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407d4a1f46709e2d53317b770526ba0c4e10fa81a0f719790706a7d741058a6c
-  data.tar.gz: 2e3f20e4a4c426603b0c9df4ad45dea1282a7910460a17f85dd41ec7ef7d6b80
+  metadata.gz: 3106c24df61c9a6eaaab2649d67ce9b79352a3630a005dce0632df24af432bac
+  data.tar.gz: e55d31a5e5927af455c3c9094e4d2eedbff32fe7330897f7b9e5c41cb3fb78e6
 SHA512:
-  metadata.gz: 623a6efb4e7e2dc07dd91eaf929c71fd3086e907a9ab9dde612f2f9c78edd977b19c97d149047caad1719d4011343e0fa532c1974701cbf91873deb3febe746c
-  data.tar.gz: 7efff58c051a64d4bb8ca01ae0fc27252a7d9ac756855132fa7e656949a2e8299129a05f2918838ae6f5ceddba8eee4052d228db093870fbe6282f0837a87c2f
+  metadata.gz: f57598b93eb448b9e8ec7cbbab502b0b22bf03886ed21ffb003b01a39420f6941109d73fc31e3f4d50a71ce844170d084b790e3121141b2d7140afb4774bcd0d
+  data.tar.gz: 8cff3ba9a927a9c9bb58f86ccd836469daaa8cf1207808b157dc2b78c012b3b8a5738fb5da1359baeeaa3f22cafe694a6ae27a0f47d8228ed7a71804dc3c927f

data/README.md

@@ -23,6 +23,7 @@ just use a release matching major version of Elasticsearch.
 | 2.x           | → | 2.x           |
 | 5.x           | → | 5.x           |
 | 6.x           | → | 6.x           |
+| 7.x           | → | 7.x           |
 | master        | → | master        |
 
 ## Installation

data/Rakefile

@@ -40,11 +40,17 @@ namespace :test do
     sh '../scripts/wait-cluster.sh'
   end
 
-  RSpec::Core::RakeTask.new(:spec)
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.exclude_pattern = 'spec/**{,/*/**}/rest_api_yaml_spec.rb'
+  end
+
+  RSpec::Core::RakeTask.new(:rest_api) do |t|
+    t.pattern = 'spec/**{,/*/**}/rest_api_yaml_spec.rb'
+  end
 
   desc "Update the repository with YAML tests"
   task :update do
-    git_specs "fetch origin --verbose", :verbose => true
+    git_specs "fetch origin", :verbose => true
   end
 
   Rake::TestTask.new(:unit) do |test|
@@ -56,7 +62,7 @@ namespace :test do
   end
 
   desc "Run integration tests"
-  task :integration => :wait_for_green do
+  task :integration => :update do
     require 'elasticsearch'
 
     branches = `git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} branch --no-color`
@@ -73,15 +79,6 @@ namespace :test do
       current_branch = 'master'
     end
 
-    # Define the task
-    t = Rake::TestTask.new(:integration) do |test|
-      test.deps = [ :wait_for_green ]
-      test.libs << 'lib' << 'test'
-      test.test_files = FileList["test/integration/yaml_test_runner.rb", "test/integration/**/*_test.rb"]
-      test.verbose = false
-      test.warning = false
-    end
-
     # Check if a test cluster is running
     begin
       url = ENV['TEST_CLUSTER_URL'] || ENV['TEST_ES_SERVER']
@@ -116,16 +113,7 @@ namespace :test do
         git_specs "checkout #{checkout_build_hash} --force --quiet"
       end
 
-      # Run the task
-      args = [t.ruby_opts_string, t.run_code, t.file_list_string, t.option_list].join(' ')
-
-      ruby args do |ok, status|
-        if !ok && status.respond_to?(:signaled?) && status.signaled?
-          raise SignalException.new(status.termsig)
-        elsif !ok
-          fail "Command failed with status (#{status.exitstatus}): " + "[ruby #{args}]"
-        end
-      end
+      Rake::Task['test:rest_api'].invoke
 
     ensure
       git_specs "checkout #{current_branch} --force --quiet" if checkout_specs_version && current_branch

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

@@ -50,7 +50,8 @@ module Elasticsearch
           :fields,
           :ignore_unavailable,
           :allow_no_indices,
-          :expand_wildcards ].freeze)
+          :expand_wildcards,
+          :include_unmapped ].freeze)
     end
   end
 end

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

@@ -69,9 +69,7 @@ module Elasticsearch
 
         params[:fields] = Utils.__listify(params[:fields]) if params[:fields]
 
-        Utils.__rescue_from_not_found do
-          perform_request(method, path, params, body).body
-        end
+        perform_request(method, path, params, body).body
       end
 
       # Register this action with its valid params when the module is loaded.

data/lib/elasticsearch/api/actions/indices/stats.rb

@@ -120,7 +120,9 @@ module Elasticsearch
             :ignore_unavailable,
             :allow_no_indices,
             :expand_wildcards,
-            :include_segment_file_sizes ].freeze)
+            :include_segment_file_sizes,
+            :include_unloaded_segments,
+            :forbid_closed_indices ].freeze)
 
         # Register this action with its valid parts when the module is loaded.
         #

data/lib/elasticsearch/api/actions/indices/upgrade.rb

@@ -44,6 +44,7 @@ module Elasticsearch
         #
         # @since 6.1.1
         ParamsRegistry.register(:upgrade, [
+            :index,
             :allow_no_indices,
             :expand_wildcards,
             :ignore_unavailable,

data/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = "7.1.0"
+    VERSION = "7.2.0"
   end
 end

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

@@ -91,8 +91,10 @@ describe 'client#get_source' do
       expect(client).to receive(:perform_request).and_raise(NotFound)
     end
 
-    it 'returns false' do
-      expect(client.get_source(index: 'foo', id: '1')).to eq(false)
+    it 'raises the error' do
+      expect {
+        client.get_source(index: 'foo', id: '1')
+      }.to raise_exception(NotFound)
     end
   end
 end

data/spec/elasticsearch/api/rest_api_yaml_spec.rb

@@ -0,0 +1,164 @@
+# 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'
+require 'rest_yaml_tests_helper'
+
+describe 'Rest API YAML tests' do
+
+  REST_API_YAML_FILES.each do |file|
+
+    test_file = Elasticsearch::RestAPIYAMLTests::TestFile.new(file, REST_API_YAML_SKIP_FEATURES)
+
+    context "#{file.gsub("#{YAML_FILES_DIRECTORY}/", '')}" do
+
+      test_file.tests.each do |test|
+
+        context "#{test.description}" do
+
+          if test.skip_test?(ADMIN_CLIENT)
+            skip 'Test contains feature(s) not yet support or version is not satisfied'
+
+          else
+
+            let(:client) do
+              DEFAULT_CLIENT
+            end
+
+            # Runs once before each test in a test file
+            before(:all) do
+              # Runs once before each test in a test file
+              Elasticsearch::RestAPIYAMLTests::TestFile.clear_data(ADMIN_CLIENT)
+              test_file.setup(ADMIN_CLIENT)
+            end
+
+            after(:all) do
+              test_file.teardown(ADMIN_CLIENT)
+              Elasticsearch::RestAPIYAMLTests::TestFile.clear_data(ADMIN_CLIENT)
+            end
+
+            test.task_groups.each do |task_group|
+
+              before do
+                task_group.run(client)
+              end
+
+              # 'catch' is in the task group definition
+              if task_group.catch_exception?
+
+                it 'sends the request and throws the expected error' do
+                  expect(task_group.exception).to match_error(task_group.expected_exception_message)
+                end
+
+                # 'match' on error description is in the task group definition
+                if task_group.has_match_clauses?
+
+                  task_group.match_clauses.each do |match|
+                    it 'contains the expected error in the request response' do
+                      expect(task_group.exception.message).to match(Regexp.new(Regexp.escape(match['match'].values.first.to_s)))
+                    end
+                  end
+                end
+              else
+
+                # 'match' is in the task group definition
+                if task_group.has_match_clauses?
+
+                  task_group.match_clauses.each do |match|
+                    it "has the expected value (#{match['match'].values.join(',')}) in the response field (#{match['match'].keys.join(',')})" do
+                      expect(task_group.response).to match_response(match['match'], test)
+                    end
+                  end
+                end
+
+                # 'length' is in the task group definition
+                if task_group.has_length_match_clauses?
+
+                  task_group.length_match_clauses.each do |match|
+                    it "the '#{match['length'].keys.join(',')}' field have the expected length" do
+                      expect(task_group.response).to match_response_field_length(match['length'], test)
+                    end
+                  end
+                end
+
+                # 'is_true' is in the task group definition
+                if task_group.has_true_clauses?
+
+                  task_group.true_clauses.each do |match|
+                    it "sends the request and the '#{match['is_true']}' field is set to true" do
+                      expect(task_group.response).to match_true_field(match['is_true'], test)
+                    end
+                  end
+                end
+
+                # 'is_false' is in the task group definition
+                if task_group.has_false_clauses?
+
+                  task_group.false_clauses.each do |match|
+                    it "sends the request and the '#{match['is_false']}' field is set to true" do
+                      expect(task_group.response).to match_false_field(match['is_false'], test)
+                    end
+                  end
+                end
+
+                # 'gte' is in the task group definition
+                if task_group.has_gte_clauses?
+
+                  task_group.gte_clauses.each do |match|
+                    it "sends the request and the '#{match['gte']}' field is greater than or equal to the expected value" do
+                      expect(task_group.response).to match_gte_field(match['gte'], test)
+                    end
+                  end
+                end
+
+                # 'gt' is in the task group definition
+                if task_group.has_gt_clauses?
+
+                  task_group.gt_clauses.each do |match|
+                    it "sends the request and the '#{match['gt']}' field is greater than the expected value" do
+                      expect(task_group.response).to match_gt_field(match['gt'], test)
+                    end
+                  end
+                end
+
+                # 'lte' is in the task group definition
+                if task_group.has_lte_clauses?
+
+                  task_group.lte_clauses.each do |match|
+                    it "sends the request and the '#{match['lte']}' field is less than or equal to the expected value" do
+                      expect(task_group.response).to match_lte_field(match['lte'], test)
+                    end
+                  end
+                end
+
+                # 'lt' is in the task group definition
+                if task_group.has_lt_clauses?
+
+                  task_group.lt_clauses.each do |match|
+                    it "sends the request and the '#{match['lt']}' field is less than the expected value" do
+                      expect(task_group.response).to match_lt_field(match['lt'], test)
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/elasticsearch/api/utils_spec.rb

@@ -44,7 +44,7 @@ describe Elasticsearch::API::Utils do
       expect(utils.__escape('foo bar')).to eq('foo+bar')
     end
 
-    it 'uses the escape_utils gem when available', unless: JRUBY do
+    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

data/spec/rest_yaml_tests_helper.rb

@@ -0,0 +1,94 @@
+# 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 "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/test_file"
+require "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/rspec_matchers"
+include Elasticsearch::RestAPIYAMLTests
+
+TRANSPORT_OPTIONS = {}
+PROJECT_PATH = File.join(File.dirname(__FILE__), '..', '..')
+
+if hosts = ELASTICSEARCH_URL
+  split_hosts = hosts.split(',').map do |host|
+    /(http\:\/\/)?(\S+)/.match(host)[2]
+  end
+
+  TEST_HOST, TEST_PORT = split_hosts.first.split(':')
+else
+  TEST_HOST, TEST_PORT = 'localhost', '9200'
+end
+
+if defined?(TEST_HOST) && defined?(TEST_PORT)
+  URL = "http://#{TEST_HOST}:#{TEST_PORT}"
+
+  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
+
+
+YAML_FILES_DIRECTORY = "#{File.expand_path(File.dirname('..'), '..')}" +
+    "/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test"
+
+SINGLE_TEST = if ENV['SINGLE_TEST'] && !ENV['SINGLE_TEST'].empty?
+                ["#{File.expand_path(File.dirname('..'), '..')}" +
+                     "/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test/#{ENV['SINGLE_TEST']}"]
+              end
+
+skipped_tests = []
+
+# Response from Elasticsearch is just a String, so it's not possible to compare using headers.
+skipped_tests << { file:        'cat.aliases/20_headers.yml',
+                   description: 'Simple alias with yaml body through Accept header' }
+
+# Check version skip logic
+skipped_tests << { file:        'create/15_without_id.yml',
+                   description: 'Create without ID' }
+
+# No error is raised
+skipped_tests << { file:        'create/15_without_id_with_types.yml',
+                   description: 'Create without ID' }
+
+# Error message doesn't match
+skipped_tests << { file:        'tasks.get/10_basic.yml',
+                   description: 'get task test' }
+
+# No error is raised
+skipped_tests << { file:        'cat.allocation/10_basic.yml',
+                   description: '*' }
+
+# Figure out how to match response when there is an error
+skipped_tests << { file:        'delete/70_mix_typeless_typeful.yml',
+                   description: '*' }
+
+# Figure out how to match response when there is an error
+skipped_tests << { file:        'cat.templates/10_basic.yml',
+                   description: '*' }
+
+SKIPPED_TESTS = skipped_tests
+
+# The directory of rest api YAML files.
+REST_API_YAML_FILES = SINGLE_TEST || Dir.glob("#{YAML_FILES_DIRECTORY}/**/*.yml")
+
+# The features to skip
+REST_API_YAML_SKIP_FEATURES = ['warnings'].freeze

data/spec/spec_helper.rb

@@ -16,25 +16,25 @@
 # under the License.
 
 require 'pry-nav'
+require 'yaml'
+require 'jbuilder'
+require 'jsonify'
+require 'elasticsearch'
 require 'elasticsearch-transport'
 require 'elasticsearch-api'
 
-require 'jbuilder' if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
-require 'jsonify'
-
 require 'ansi'
 tracer = ::Logger.new(STDERR)
 tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
 
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-JRUBY    = defined?(JRUBY_VERSION)
-
 unless defined?(ELASTICSEARCH_URL)
-  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || ENV['TEST_ES_SERVER'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
+  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] ||
+                        ENV['TEST_ES_SERVER'] ||
+                        "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
 end
 
-DEFAULT_CLIENT = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
-                                           tracer: (ENV['QUIET'] ? nil : tracer)
+DEFAULT_CLIENT = Elasticsearch::Client.new(host: ELASTICSEARCH_URL,
+                                           tracer: (tracer unless ENV['QUIET']))
 
 module HelperModule
   def self.included(context)
@@ -63,17 +63,4 @@ RSpec.configure do |config|
   config.color = true
 end
 
-if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
-  require 'simplecov'
-  SimpleCov.start { add_filter "/test|test_/" }
-end
-
-if ENV['CI'] && !RUBY_1_8
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start { add_filter "/test|test_" }
-end
-
 class NotFound < StandardError; end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -623,7 +623,9 @@ files:
 - spec/elasticsearch/api/actions/update_document_spec.rb
 - spec/elasticsearch/api/api_spec.rb
 - spec/elasticsearch/api/client_spec.rb
+- spec/elasticsearch/api/rest_api_yaml_spec.rb
 - spec/elasticsearch/api/utils_spec.rb
+- spec/rest_yaml_tests_helper.rb
 - spec/spec_helper.rb
 - test/integration/yaml_test_runner.rb
 - test/test_helper.rb
@@ -784,7 +786,9 @@ test_files:
 - spec/elasticsearch/api/actions/update_document_spec.rb
 - spec/elasticsearch/api/api_spec.rb
 - spec/elasticsearch/api/client_spec.rb
+- spec/elasticsearch/api/rest_api_yaml_spec.rb
 - spec/elasticsearch/api/utils_spec.rb
+- spec/rest_yaml_tests_helper.rb
 - spec/spec_helper.rb
 - test/integration/yaml_test_runner.rb
 - test/test_helper.rb