Skip to content

Commit 277dd0a

Browse files
committed
Add index_expression_selectors to the search capabilities, rename rollover's to match
1 parent 5ab4679 commit 277dd0a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/210_rollover_failure_store.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ setup:
99
capabilities: [ 'data_stream_options.failure_store' ]
1010
- method: POST
1111
path: /{index}/_rollover
12-
capabilities: [ 'index-expression-selectors' ]
12+
capabilities: [ 'index_expression_selectors' ]
1313

1414
- do:
1515
allowed_warnings:
@@ -313,7 +313,7 @@ teardown:
313313
capabilities:
314314
- method: POST
315315
path: /{index}/_rollover
316-
capabilities: [index-expression-selectors]
316+
capabilities: [index_expression_selectors]
317317

318318
# Initialize failure store
319319
- do:

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestRolloverIndexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public String getName() {
4444
@Override
4545
public Set<String> supportedCapabilities() {
4646
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
47-
return Set.of("return-404-on-missing-target", "index-expression-selectors");
47+
return Set.of("return-404-on-missing-target", "index_expression_selectors");
4848
} else {
4949
return Set.of("return-404-on-missing-target");
5050
}

server/src/main/java/org/elasticsearch/rest/action/search/SearchCapabilities.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ private SearchCapabilities() {}
4646

4747
private static final String HIGHLIGHT_MAX_ANALYZED_OFFSET_DEFAULT = "highlight_max_analyzed_offset_default";
4848

49+
private static final String INDEX_SELECTOR_SYNTAX = "index_expression_selectors";
50+
4951
public static final Set<String> CAPABILITIES;
5052
static {
5153
HashSet<String> capabilities = new HashSet<>();
@@ -63,6 +65,7 @@ private SearchCapabilities() {}
6365
capabilities.add(K_DEFAULT_TO_SIZE);
6466
capabilities.add(KQL_QUERY_SUPPORTED);
6567
capabilities.add(HIGHLIGHT_MAX_ANALYZED_OFFSET_DEFAULT);
68+
capabilities.add(INDEX_SELECTOR_SYNTAX);
6669
CAPABILITIES = Set.copyOf(capabilities);
6770
}
6871
}

0 commit comments

Comments
 (0)