Skip to content

Commit 52beaf0

Browse files
authored
Limit test to not look for failure store indices when failure store is disabled (#120017)
1 parent 1ebcedf commit 52beaf0

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolverTests.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2371,7 +2371,7 @@ public void testDataStreamsAreVisibleWhenIncludedByRequestWithoutWildcard() {
23712371

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

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

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

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

25642564
public void testDataStreamNotAuthorizedWhenBackingIndicesAreAuthorizedViaNameAndRequestThatExcludesDataStreams() {
25652565
final User user = new User("data-stream-tester2", "backing_index_test_name");
2566-
boolean failureStore = randomBoolean();
2566+
boolean failureStore = runFailureStore();
25672567
String indexName = failureStore ? ".fs-logs-foobar-*" : ".ds-logs-foobar-*";
25682568
GetAliasesRequest request = new GetAliasesRequest(indexName);
25692569
assertThat(request, instanceOf(IndicesRequest.Replaceable.class));
@@ -2678,4 +2678,8 @@ private void assertSameValues(List<String> indices, String[] expectedIndices) {
26782678
assertThat(indices.stream().distinct().count(), equalTo((long) expectedIndices.length));
26792679
assertThat(indices, hasItems(expectedIndices));
26802680
}
2681+
2682+
private boolean runFailureStore() {
2683+
return DataStream.isFailureStoreFeatureFlagEnabled() && randomBoolean();
2684+
}
26812685
}

0 commit comments

Comments
 (0)