elasticsearch-api 7.11.0.pre.1 → 7.13.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (186) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -8
  3. data/Rakefile +46 -62
  4. data/lib/elasticsearch/api.rb +3 -1
  5. data/lib/elasticsearch/api/actions/bulk.rb +1 -1
  6. data/lib/elasticsearch/api/actions/cat/aliases.rb +1 -1
  7. data/lib/elasticsearch/api/actions/cat/allocation.rb +1 -1
  8. data/lib/elasticsearch/api/actions/cat/count.rb +1 -1
  9. data/lib/elasticsearch/api/actions/cat/fielddata.rb +1 -1
  10. data/lib/elasticsearch/api/actions/cat/health.rb +1 -1
  11. data/lib/elasticsearch/api/actions/cat/help.rb +1 -1
  12. data/lib/elasticsearch/api/actions/cat/indices.rb +1 -1
  13. data/lib/elasticsearch/api/actions/cat/master.rb +1 -1
  14. data/lib/elasticsearch/api/actions/cat/nodeattrs.rb +1 -1
  15. data/lib/elasticsearch/api/actions/cat/nodes.rb +4 -2
  16. data/lib/elasticsearch/api/actions/cat/pending_tasks.rb +1 -1
  17. data/lib/elasticsearch/api/actions/cat/plugins.rb +3 -1
  18. data/lib/elasticsearch/api/actions/cat/recovery.rb +1 -1
  19. data/lib/elasticsearch/api/actions/cat/repositories.rb +1 -1
  20. data/lib/elasticsearch/api/actions/cat/segments.rb +1 -1
  21. data/lib/elasticsearch/api/actions/cat/shards.rb +1 -1
  22. data/lib/elasticsearch/api/actions/cat/snapshots.rb +1 -1
  23. data/lib/elasticsearch/api/actions/cat/tasks.rb +1 -1
  24. data/lib/elasticsearch/api/actions/cat/templates.rb +1 -1
  25. data/lib/elasticsearch/api/actions/cat/thread_pool.rb +1 -1
  26. data/lib/elasticsearch/api/actions/clear_scroll.rb +1 -1
  27. data/lib/elasticsearch/api/actions/close_point_in_time.rb +42 -0
  28. data/lib/elasticsearch/api/actions/cluster/allocation_explain.rb +1 -1
  29. data/lib/elasticsearch/api/actions/cluster/delete_component_template.rb +1 -1
  30. data/lib/elasticsearch/api/actions/cluster/delete_voting_config_exclusions.rb +1 -1
  31. data/lib/elasticsearch/api/actions/cluster/exists_component_template.rb +1 -1
  32. data/lib/elasticsearch/api/actions/cluster/get_component_template.rb +1 -1
  33. data/lib/elasticsearch/api/actions/cluster/get_settings.rb +1 -1
  34. data/lib/elasticsearch/api/actions/cluster/health.rb +1 -1
  35. data/lib/elasticsearch/api/actions/cluster/pending_tasks.rb +1 -1
  36. data/lib/elasticsearch/api/actions/cluster/post_voting_config_exclusions.rb +1 -1
  37. data/lib/elasticsearch/api/actions/cluster/put_component_template.rb +1 -1
  38. data/lib/elasticsearch/api/actions/cluster/put_settings.rb +1 -1
  39. data/lib/elasticsearch/api/actions/cluster/remote_info.rb +1 -1
  40. data/lib/elasticsearch/api/actions/cluster/reroute.rb +1 -1
  41. data/lib/elasticsearch/api/actions/cluster/state.rb +1 -1
  42. data/lib/elasticsearch/api/actions/cluster/stats.rb +1 -1
  43. data/lib/elasticsearch/api/actions/count.rb +1 -1
  44. data/lib/elasticsearch/api/actions/create.rb +1 -1
  45. data/lib/elasticsearch/api/actions/dangling_indices/delete_dangling_index.rb +1 -1
  46. data/lib/elasticsearch/api/actions/dangling_indices/import_dangling_index.rb +1 -1
  47. data/lib/elasticsearch/api/actions/dangling_indices/list_dangling_indices.rb +1 -1
  48. data/lib/elasticsearch/api/actions/delete.rb +1 -1
  49. data/lib/elasticsearch/api/actions/delete_by_query.rb +1 -1
  50. data/lib/elasticsearch/api/actions/delete_by_query_rethrottle.rb +1 -1
  51. data/lib/elasticsearch/api/actions/delete_script.rb +1 -1
  52. data/lib/elasticsearch/api/actions/exists.rb +1 -1
  53. data/lib/elasticsearch/api/actions/exists_source.rb +1 -1
  54. data/lib/elasticsearch/api/actions/explain.rb +1 -1
  55. data/lib/elasticsearch/api/actions/features/get_features.rb +51 -0
  56. data/lib/elasticsearch/api/actions/features/params_registry.rb +60 -0
  57. data/lib/elasticsearch/api/actions/features/reset_features.rb +47 -0
  58. data/lib/elasticsearch/api/actions/field_caps.rb +1 -1
  59. data/lib/elasticsearch/api/actions/get.rb +1 -1
  60. data/lib/elasticsearch/api/actions/get_script.rb +1 -1
  61. data/lib/elasticsearch/api/actions/get_script_context.rb +1 -1
  62. data/lib/elasticsearch/api/actions/get_script_languages.rb +1 -1
  63. data/lib/elasticsearch/api/actions/get_source.rb +1 -1
  64. data/lib/elasticsearch/api/actions/index.rb +1 -1
  65. data/lib/elasticsearch/api/actions/indices/add_block.rb +1 -1
  66. data/lib/elasticsearch/api/actions/indices/analyze.rb +1 -1
  67. data/lib/elasticsearch/api/actions/indices/clear_cache.rb +1 -1
  68. data/lib/elasticsearch/api/actions/indices/clone.rb +1 -1
  69. data/lib/elasticsearch/api/actions/indices/close.rb +2 -2
  70. data/lib/elasticsearch/api/actions/indices/create.rb +1 -1
  71. data/lib/elasticsearch/api/actions/indices/delete.rb +1 -1
  72. data/lib/elasticsearch/api/actions/indices/delete_alias.rb +1 -1
  73. data/lib/elasticsearch/api/actions/indices/delete_index_template.rb +1 -1
  74. data/lib/elasticsearch/api/actions/indices/delete_template.rb +1 -1
  75. data/lib/elasticsearch/api/actions/indices/exists.rb +1 -1
  76. data/lib/elasticsearch/api/actions/indices/exists_alias.rb +1 -1
  77. data/lib/elasticsearch/api/actions/indices/exists_index_template.rb +1 -1
  78. data/lib/elasticsearch/api/actions/indices/exists_template.rb +1 -1
  79. data/lib/elasticsearch/api/actions/indices/exists_type.rb +1 -1
  80. data/lib/elasticsearch/api/actions/indices/flush.rb +1 -1
  81. data/lib/elasticsearch/api/actions/indices/flush_synced.rb +1 -1
  82. data/lib/elasticsearch/api/actions/indices/forcemerge.rb +1 -1
  83. data/lib/elasticsearch/api/actions/indices/freeze.rb +29 -19
  84. data/lib/elasticsearch/api/actions/indices/get.rb +1 -1
  85. data/lib/elasticsearch/api/actions/indices/get_alias.rb +1 -1
  86. data/lib/elasticsearch/api/actions/indices/get_field_mapping.rb +1 -1
  87. data/lib/elasticsearch/api/actions/indices/get_index_template.rb +1 -1
  88. data/lib/elasticsearch/api/actions/indices/get_mapping.rb +1 -1
  89. data/lib/elasticsearch/api/actions/indices/get_settings.rb +1 -1
  90. data/lib/elasticsearch/api/actions/indices/get_template.rb +1 -1
  91. data/lib/elasticsearch/api/actions/indices/get_upgrade.rb +1 -1
  92. data/lib/elasticsearch/api/actions/indices/open.rb +1 -1
  93. data/lib/elasticsearch/api/actions/indices/put_alias.rb +1 -1
  94. data/lib/elasticsearch/api/actions/indices/put_index_template.rb +1 -1
  95. data/lib/elasticsearch/api/actions/indices/put_mapping.rb +1 -1
  96. data/lib/elasticsearch/api/actions/indices/put_settings.rb +1 -1
  97. data/lib/elasticsearch/api/actions/indices/put_template.rb +1 -1
  98. data/lib/elasticsearch/api/actions/indices/recovery.rb +1 -1
  99. data/lib/elasticsearch/api/actions/indices/refresh.rb +1 -1
  100. data/lib/elasticsearch/api/actions/indices/resolve_index.rb +1 -1
  101. data/lib/elasticsearch/api/actions/indices/rollover.rb +1 -1
  102. data/lib/elasticsearch/api/actions/indices/segments.rb +1 -1
  103. data/lib/elasticsearch/api/actions/indices/shard_stores.rb +1 -1
  104. data/lib/elasticsearch/api/actions/indices/shrink.rb +1 -1
  105. data/lib/elasticsearch/api/actions/indices/simulate_index_template.rb +1 -1
  106. data/lib/elasticsearch/api/actions/indices/simulate_template.rb +1 -1
  107. data/lib/elasticsearch/api/actions/indices/split.rb +1 -1
  108. data/lib/elasticsearch/api/actions/indices/stats.rb +1 -1
  109. data/lib/elasticsearch/api/actions/indices/unfreeze.rb +29 -19
  110. data/lib/elasticsearch/api/actions/indices/update_aliases.rb +1 -1
  111. data/lib/elasticsearch/api/actions/indices/upgrade.rb +1 -1
  112. data/lib/elasticsearch/api/actions/indices/validate_query.rb +1 -1
  113. data/lib/elasticsearch/api/actions/info.rb +1 -1
  114. data/lib/elasticsearch/api/actions/ingest/delete_pipeline.rb +1 -1
  115. data/lib/elasticsearch/api/actions/ingest/geo_ip_stats.rb +43 -0
  116. data/lib/elasticsearch/api/actions/ingest/get_pipeline.rb +3 -1
  117. data/lib/elasticsearch/api/actions/ingest/processor_grok.rb +1 -1
  118. data/lib/elasticsearch/api/actions/ingest/put_pipeline.rb +1 -1
  119. data/lib/elasticsearch/api/actions/ingest/simulate.rb +1 -1
  120. data/lib/elasticsearch/api/actions/mget.rb +1 -1
  121. data/lib/elasticsearch/api/actions/msearch.rb +1 -1
  122. data/lib/elasticsearch/api/actions/msearch_template.rb +1 -1
  123. data/lib/elasticsearch/api/actions/mtermvectors.rb +1 -1
  124. data/lib/elasticsearch/api/actions/nodes/hot_threads.rb +1 -1
  125. data/lib/elasticsearch/api/actions/nodes/info.rb +1 -1
  126. data/lib/elasticsearch/api/actions/nodes/reload_secure_settings.rb +1 -1
  127. data/lib/elasticsearch/api/actions/nodes/stats.rb +4 -2
  128. data/lib/elasticsearch/api/actions/nodes/usage.rb +1 -1
  129. data/lib/elasticsearch/api/actions/open_point_in_time.rb +64 -0
  130. data/lib/elasticsearch/api/actions/ping.rb +1 -1
  131. data/lib/elasticsearch/api/actions/put_script.rb +1 -1
  132. data/lib/elasticsearch/api/actions/rank_eval.rb +1 -1
  133. data/lib/elasticsearch/api/actions/reindex.rb +1 -1
  134. data/lib/elasticsearch/api/actions/reindex_rethrottle.rb +1 -1
  135. data/lib/elasticsearch/api/actions/render_search_template.rb +1 -1
  136. data/lib/elasticsearch/api/actions/scripts_painless_execute.rb +1 -1
  137. data/lib/elasticsearch/api/actions/scroll.rb +1 -1
  138. data/lib/elasticsearch/api/actions/search.rb +4 -2
  139. data/lib/elasticsearch/api/actions/search_shards.rb +1 -1
  140. data/lib/elasticsearch/api/actions/search_template.rb +1 -1
  141. data/lib/elasticsearch/api/actions/shutdown/delete_node.rb +52 -0
  142. data/lib/elasticsearch/api/actions/shutdown/get_node.rb +54 -0
  143. data/lib/elasticsearch/api/actions/shutdown/params_registry.rb +60 -0
  144. data/lib/elasticsearch/api/actions/shutdown/put_node.rb +54 -0
  145. data/lib/elasticsearch/api/actions/snapshot/cleanup_repository.rb +1 -1
  146. data/lib/elasticsearch/api/actions/snapshot/clone.rb +1 -1
  147. data/lib/elasticsearch/api/actions/snapshot/create.rb +1 -1
  148. data/lib/elasticsearch/api/actions/snapshot/create_repository.rb +1 -1
  149. data/lib/elasticsearch/api/actions/snapshot/delete.rb +1 -1
  150. data/lib/elasticsearch/api/actions/snapshot/delete_repository.rb +1 -1
  151. data/lib/elasticsearch/api/actions/snapshot/get.rb +3 -1
  152. data/lib/elasticsearch/api/actions/snapshot/get_features.rb +51 -0
  153. data/lib/elasticsearch/api/actions/snapshot/get_repository.rb +1 -1
  154. data/lib/elasticsearch/api/actions/snapshot/restore.rb +1 -1
  155. data/lib/elasticsearch/api/actions/snapshot/status.rb +1 -1
  156. data/lib/elasticsearch/api/actions/snapshot/verify_repository.rb +1 -1
  157. data/lib/elasticsearch/api/actions/tasks/cancel.rb +1 -1
  158. data/lib/elasticsearch/api/actions/tasks/get.rb +1 -1
  159. data/lib/elasticsearch/api/actions/tasks/list.rb +1 -1
  160. data/lib/elasticsearch/api/actions/termvectors.rb +1 -1
  161. data/lib/elasticsearch/api/actions/update.rb +1 -1
  162. data/lib/elasticsearch/api/actions/update_by_query.rb +1 -1
  163. data/lib/elasticsearch/api/actions/update_by_query_rethrottle.rb +1 -1
  164. data/lib/elasticsearch/api/namespace/features.rb +36 -0
  165. data/lib/elasticsearch/api/namespace/shutdown.rb +37 -0
  166. data/lib/elasticsearch/api/version.rb +1 -1
  167. data/spec/elasticsearch/api/actions/close_point_in_time_spec.rb +34 -0
  168. data/spec/elasticsearch/api/actions/features/get_features_spec.rb +34 -0
  169. data/spec/elasticsearch/api/actions/features/reset_features_spec.rb +34 -0
  170. data/spec/elasticsearch/api/actions/indices/freeze_spec.rb +1 -1
  171. data/spec/elasticsearch/api/actions/indices/unfreeze_spec.rb +1 -1
  172. data/spec/elasticsearch/api/actions/ingest/geo_ip_stats_spec.rb +34 -0
  173. data/spec/elasticsearch/api/actions/open_point_in_time_spec.rb +44 -0
  174. data/spec/elasticsearch/api/actions/shutdown/delete_node_spec.rb +44 -0
  175. data/spec/elasticsearch/api/actions/shutdown/get_node_spec.rb +46 -0
  176. data/spec/elasticsearch/api/actions/shutdown/put_node_spec.rb +50 -0
  177. data/spec/elasticsearch/api/actions/snapshot/get_features_spec.rb +38 -0
  178. data/spec/elasticsearch/api/rest_api_yaml_spec.rb +7 -0
  179. data/spec/rest_yaml_tests_helper.rb +16 -46
  180. data/spec/skipped_tests.yml +29 -0
  181. data/utils/Gemfile +4 -3
  182. data/utils/thor/generate_source.rb +1 -2
  183. data/utils/thor/generator/endpoint_specifics.rb +4 -0
  184. data/utils/thor/generator/files_helper.rb +38 -20
  185. data/utils/thor/templates/_perform_request.erb +1 -1
  186. metadata +36 -3
@@ -0,0 +1,44 @@
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ require 'spec_helper'
19
+
20
+ describe 'client#open_point_in_time' do
21
+ let(:expected_args) do
22
+ [
23
+ 'POST',
24
+ url,
25
+ {},
26
+ nil,
27
+ {}
28
+ ]
29
+ end
30
+
31
+ let (:url) { '_pit'}
32
+
33
+ it 'performs the request' do
34
+ expect(client_double.open_point_in_time).to eq({})
35
+ end
36
+
37
+ context 'with index' do
38
+ let (:url) { 'foo/_pit'}
39
+
40
+ it 'performs the request' do
41
+ expect(client_double.open_point_in_time(index: 'foo')).to eq({})
42
+ end
43
+ end
44
+ end
@@ -0,0 +1,44 @@
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ require 'spec_helper'
19
+
20
+ describe 'client.shutdown#delete_node' do
21
+ let(:expected_args) do
22
+ [
23
+ 'DELETE',
24
+ '_nodes/id/shutdown',
25
+ {},
26
+ nil,
27
+ {}
28
+ ]
29
+ end
30
+
31
+ it 'performs the request' do
32
+ expect(client_double.shutdown.delete_node(node_id: 'id')).to eq({})
33
+ end
34
+
35
+ let(:client) do
36
+ Class.new { include Elasticsearch::API }.new
37
+ end
38
+
39
+ it 'raises an error if no node_id is provided' do
40
+ expect {
41
+ client.shutdown.delete_node
42
+ }.to raise_exception(ArgumentError)
43
+ end
44
+ end
@@ -0,0 +1,46 @@
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ require 'spec_helper'
19
+
20
+ describe 'client.shutdown#get_node' do
21
+ let(:expected_args) do
22
+ [
23
+ 'GET',
24
+ url,
25
+ {},
26
+ nil,
27
+ {}
28
+ ]
29
+ end
30
+
31
+ context 'when id is provided' do
32
+ let(:url) { '_nodes/id/shutdown' }
33
+
34
+ it 'performs the request' do
35
+ expect(client_double.shutdown.get_node(node_id: 'id')).to eq({})
36
+ end
37
+ end
38
+
39
+ context 'when no id is provided' do
40
+ let(:url) { '_nodes/shutdown' }
41
+
42
+ it 'performs the request' do
43
+ expect(client_double.shutdown.get_node).to eq({})
44
+ end
45
+ end
46
+ end
@@ -0,0 +1,50 @@
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ require 'spec_helper'
19
+
20
+ describe 'client.shutdown#put_node' do
21
+ let(:expected_args) do
22
+ [
23
+ 'PUT',
24
+ '_nodes/id/shutdown',
25
+ {},
26
+ {},
27
+ {}
28
+ ]
29
+ end
30
+
31
+ it 'performs the request' do
32
+ expect(client_double.shutdown.put_node(body: {}, node_id: 'id')).to eq({})
33
+ end
34
+
35
+ let(:client) do
36
+ Class.new { include Elasticsearch::API }.new
37
+ end
38
+
39
+ it 'raises an error if no node_id is provided' do
40
+ expect {
41
+ client.shutdown.put_node(body: {})
42
+ }.to raise_exception(ArgumentError)
43
+ end
44
+
45
+ it 'raises an error if no body is provided' do
46
+ expect {
47
+ client.shutdown.put_node(node_id: 'id')
48
+ }.to raise_exception(ArgumentError)
49
+ end
50
+ end
@@ -0,0 +1,38 @@
1
+ # Licensed to Elasticsearch B.V. under one or more contributor
2
+ # license agreements. See the NOTICE file distributed with
3
+ # this work for additional information regarding copyright
4
+ # ownership. Elasticsearch B.V. licenses this file to you under
5
+ # the Apache License, Version 2.0 (the "License"); you may
6
+ # not use this file except in compliance with the License.
7
+ # You may obtain a copy of the License at
8
+ #
9
+ # http://www.apache.org/licenses/LICENSE-2.0
10
+ #
11
+ # Unless required by applicable law or agreed to in writing,
12
+ # software distributed under the License is distributed on an
13
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14
+ # KIND, either express or implied. See the License for the
15
+ # specific language governing permissions and limitations
16
+ # under the License.
17
+
18
+ require 'spec_helper'
19
+
20
+ describe 'client.snapshot#get' do
21
+ let(:expected_args) do
22
+ [
23
+ 'GET',
24
+ '_snapshottable_features',
25
+ {},
26
+ nil,
27
+ {}
28
+ ]
29
+ end
30
+
31
+ let(:client) do
32
+ Class.new { include Elasticsearch::API }.new
33
+ end
34
+
35
+ it 'performs the request' do
36
+ expect(client_double.snapshot.get_features).to eq({})
37
+ end
38
+ end
@@ -6,6 +6,13 @@ require 'spec_helper'
6
6
  require 'rest_yaml_tests_helper'
7
7
 
8
8
  describe 'Rest API YAML tests' do
9
+ if REST_API_YAML_FILES.empty?
10
+ logger = Logger.new($stdout)
11
+ logger.error 'No test files found!'
12
+ logger.info 'Use rake rake test:download_artifacts in the root directory of the project to download the test artifacts.'
13
+ exit 1
14
+ end
15
+
9
16
  # Traverse YAML files and create TestFile object:
10
17
  REST_API_YAML_FILES.each do |file|
11
18
  begin
@@ -20,7 +20,7 @@ require "#{File.expand_path(File.dirname('..'), '..')}/api-spec-testing/rspec_ma
20
20
  include Elasticsearch::RestAPIYAMLTests
21
21
 
22
22
  TRANSPORT_OPTIONS = {}
23
- PROJECT_PATH = File.join(File.dirname(__FILE__), '..', '..')
23
+ PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
24
24
 
25
25
  if (hosts = ELASTICSEARCH_URL)
26
26
  split_hosts = hosts.split(',').map do |host|
@@ -47,65 +47,35 @@ if defined?(TEST_HOST) && defined?(TEST_PORT)
47
47
  end
48
48
  end
49
49
 
50
-
51
- YAML_FILES_DIRECTORY = "#{File.expand_path(File.dirname('..'), '..')}" +
52
- '/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test'
50
+ YAML_FILES_DIRECTORY = "#{PROJECT_PATH}/../tmp/rest-api-spec/test/free"
53
51
 
54
52
  SINGLE_TEST = if ENV['SINGLE_TEST'] && !ENV['SINGLE_TEST'].empty?
55
53
  test_target = ENV['SINGLE_TEST']
56
- path = File.expand_path(File.dirname('..'), '..')
57
54
 
58
55
  if test_target.match?(/\.yml$/)
59
- ["#{path}/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test/#{test_target}"]
56
+ ["#{PROJECT_PATH}/../tmp/rest-api-spec/test/free/#{test_target}"]
60
57
  else
61
58
  Dir.glob(
62
- ["#{path}/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test/#{test_target}/*.yml"]
59
+ ["#{PROJECT_PATH}/../tmp/rest-api-spec/test/free/#{test_target}/*.yml"]
63
60
  )
64
61
  end
65
62
  end
66
63
 
67
- skipped_tests = []
68
-
69
- # Response from Elasticsearch is just a String, so it's not possible to compare using headers.
70
- skipped_tests << { file: 'cat.aliases/20_headers.yml',
71
- description: 'Simple alias with yaml body through Accept header' }
72
-
73
- # Check version skip logic
74
- skipped_tests << { file: 'create/15_without_id.yml',
75
- description: 'Create without ID' }
76
-
77
- # No error is raised
78
- skipped_tests << { file: 'create/15_without_id_with_types.yml',
79
- description: 'Create without ID' }
80
-
81
- # Error message doesn't match
82
- skipped_tests << { file: 'tasks.get/10_basic.yml',
83
- description: 'get task test' }
84
-
85
- # No error is raised
86
- skipped_tests << { file: 'cat.allocation/10_basic.yml',
87
- description: '*' }
88
-
89
- # Figure out how to match response when there is an error
90
- skipped_tests << { file: 'delete/70_mix_typeless_typeful.yml',
91
- description: '*' }
92
-
93
- # Figure out how to match response when there is an error
94
- skipped_tests << { file: 'cat.templates/10_basic.yml',
95
- description: '*' }
96
-
97
- # Responses are there but not equal (eg.: yellow status)
98
- skipped_tests << { file: 'cluster.health/10_basic.yml',
99
- description: 'cluster health with closed index (pre 7.2.0)' }
100
-
101
- # Regular expression not catching exact match:
102
- skipped_tests << { file: 'cat.indices/10_basic.yml',
103
- description: 'Test cat indices output for closed index (pre 7.2.0)' }
104
64
 
105
- SKIPPED_TESTS = skipped_tests
65
+ # Skipped tests
66
+ file = File.expand_path(__dir__ + '/skipped_tests.yml')
67
+ skipped_tests = YAML.load_file(file)
106
68
 
107
69
  # The directory of rest api YAML files.
108
- REST_API_YAML_FILES = SINGLE_TEST || Dir.glob("#{YAML_FILES_DIRECTORY}/**/*.yml")
70
+ REST_API_YAML_FILES = if ENV['RUN_SKIPPED_TESTS'] # only run the skipped tests if true
71
+ SKIPPED_TESTS = []
72
+ skipped_tests.map { |test| "#{YAML_FILES_DIRECTORY}/#{test[:file]}" }
73
+ else
74
+ # If not, define the skipped tests constant and try the single test or all
75
+ # the tests
76
+ SKIPPED_TESTS = skipped_tests
77
+ SINGLE_TEST || Dir.glob("#{YAML_FILES_DIRECTORY}/**/*.yml")
78
+ end
109
79
 
110
80
  # The features to skip
111
81
  REST_API_YAML_SKIP_FEATURES = ['warnings', 'node_selector'].freeze
@@ -0,0 +1,29 @@
1
+ # Response from Elasticsearch is just a String, so it's not possible to compare using headers.
2
+ -
3
+ :file: 'cat.aliases/20_headers.yml'
4
+ :description: 'Simple alias with yaml body through Accept header'
5
+
6
+ # Check version skip logic
7
+ -
8
+ :file: 'create/15_without_id.yml'
9
+ :description: 'Create without ID'
10
+
11
+ # No error is raised
12
+ -
13
+ :file: 'create/15_without_id_with_types.yml'
14
+ :description: 'Create without ID'
15
+
16
+ # Error message doesn't match
17
+ -
18
+ :file: 'tasks.get/10_basic.yml'
19
+ :description: 'get task test'
20
+
21
+ # Figure out how to match response when there is an error
22
+ -
23
+ :file: 'delete/70_mix_typeless_typeful.yml'
24
+ :description: '*'
25
+
26
+ # Figure out how to match response when there is an error
27
+ -
28
+ :file: 'cat.templates/10_basic.yml'
29
+ :description: '*'
data/utils/Gemfile CHANGED
@@ -18,10 +18,11 @@
18
18
  source 'https://rubygems.org'
19
19
 
20
20
  gem 'activesupport'
21
- gem 'rest-client'
21
+ gem 'byebug'
22
22
  gem 'coderay'
23
- gem 'multi_json'
24
- gem 'thor'
25
23
  gem 'json'
24
+ gem 'multi_json'
26
25
  gem 'pry'
26
+ gem 'rest-client'
27
27
  gem 'rubocop'
28
+ gem 'thor'
@@ -66,11 +66,10 @@ module Elasticsearch
66
66
 
67
67
  def __generate_source(api)
68
68
  @current_api = api
69
- @input = FilesHelper.input_dir(api)
70
69
  @output = FilesHelper.output_dir(api)
71
70
 
72
71
  FilesHelper.files(api).each do |filepath|
73
- @path = Pathname(@input.join(filepath))
72
+ @path = Pathname(filepath)
74
73
  @json = MultiJson.load(File.read(@path))
75
74
  @spec = @json.values.first
76
75
  say_status 'json', @path, :yellow
@@ -170,6 +170,10 @@ module Elasticsearch
170
170
  SRC
171
171
  end
172
172
 
173
+ def find_structure_body_helper
174
+ bulk_body_helper
175
+ end
176
+
173
177
  def bulk_doc_helper(info)
174
178
  <<~SRC
175
179
  # @option arguments [String|Array] :body #{info}. Array of Strings, Header/Data pairs,
@@ -21,20 +21,47 @@ require_relative '../../../lib/elasticsearch/api/version.rb'
21
21
  module Elasticsearch
22
22
  module API
23
23
  module FilesHelper
24
- OSS_SRC_PATH = '../../../../../tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api/'.freeze
24
+ PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
25
+ SRC_PATH = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api/')
25
26
  OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
26
-
27
- XPACK_SRC_PATH = '../../../../../tmp/elasticsearch/x-pack/plugin/src/test/resources/rest-api-spec/api'.freeze
28
27
  XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
29
28
 
30
- # Path to directory with JSON API specs
31
- def self.input_dir(api)
32
- input_dir = if api == :xpack
33
- File.expand_path(XPACK_SRC_PATH, __FILE__)
34
- else
35
- File.expand_path(OSS_SRC_PATH, __FILE__)
36
- end
37
- Pathname(input_dir)
29
+ TESTS_DIRECTORIES = {
30
+ oss: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free",
31
+ xpack: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/platinum"
32
+ }.freeze
33
+
34
+ # Only get JSON files and remove hidden files
35
+ def self.files(api)
36
+ json_files = if api == :xpack
37
+ xpack_files
38
+ else
39
+ Dir.entries(SRC_PATH) - xpack_files
40
+ end
41
+ json_files.reject do |file|
42
+ File.extname(file) != '.json' ||
43
+ File.basename(file) == '_common.json'
44
+ end.map { |file| "#{SRC_PATH}#{file}" }
45
+ end
46
+
47
+ XPACK_ENDPOINTS = [
48
+ 'autoscaling', 'cross_cluster_replication', 'ccr', 'data_frame_transform_deprecated',
49
+ 'enrich', 'eql', 'fleet', 'ilm', 'logstash', 'migration', 'watcher', 'slm'
50
+ ]
51
+ XPACK_ENDPOINTS_REGEXP = /data_stream|ml_|reload_search_analyzers|transform/
52
+
53
+ def self.xpack_files
54
+ xpack_tests = Dir.entries(TESTS_DIRECTORIES[:xpack])
55
+ Dir.entries(SRC_PATH).map do |entry|
56
+ filename = entry.split('.').first
57
+ next if filename == 'snapshot'
58
+
59
+ if xpack_tests.include?(filename) ||
60
+ XPACK_ENDPOINTS.include?(filename) ||
61
+ entry.match?(XPACK_ENDPOINTS_REGEXP)
62
+ entry
63
+ end
64
+ end.compact
38
65
  end
39
66
 
40
67
  # Path to directory to copy generated files
@@ -42,15 +69,6 @@ module Elasticsearch
42
69
  api == :xpack ? Pathname(XPACK_OUTPUT_DIR) : Pathname(OSS_OUTPUT_DIR)
43
70
  end
44
71
 
45
- # Only get JSON files and remove hidden files
46
- def self.files(api)
47
- Dir.entries(input_dir(api).to_s).reject do |f|
48
- f.start_with?('.') ||
49
- f.start_with?('_') ||
50
- File.extname(f) != '.json'
51
- end
52
- end
53
-
54
72
  def self.gem_version
55
73
  regex = /([0-9]{1,2}\.[0-9x]{1,2})/
56
74
  Elasticsearch::API::VERSION.match(regex)[0]