Skip to content

[7.x] Properly handle wildcards in data stream deletion requests #78510

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

Merged
danhermann merged 2 commits into from
Sep 30, 2021
Merged

[7.x] Properly handle wildcards in data stream deletion requests #78510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
951ee3f
Properly handle wildcards in data stream deletion requests (#78463)
danhermann Sep 30, 2021
ce522a9
adjust skip version
danhermann Sep 30, 2021
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: 0 additions & 1 deletion ...main/java/org/elasticsearch/xpack/datastreams/action/DeleteDataStreamTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ protected void masterOperation(
for (String name : names) {
systemIndices.validateDataStreamAccess(name, threadPool.getThreadContext());
}
request.indices(names.toArray(Strings.EMPTY_ARRAY));

clusterService.submitStateUpdateTask(
"remove-data-stream [" + Strings.arrayToCommaDelimitedString(request.getNames()) + "]",
Expand Down
37 changes: 37 additions & 0 deletions x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/data_stream/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,43 @@ setup:
indices.delete_data_stream:
name: simple-data-stream2

---
"Delete data stream by wildcard":
- skip:
version: " - 7.8.99"
reason: "data streams supported only in 7.9+"

- do:
indices.create_data_stream:
name: simple-data-stream1
- is_true: acknowledged

- do:
indices.create_data_stream:
name: simple-data-stream2
- is_true: acknowledged

- do:
indices.delete_data_stream:
name: no-matching-data-streams*
- is_true: acknowledged

- do:
indices.get_data_stream:
name: "*"
- match: { data_streams.0.name: simple-data-stream1 }
- match: { data_streams.1.name: simple-data-stream2 }

- do:
indices.delete_data_stream:
name: simple-data-stream*
- is_true: acknowledged

- do:
indices.get_data_stream:
name: "*"
- length: { data_streams: 0 }

---
"append-only writes to backing indices prohibited":
- skip:
Expand Down