Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default include_type_name to false in the yml test harness. #38058

Merged
merged 15 commits into from
Feb 1, 2019
+515 −740
Merged

Default include_type_name to false in the yml test harness. #38058

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3a4fbae
Default include_type_name to false when connecting to 6.x nodes.
jtibshirani Jan 29, 2019
16f7fa5
Pull out the request updates into their own method.
jtibshirani Jan 30, 2019
fb917e3
Remove references to include_type_name that are no longer necessary.
jtibshirani Jan 29, 2019
0631110
Update xpack tests to be typeless.
jtibshirani Jan 31, 2019
ee9d68d
Fix some plugin tests.
jtibshirani Jan 31, 2019
76846ba
Fixes Security and geo-ip tests
colings86 Jan 31, 2019
9b97657
convert multi cluster search security tests to typeless apis
colings86 Jan 31, 2019
13350cc
left over security test
colings86 Jan 31, 2019
447752b
Fix multi-cluster search tests
colings86 Jan 31, 2019
48736e0
Fixes reindex tests
colings86 Jan 31, 2019
a43b3bb
Add back a missing newline.
jtibshirani Jan 31, 2019
a3ae02d
Merge remote-tracking branch 'upstream/master' into types-in-rest-tests
jtibshirani Jan 31, 2019
5ec249c
Fix the rolling upgrade tests.
jtibshirani Jan 31, 2019
a3d7ba7
More fixes to the rolling upgrade tests.
jtibshirani Feb 1, 2019
9a20534
Fixes ingest qa test
colings86 Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ setup:
reason: Field aliases were introduced in 6.4.0.
- do:
indices.put_mapping:
include_type_name: false
colings86 marked this conversation as resolved.
Show resolved Hide resolved
index: test
body:
properties:
Expand Down
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/search/150_rewrite_on_coordinator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
search:
rest_total_hits_as_int: true
index: "search_index"
body: { "size" : 0, "query" : { "terms" : { "user" : { "index": "lookup_index", "id": "1", "path": "followers"} } } }
body: { "size" : 0, "query" : { "terms" : { "user" : { "index": "lookup_index", "type": "_doc", "id": "1", "path": "followers"} } } }
- do:
indices.create:
index: lookup_index
Expand All @@ -58,7 +58,7 @@
search:
rest_total_hits_as_int: true
index: "search_index"
body: { "size" : 0, "query" : { "terms" : { "user" : { "index": "lookup_index", "id": "1", "path": "followers"} } } }
body: { "size" : 0, "query" : { "terms" : { "user" : { "index": "lookup_index", "type": "_doc", "id": "1", "path": "followers"} } } }

- match: { _shards.total: 5 }
- match: { _shards.successful: 5 }
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_and_unfollow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
soft_deletes:
enabled: true
mappings:
doc:
properties:
field:
type: keyword
properties:
field:
type: keyword
- is_true: acknowledged

- do:
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugin/ccr/qa/rest/src/test/resources/rest-api-spec/test/ccr/follow_stats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
soft_deletes:
enabled: true
mappings:
doc:
properties:
field:
type: keyword
properties:
field:
type: keyword

- do:
ccr.follow:
Expand Down
7 changes: 3 additions & 4 deletions .../qa/rest/src/test/resources/rest-api-spec/test/ccr/index_directly_into_follower_index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
soft_deletes:
enabled: true
mappings:
doc:
properties:
field:
type: keyword
properties:
field:
type: keyword
- is_true: acknowledged

- do:
Expand Down
15 changes: 7 additions & 8 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/authenticate/10_field_level_security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,11 @@ teardown:
aliases:
the_alias : {}
mappings:
doc:
properties:
location:
properties:
city:
type: "keyword"
properties:
location:
properties:
city:
type: "keyword"
settings:
index:
number_of_shards: 1
Expand All @@ -100,9 +99,9 @@ teardown:
bulk:
refresh: true
body:
- '{"index": {"_index": "test_index", "_type": "doc"}}'
- '{"index": {"_index": "test_index"}}'
- '{"marker": "test_1", "location.city": "bos"}'
- '{"index": {"_index": "test_index", "_type": "doc"}}'
- '{"index": {"_index": "test_index"}}'
- '{"marker": "test_2", "location.city": "ams"}'

- do:
Expand Down
10 changes: 3 additions & 7 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/graph/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ setup:
number_of_shards: 1
number_of_replicas: 0
mappings:
test:
properties:
keys:
type : integer
properties:
keys:
type : integer

---
"Test basic graph explore":
Expand All @@ -22,14 +21,12 @@ setup:
- do:
index:
index: test_1
type: test
id: 1
body: { keys: [1,2,3] }

- do:
index:
index: test_1
type: test
id: 2
body: { keys: [4,5,6] }

Expand All @@ -44,7 +41,6 @@ setup:
- do:
xpack.graph.explore:
index: test_1
type: test
body: {"query": {"match": {"keys": 1}},"controls":{"use_significance":false},"vertices":[{"field": "keys","min_doc_count": 1}]}
- length: {failures: 0}
- length: {vertices: 3}
14 changes: 6 additions & 8 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ml/get_datafeed_stats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ setup:
index:
number_of_replicas: 1
mappings:
type-1:
properties:
time:
type: date
properties:
time:
type: date

- do:
headers:
Expand All @@ -26,10 +25,9 @@ setup:
index:
number_of_replicas: 1
mappings:
type-2:
properties:
time:
type: date
properties:
time:
type: date

- do:
headers:
Expand Down
23 changes: 9 additions & 14 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ml/preview_datafeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@ setup:
index: airline-data
body:
mappings:
response:
properties:
time:
type: date
airline:
type: keyword
responsetime:
type: float
event_rate:
type: integer
properties:
time:
type: date
airline:
type: keyword
responsetime:
type: float
event_rate:
type: integer

- do:
index:
index: airline-data
type: response
id: 1
body: >
{
Expand All @@ -31,7 +29,6 @@ setup:
- do:
index:
index: airline-data
type: response
id: 2
body: >
{
Expand All @@ -44,7 +41,6 @@ setup:
- do:
index:
index: airline-data
type: response
id: 3
body: >
{
Expand All @@ -57,7 +53,6 @@ setup:
- do:
index:
index: airline-data
type: response
id: 4
body: >
{
Expand Down
19 changes: 9 additions & 10 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ml/set_upgrade_mode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ setup:
index: airline-data
body:
mappings:
response:
properties:
time:
type: date
airline:
type: keyword
airport:
type: text
responsetime:
type: float
properties:
time:
type: date
airline:
type: keyword
airport:
type: text
responsetime:
type: float
- do:
headers:
Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
Expand Down
19 changes: 9 additions & 10 deletions x-pack/plugin/src/test/resources/rest-api-spec/test/ml/start_stop_datafeed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@ setup:
index: airline-data
body:
mappings:
response:
properties:
time:
type: date
airline:
type: keyword
airport:
type: text
responsetime:
type: float
properties:
time:
type: date
airline:
type: keyword
airport:
type: text
responsetime:
type: float

- do:
headers:
Expand Down
Loading