From 70fe553ce0096576dba0841cdb61a5dd5451361b Mon Sep 17 00:00:00 2001 From: Dan Hermann Date: Tue, 14 Jul 2020 13:35:52 -0500 Subject: [PATCH] [7.x] Reenable BWC tests for data streams (#59538) --- .../test/data-streams/100_delete_by_query.yml | 2 +- .../test/data-streams/10_basic.yml | 22 +++++++-------- .../test/data-streams/110_update_by_query.yml | 2 +- .../test/data-streams/20_unsupported_apis.yml | 18 ++++++------ .../30_auto_create_data_stream.yml | 4 +-- .../test/data-streams/40_supported_apis.yml | 23 ++++++++------- .../50_delete_backing_indices.yml | 10 +++---- .../data-streams/60_get_backing_indices.yml | 4 +-- .../data-streams/70_rollover_data_streams.yml | 4 +-- .../80_resolve_index_data_streams.yml | 10 +++---- .../test/data-streams/90_reindex.yml | 10 +++---- .../10_data_stream_resolvability.yml | 26 ++++++++--------- .../test/security/authz/50_data_streams.yml | 28 +++++++++---------- .../test/security/authz/55_auto_configure.yml | 8 +++--- 14 files changed, 83 insertions(+), 88 deletions(-) diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/100_delete_by_query.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/100_delete_by_query.yml index 2e5aa17bfe2..536289e4102 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/100_delete_by_query.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/100_delete_by_query.yml @@ -3,7 +3,7 @@ - skip: features: allowed_warnings version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" - do: allowed_warnings: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/10_basic.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/10_basic.yml index 6e36f15ed93..b8ba7616f7b 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/10_basic.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/10_basic.yml @@ -1,8 +1,6 @@ setup: - skip: features: allowed_warnings - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" - do: allowed_warnings: - "index template [my-template1] has index patterns [simple-data-stream1] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template1] will take precedence during new index creation" @@ -32,8 +30,8 @@ setup: --- "Create data stream": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.create_data_stream: @@ -106,8 +104,8 @@ setup: --- "Create data stream with invalid name": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: catch: bad_request @@ -121,8 +119,8 @@ setup: --- "Get data stream": - skip: - version: " - 7.9.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: indices.create_data_stream: @@ -186,8 +184,8 @@ setup: --- "Delete data stream with backing indices": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.create_data_stream: @@ -230,8 +228,8 @@ setup: --- "append-only writes to backing indices prohobited": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/110_update_by_query.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/110_update_by_query.yml index 5f525e44c3e..f7a8db41b6c 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/110_update_by_query.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/110_update_by_query.yml @@ -3,7 +3,7 @@ - skip: features: allowed_warnings version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" - do: allowed_warnings: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/20_unsupported_apis.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/20_unsupported_apis.yml index 9149eb91ebe..03cbb1bae8c 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/20_unsupported_apis.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/20_unsupported_apis.yml @@ -1,8 +1,8 @@ --- "Test apis that do not supported data streams": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: @@ -49,8 +49,8 @@ --- "Prohibit clone on data stream's write index": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: @@ -98,8 +98,8 @@ --- "Prohibit shrink on data stream's write index": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: @@ -135,8 +135,8 @@ --- "Close write index for data stream fails": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: @@ -166,7 +166,7 @@ --- "Prohibit split on data stream's write index": - skip: - version: " - 7.9.99" + version: " - 7.8.99" reason: "data streams only supported in 7.9+" features: allowed_warnings diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/30_auto_create_data_stream.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/30_auto_create_data_stream.yml index ed6e59ffe97..8a87454822b 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/30_auto_create_data_stream.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/30_auto_create_data_stream.yml @@ -1,8 +1,8 @@ --- "Put index template": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/40_supported_apis.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/40_supported_apis.yml index 3d12258ec63..e64875243e9 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/40_supported_apis.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/40_supported_apis.yml @@ -2,8 +2,6 @@ setup: - skip: features: allowed_warnings - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" - do: allowed_warnings: - "index template [logs_template] has index patterns [logs-foobar] matching patterns from existing older templates [global] with patterns (global => [*]); this template [logs_template] will take precedence during new index creation" @@ -26,8 +24,8 @@ teardown: --- "Verify get index api": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.get: @@ -39,8 +37,8 @@ teardown: --- "Verify get mapping api": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.get_mapping: @@ -51,8 +49,8 @@ teardown: --- "Verify shard stores api": - skip: - version: " - 7.9.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -103,8 +101,9 @@ teardown: --- "Verify search shards api": - skip: + features: allowed_warnings version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" - do: allowed_warnings: @@ -136,7 +135,7 @@ teardown: - skip: features: allowed_warnings version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" - do: allowed_warnings: @@ -168,7 +167,7 @@ teardown: "Open write index for data stream opens all backing indices": - skip: version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -231,7 +230,7 @@ teardown: "Verify rank eval with data streams": - skip: version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/50_delete_backing_indices.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/50_delete_backing_indices.yml index 69f8b71fcbd..4a710718f2c 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/50_delete_backing_indices.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/50_delete_backing_indices.yml @@ -1,8 +1,6 @@ setup: - skip: features: allowed_warnings - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" - do: allowed_warnings: - "index template [my-template] has index patterns [simple-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template] will take precedence during new index creation" @@ -15,8 +13,8 @@ setup: --- "Delete backing index on data stream": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" - do: indices.create_data_stream: @@ -67,8 +65,8 @@ setup: --- "Attempt to delete write index on data stream is rejected": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported9+" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: indices.create_data_stream: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/60_get_backing_indices.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/60_get_backing_indices.yml index 785b7632cad..a022f9b3540 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/60_get_backing_indices.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/60_get_backing_indices.yml @@ -1,8 +1,8 @@ --- "Get backing indices for data stream": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/70_rollover_data_streams.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/70_rollover_data_streams.yml index 08ffac907ac..d5a83a7fedf 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/70_rollover_data_streams.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/70_rollover_data_streams.yml @@ -1,8 +1,8 @@ --- "Roll over a data stream": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/80_resolve_index_data_streams.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/80_resolve_index_data_streams.yml index 478bda2471a..94a8c798514 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/80_resolve_index_data_streams.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/80_resolve_index_data_streams.yml @@ -1,8 +1,8 @@ --- setup: - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "resolve index api only supported in 7.9+" features: allowed_warnings - do: @@ -65,8 +65,8 @@ setup: --- "Resolve index with indices, aliases, and data streams": - skip: - version: " - 7.9.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "resolve index api only supported in 7.9+" - do: indices.resolve_index: @@ -109,7 +109,7 @@ setup: --- "Resolve index with hidden and closed indices": - skip: - version: " - 7.9.99" + version: " - 7.8.99" reason: change after backporting - do: diff --git a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/90_reindex.yml b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/90_reindex.yml index 204ecb62a24..fad2124c9f7 100644 --- a/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/90_reindex.yml +++ b/x-pack/plugin/data-streams/qa/rest/src/test/resources/rest-api-spec/test/data-streams/90_reindex.yml @@ -1,8 +1,8 @@ --- setup: - skip: - version: " - 7.99.99" - reason: "enable in 7.9+ when backported" + version: " - 7.8.99" + reason: "data streams only supported in 7.9+" features: allowed_warnings - do : @@ -24,7 +24,7 @@ teardown: "Reindex from data stream into another data stream": - skip: version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -57,7 +57,7 @@ teardown: "Reindex from index into data stream": - skip: version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -90,7 +90,7 @@ teardown: "Reindex from data stream into an index": - skip: version: " - 7.8.99" - reason: "data streams only supported in 7.9+" + reason: "data streams available in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_stream/10_data_stream_resolvability.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_stream/10_data_stream_resolvability.yml index 33990977ecf..e5b1696c853 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_stream/10_data_stream_resolvability.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_stream/10_data_stream_resolvability.yml @@ -152,8 +152,8 @@ --- "Verify data stream resolvability in ILM remove policy API": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -241,8 +241,8 @@ --- "Verify data stream resolvability for graph explore API": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -297,8 +297,8 @@ --- "Verify data stream resolvability in migrations API": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -336,8 +336,8 @@ --- "Verify data stream resolvability in async search": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: @@ -362,17 +362,17 @@ - do: index: index: simple-data-stream1 - body: { max: 2 } + body: { max: 2, '@timestamp': '2020-12-12' } - do: index: index: simple-data-stream1 - body: { max: 1 } + body: { max: 1, '@timestamp': '2020-12-12' } - do: index: index: simple-data-stream1 - body: { max: 3 } + body: { max: 3, '@timestamp': '2020-12-12' } - do: indices.refresh: @@ -406,8 +406,8 @@ --- "Verify data stream resolvability in rollup search": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: allowed_warnings - do: diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/50_data_streams.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/50_data_streams.yml index b5e659e2959..b5927e13c94 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/50_data_streams.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/50_data_streams.yml @@ -2,8 +2,8 @@ setup: - skip: features: ["headers", "allowed_warnings"] - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: cluster.health: @@ -88,8 +88,8 @@ teardown: --- "Test backing indices inherit parent data stream privileges": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: ["headers"] - do: # superuser @@ -150,8 +150,8 @@ teardown: --- "Test that requests not supporting data streams do not include data streams among authorized indices": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: ["headers"] - do: # superuser @@ -182,8 +182,8 @@ teardown: --- "Test that create data stream is limited to authorized namespace": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: headers: { Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" } # test_user @@ -205,8 +205,8 @@ teardown: --- "Test that get data stream is limited to authorized namespace": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: # superuser indices.create_data_stream: @@ -270,8 +270,8 @@ teardown: --- "Test that delete data stream is limited to authorized namespace": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" - do: # superuser indices.create_data_stream: @@ -309,8 +309,8 @@ teardown: --- "auto_configure privilege permits auto-create of data streams": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "data streams available in 7.9+" features: ["headers", "allowed_warnings"] - do: diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/55_auto_configure.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/55_auto_configure.yml index 4ee0e661923..ab818c3f12e 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/55_auto_configure.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/security/authz/55_auto_configure.yml @@ -2,8 +2,8 @@ setup: - skip: features: ["headers", "allowed_warnings"] - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "auto_configure available in 7.9+" - do: cluster.health: @@ -58,8 +58,8 @@ teardown: --- "auto_configure privilege permits auto-create of indices": - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" + version: " - 7.8.99" + reason: "auto_configure available in 7.9+" features: ["headers", "allowed_warnings"] # should succeed because test_user is authorized for auto_configure on index-auto-configure