elasticsearch-api 7.16.0 → 7.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0368667b90ead4c4691c306563eec23be738840b4e44b726d089f278eafb262f'
-  data.tar.gz: f0310659e54f9499fc6c04e4190787c304e4a458ef4b732bf98d7db758b59272
+  metadata.gz: da2424d274828887601f8ad67605b8f46f2d9cd69ab3f9a7750605b6e1ef2424
+  data.tar.gz: 78d25e75a029d32ba699b5899757e6444920cc6ee7219e948378b886fbdf86f9
 SHA512:
-  metadata.gz: ffa76d5e831a16db2cecae956989d2ea930dda0d9d492cf036416169e9d1155d835c042502783f5cada9cbff8d7a0d7d56d84a0b78703c0567844232eba09360
-  data.tar.gz: 9608f8eff97eb417373ddc41600c8885f22f9b4eda69a5629060f630a076e16ee53747aab4baf95af0f3636e68c1a8e3f0e73c5199991f84dd05ea352aa1d35c
+  metadata.gz: c43a43586bdc3c7ecabee29fc8f99a5abdd41201a94b4941679a12381b3f6630f7eada28126caffaf425d23623eb22dd13e4e535e60884580f2d6e0e0c93b912
+  data.tar.gz: f9d9aea59e6fc6df3f10f3b4abdcbfcdf6999451f468c0be15f0586e48879a885a381ff0d4983e0966698e55fab930e5a70e1e0b69a62d766b3eec71a04911cc

data/Rakefile

@@ -41,20 +41,6 @@ namespace :test do
 
   desc "Run Rest API Spec tests"
   RSpec::Core::RakeTask.new(:rest_api) do |t|
-    require 'elasticsearch'
-    # Check if a test cluster is running
-    begin
-      url = ENV['TEST_CLUSTER_URL'] || ENV['TEST_ES_SERVER']
-      url = "http://localhost:#{ENV['TEST_CLUSTER_PORT'] || 9200}" unless url
-      client = Elasticsearch::Client.new :url => url
-      es_version_info = client.info['version']
-      version_number = es_version_info['number']
-      build_hash      = es_version_info['build_hash']
-    rescue Faraday::ConnectionFailed
-      STDERR.puts "[!] Test cluster not running?"
-      exit 1
-    end
-
     t.pattern = 'spec/**{,/*/**}/rest_api_yaml_spec.rb'
   end
 

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

@@ -65,7 +65,7 @@ module Elasticsearch
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

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

@@ -41,9 +41,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
@@ -112,9 +109,6 @@ module Elasticsearch
         :size,
         :max_docs,
         :sort,
-        :_source,
-        :_source_excludes,
-        :_source_includes,
         :terminate_after,
         :stats,
         :version,

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

@@ -43,10 +43,9 @@ module Elasticsearch
           params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
 
           body = nil
-          if Array(arguments[:ignore]).include?(404)
-            Utils.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
-          else
-            perform_request(method, path, params, body, headers).body
+
+          Utils.__rescue_from_not_found do
+            perform_request(method, path, params, body, headers).status == 200 ? true : false
           end
         end
 

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

@@ -83,7 +83,7 @@ module Elasticsearch
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

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

@@ -69,7 +69,7 @@ module Elasticsearch
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

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
@@ -115,9 +112,6 @@ module Elasticsearch
         :size,
         :max_docs,
         :sort,
-        :_source,
-        :_source_excludes,
-        :_source_includes,
         :terminate_after,
         :stats,
         :version,

data/lib/elasticsearch/api/utils.rb

@@ -17,11 +17,9 @@
 
 module Elasticsearch
   module API
-
     # Generic utility methods
     #
     module Utils
-
       # URL-escape a string
       #
       # @example
@@ -282,6 +280,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.16.0'.freeze
+    VERSION = '7.16.1'.freeze
   end
 end

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/rest_yaml_tests_helper.rb

@@ -17,11 +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
-require 'elasticsearch/xpack'
 
 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|
@@ -34,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
 
-  ADMIN_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+  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
 
-  if ENV['QUIET'] == 'true'
-    DEFAULT_CLIENT = Elasticsearch::Client.new(host: URL, transport_options: TRANSPORT_OPTIONS)
+    ADMIN_CLIENT = Elasticsearch::Client.new(host: host, 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

@@ -67,7 +67,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/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
@@ -39,7 +40,6 @@ module Elasticsearch
         indices.flush_synced
         indices.delete
         indices.delete_index_template
-        indices.exists_index_template
         indices.delete_template
         security.get_role
         security.get_user

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 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 7.16.0
+  version: 7.16.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json