elasticsearch-api 7.11.0 → 7.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf491db44de0fc66697637b2d0285d8f04be4dfe98d91137371a6ff65c5914a
-  data.tar.gz: 7ba4f3778d529ef868113993fbe423b335f3916512d2ae5900e50cc541ce6a03
+  metadata.gz: 04426d289f796697388db5f39589b1d2cf748af7d328393f0e69020c9a480d88
+  data.tar.gz: 61cb4df95b855b72fea99b9e7aacc7e104fcd9bf8010ddb9535cd617ad192a32
 SHA512:
-  metadata.gz: 9d21481c4c0979edb3afa5a493e391ba8252a178e3fe6f718cad86c7a61ad496ecdc19fc9ddcb11663087448005b1ffdce3f7b5472ffa41ecf7f042271b5714c
-  data.tar.gz: af990b1f6dd6b16f19484ce7a03229c6fa44304da4fb4b06de01af2d61dfb3d07a0e996b73123a98b9b8958486a7ad796409a4777a8fd05123e583cc3d68a7a9
+  metadata.gz: d4e60e743a146f9f5debc3c0557b87890c9a7314e455ee199d5bc3d0772d8209941785644c46d3c4478eb64a48acec432c2bc6cd75344b0e61d45de6187ce967
+  data.tar.gz: e89e9a31fc25425d9bf81ded9fcf9b293e74185d67effc4941fd92b7fff9524eb85d596fe64bc61aca3f17d773ae01abb04872fa499a609e05463e7da986aaae

data/README.md

@@ -13,8 +13,7 @@ It does not provide an Elasticsearch client; see the
 
 The library is compatible with Ruby 1.9 and higher.
 
-It is compatible with Elasticsearch's API versions from 0.90 till current,
-just use a release matching major version of Elasticsearch.
+It is compatible with Elasticsearch's API versions from 0.90 till current, just use a release matching major version of Elasticsearch.
 
 | Ruby          |   | Elasticsearch |
 |:-------------:|:-:| :-----------: |
@@ -190,19 +189,18 @@ Elasticsearch::API.serializer.dump({foo: 'bar'})
 
 ## Development
 
-To work on the code, clone and bootstrap the main repository first --
-please see instructions in the main [README](../README.md#development).
+To work on the code, clone and bootstrap the main repository first -- please see instructions in the main [README](../README.md#development).
 
-To run tests, launch a testing cluster -- again, see instructions
-in the main [README](../README.md#development) -- and use the Rake tasks:
+To run tests, launch a testing cluster -- again, see instructions in the main [README](../README.md#development) -- and use the Rake tasks:
 
 ```
 time rake test:unit
 time rake test:integration
 ```
 
-Unit tests have to use Ruby 1.8 compatible syntax, integration tests
-can use Ruby 2.x syntax and features.
+We run the test suite for Elasticsearch's Rest API tests. You can read more about this in [the test runner README](https://github.com/elastic/elasticsearch-ruby/tree/master/api-spec-testing#rest-api-yaml-test-runner).
+
+The `rest_api` needs the test files from Elasticsearch. You can run the rake task to download the test artifacts in the root folder of the project. This task needs a running cluster to determine which version and build hash of Elasticsearch to use and test against. `TEST_ES_SERVER=http://localhost:9200 rake test:download_artifacts`. This will download the necessary files used for the integration tests to `./tmp`.
 
 ## License
 

data/Rakefile

@@ -16,14 +16,7 @@
 # under the License.
 
 require 'bundler/gem_tasks'
-
-def __current__
-  Pathname( File.expand_path('..', __FILE__) )
-end
-
-def git_specs(command, options={})
-  sh "git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} #{command}", options
-end
+require 'json'
 
 task(:default) { system 'rake --tasks' }
 task test: 'test:unit'
@@ -46,73 +39,28 @@ namespace :test do
     t.exclude_pattern = 'spec/**{,/*/**}/rest_api_yaml_spec.rb'
   end
 
-  # Rest API Spec tests - rake test:rest_api
+  desc "Run Rest API Spec tests"
   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: true
-  end
-
-  desc "Run integration tests"
-  task integration: :update do
     require 'elasticsearch'
-
-    branches = `git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} branch --no-color`
-
-    current_branch = branches.
-      split("\n").
-      select { |b| b =~ /^\*/ }.
-      reject { |b| b =~ /no branch|detached/ }.
-      map    { |b| b.gsub(/^\*\s*/, '') }.
-      first
-
-    unless current_branch
-      STDERR.puts "[!] Unable to determine current branch, defaulting to 'master'"
-      current_branch = 'master'
-    end
-
     # Check if a test cluster is running
     begin
       url = ENV['TEST_CLUSTER_URL'] || ENV['TEST_ES_SERVER']
-      url = "http://localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}" unless url
+      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']
-      cluster_running = true
     rescue Faraday::ConnectionFailed
       STDERR.puts "[!] Test cluster not running?"
-      cluster_running = false
+      exit 1
     end
 
-    checkout_specs_version = ENV['TEST_NO_CHECKOUT'].nil? ? true : false
-    checkout_build_hash    = ENV['TEST_BUILD_REF'] || build_hash
-    ENV['TEST_BUILD_REF']  = checkout_build_hash
+    t.pattern = 'spec/**{,/*/**}/rest_api_yaml_spec.rb'
+  end
 
-    begin
-      unless checkout_specs_version
-        STDERR.puts '-'*80, "YAML tests: Not switching, TEST_NO_CHECKOUT=y", '-'*80
-      end
-
-      if checkout_specs_version && !checkout_build_hash
-        STDERR.puts "[!] Cannot determine checkout build hash -- server not running or TEST_BUILD_REF not specified"
-        exit(1)
-      end
-
-      if checkout_specs_version && checkout_build_hash
-        # Checkout the commit corresponding to the running server build, or passed TEST_BUILD_REF
-        name = ENV['CI'] ? checkout_build_hash : "[\e[1m#{checkout_build_hash}\e[0m]"
-        STDERR.puts '-'*80, "YAML tests: Switching to #{name} from #{current_branch}", '-'*80
-        git_specs "checkout #{checkout_build_hash} --force --quiet"
-      end
-
-      Rake::Task['test:rest_api'].invoke
-
-    ensure
-      git_specs "checkout #{current_branch} --force --quiet" if checkout_specs_version && current_branch
-    end
+  desc "Run integration tests"
+  task :integration do
+    Rake::Task['test:rest_api'].invoke
   end
 
   desc 'Run unit and integration tests'
@@ -121,6 +69,42 @@ namespace :test do
     Rake::Task['test:integration'].invoke
   end
 
+  def refresh_artifacts(build_hash, version_number)
+    unless build_hash
+      STDERR.puts "[!] Cannot determine checkout build hash -- server not running"
+      exit(1)
+    end
+
+    puts 'Downloading artifacts file...'
+    filename = 'tmp/artifacts.json'
+    `curl -s https://artifacts-api.elastic.co/v1/versions/#{version_number} -o #{filename}`
+
+    unless File.exists?("./#{filename}")
+      STDERR.puts '[!] Couldn\'t download artifacts file'
+      exit 1
+    end
+
+    artifacts = JSON.parse(File.read('./tmp/artifacts.json'))
+
+    build_hash_artifact = artifacts['version']['builds'].select do |a|
+      a.dig('projects', 'elasticsearch', 'commit_hash') == build_hash
+    end.first
+    # Dig into the elasticsearch packages, search for the rest-resources-zip package and catch the URL:
+    zip_url = build_hash_artifact.dig('projects', 'elasticsearch', 'packages').select { |k,v| k =~ /rest-resources-zip/ }.map { | _, v| v['url'] }.first
+
+    filename = zip_url.split('/').last
+    puts 'Downloading zip file:'
+    `curl -s #{zip_url} -o tmp/#{filename}`
+
+    unless File.exists?("./tmp/#{filename}")
+      STDERR.puts '[!] Couldn\'t download artifact'
+      exit 1
+    end
+
+    puts "Unzipping file #{filename}"
+    `unzip -o tmp/#{filename} -d tmp/`
+  end
+
   namespace :cluster do
     desc "Start Elasticsearch nodes for tests"
     task :start do

data/lib/elasticsearch/api.rb

@@ -72,7 +72,9 @@ module Elasticsearch
                 Elasticsearch::API::Tasks,
                 Elasticsearch::API::Cat,
                 Elasticsearch::API::Remote,
-                Elasticsearch::API::DanglingIndices
+                Elasticsearch::API::DanglingIndices,
+                Elasticsearch::API::Features,
+                Elasticsearch::API::Shutdown
     end
 
     # The serializer class

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

@@ -35,7 +35,7 @@ module Elasticsearch
       # @option arguments [String|Array] :body The operation definition and data (action-data pairs), separated by newlines. Array of Strings, Header/Data pairs,
       # or the conveniency "combined" format can be passed, refer to Elasticsearch::API::Utils.__bulkify documentation.
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/docs-bulk.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/docs-bulk.html
       #
       def bulk(arguments = {})
         raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]

data/lib/elasticsearch/api/actions/cat/aliases.rb

@@ -31,7 +31,7 @@ module Elasticsearch
         # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-alias.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-alias.html
         #
         def aliases(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/allocation.rb

@@ -32,7 +32,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-allocation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-allocation.html
         #
         def allocation(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/count.rb

@@ -29,7 +29,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-count.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-count.html
         #
         def count(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/fielddata.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-fielddata.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-fielddata.html
         #
         def fielddata(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/health.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-health.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-health.html
         #
         def health(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/help.rb

@@ -25,7 +25,7 @@ module Elasticsearch
         # @option arguments [List] :s Comma-separated list of column names or column aliases to sort by
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat.html
         #
         def help(arguments = {})
           headers = arguments.delete(:headers) || {}

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

@@ -37,7 +37,7 @@ module Elasticsearch
         # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, hidden, none, all)
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-indices.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-indices.html
         #
         def indices(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/master.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-master.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-master.html
         #
         def master(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/nodeattrs.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-nodeattrs.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-nodeattrs.html
         #
         def nodeattrs(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/nodes.rb

@@ -31,9 +31,10 @@ module Elasticsearch
         # @option arguments [List] :s Comma-separated list of column names or column aliases to sort by
         # @option arguments [String] :time The unit in which to display time values (options: d, h, m, s, ms, micros, nanos)
         # @option arguments [Boolean] :v Verbose mode. Display column headers
+        # @option arguments [Boolean] :include_unloaded_segments If set to true segment stats will include stats for segments that are not currently loaded into memory
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-nodes.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-nodes.html
         #
         def nodes(arguments = {})
           headers = arguments.delete(:headers) || {}
@@ -62,7 +63,8 @@ module Elasticsearch
           :help,
           :s,
           :time,
-          :v
+          :v,
+          :include_unloaded_segments
         ].freeze)
       end
     end

data/lib/elasticsearch/api/actions/cat/pending_tasks.rb

@@ -31,7 +31,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-pending-tasks.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-pending-tasks.html
         #
         def pending_tasks(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/plugins.rb

@@ -26,11 +26,12 @@ module Elasticsearch
         # @option arguments [Time] :master_timeout Explicit operation timeout for connection to master node
         # @option arguments [List] :h Comma-separated list of column names to display
         # @option arguments [Boolean] :help Return help information
+        # @option arguments [Boolean] :include_bootstrap Include bootstrap plugins in the response
         # @option arguments [List] :s Comma-separated list of column names or column aliases to sort by
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-plugins.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-plugins.html
         #
         def plugins(arguments = {})
           headers = arguments.delete(:headers) || {}
@@ -54,6 +55,7 @@ module Elasticsearch
           :master_timeout,
           :h,
           :help,
+          :include_bootstrap,
           :s,
           :v
         ].freeze)

data/lib/elasticsearch/api/actions/cat/recovery.rb

@@ -33,7 +33,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-recovery.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-recovery.html
         #
         def recovery(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/repositories.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-repositories.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-repositories.html
         #
         def repositories(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/segments.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-segments.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-segments.html
         #
         def segments(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/shards.rb

@@ -33,7 +33,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-shards.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-shards.html
         #
         def shards(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/snapshots.rb

@@ -32,7 +32,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-snapshots.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-snapshots.html
         #
         def snapshots(arguments = {})
           headers = arguments.delete(:headers) || {}

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

@@ -33,7 +33,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/tasks.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/tasks.html
         #
         def tasks(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/templates.rb

@@ -31,7 +31,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-templates.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-templates.html
         #
         def templates(arguments = {})
           headers = arguments.delete(:headers) || {}

data/lib/elasticsearch/api/actions/cat/thread_pool.rb

@@ -33,7 +33,7 @@ module Elasticsearch
         # @option arguments [Boolean] :v Verbose mode. Display column headers
         # @option arguments [Hash] :headers Custom HTTP headers
         #
-        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/cat-thread-pool.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/cat-thread-pool.html
         #
         def thread_pool(arguments = {})
           headers = arguments.delete(:headers) || {}

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

@@ -29,7 +29,7 @@ module Elasticsearch
       # Deprecated since version 7.0.0
       #
       #
-      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.11/clear-scroll-api.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.13/clear-scroll-api.html
       #
       def clear_scroll(arguments = {})
         headers = arguments.delete(:headers) || {}