Skip to content

[8.x] Limit test to not look for failure store indices when disabled #120017

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
merged 1 commit into from
Jan 11, 2025
Merged

[8.x] Limit test to not look for failure store indices when disabled #120017

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions .../src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,7 @@ public void testDataStreamsAreVisibleWhenIncludedByRequestWithoutWildcard() {

public void testBackingIndicesAreVisibleWhenIncludedByRequestWithWildcard() {
final User user = new User("data-stream-tester3", "data_stream_test3");
boolean failureStore = randomBoolean();
boolean failureStore = runFailureStore();
SearchRequest request = new SearchRequest(failureStore ? ".fs-logs*" : ".ds-logs*");
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
assertThat(request.includeDataStreams(), is(true));
Expand Down Expand Up @@ -2451,7 +2451,7 @@ public void testBackingIndicesAreNotVisibleWhenNotIncludedByRequestWithoutWildca

public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaWildcardAndRequestThatIncludesDataStreams() {
final User user = new User("data-stream-tester2", "backing_index_test_wildcards");
boolean failureStore = randomBoolean();
boolean failureStore = runFailureStore();
String indexName = failureStore ? ".fs-logs-foobar-*" : ".ds-logs-foobar-*";
SearchRequest request = new SearchRequest(indexName);
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
Expand Down Expand Up @@ -2491,7 +2491,7 @@ public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaWildcar

public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaNameAndRequestThatIncludesDataStreams() {
final User user = new User("data-stream-tester2", "backing_index_test_name");
boolean failureStore = randomBoolean();
boolean failureStore = runFailureStore();
String indexName = failureStore ? ".fs-logs-foobar-*" : ".ds-logs-foobar-*";
SearchRequest request = new SearchRequest(indexName);
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
Expand Down Expand Up @@ -2523,7 +2523,7 @@ public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaNameAnd

public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaWildcardAndRequestThatExcludesDataStreams() {
final User user = new User("data-stream-tester2", "backing_index_test_wildcards");
boolean failureStore = randomBoolean();
boolean failureStore = runFailureStore();
String indexName = failureStore ? ".fs-logs-foobar-*" : ".ds-logs-foobar-*";
GetAliasesRequest request = new GetAliasesRequest(indexName);
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
Expand Down Expand Up @@ -2563,7 +2563,7 @@ public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaWildcar

public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaNameAndRequestThatExcludesDataStreams() {
final User user = new User("data-stream-tester2", "backing_index_test_name");
boolean failureStore = randomBoolean();
boolean failureStore = runFailureStore();
String indexName = failureStore ? ".fs-logs-foobar-*" : ".ds-logs-foobar-*";
GetAliasesRequest request = new GetAliasesRequest(indexName);
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
Expand Down Expand Up @@ -2678,4 +2678,8 @@ private void assertSameValues(List<String> indices, String[] expectedIndices) {
assertThat(indices.stream().distinct().count(), equalTo((long) expectedIndices.length));
assertThat(indices, hasItems(expectedIndices));
}

private boolean runFailureStore() {
return DataStream.isFailureStoreFeatureFlagEnabled() && randomBoolean();
}
}