Skip to content

Commit efed960

Browse files
jbaierajbaiera
committed
Remove feature flag from test code
1 parent 56a7989 commit efed960

File tree

16 files changed

+21
-101
lines changed

16 files changed

+21
-101
lines changed

‎server/src/test/java/org/elasticsearch/action/bulk/BulkOperationTests.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,6 @@ public void testBulkToDataStreamFailingEntireShard() throws Exception {
392392
* A bulk operation to a data stream with a failure store enabled should redirect any shard level failures to the failure store.
393393
*/
394394
public void testFailingEntireShardRedirectsToFailureStore() throws Exception {
395-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
396-
397395
// Requests that go to two separate shards
398396
BulkRequest bulkRequest = new BulkRequest();
399397
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -419,8 +417,6 @@ public void testFailingEntireShardRedirectsToFailureStore() throws Exception {
419417
* failure store.
420418
*/
421419
public void testFailingDocumentRedirectsToFailureStore() throws Exception {
422-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
423-
424420
// Requests that go to two separate shards
425421
BulkRequest bulkRequest = new BulkRequest();
426422
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -442,8 +438,6 @@ public void testFailingDocumentRedirectsToFailureStore() throws Exception {
442438
}
443439

444440
public void testFailingDocumentRedirectsToFailureStoreWhenEnabledByClusterSetting() {
445-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
446-
447441
BulkRequest bulkRequest = new BulkRequest();
448442
bulkRequest.add(
449443
new IndexRequest(fsBySettingsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE)
@@ -498,8 +492,6 @@ public void testFailingDocumentRedirectsToFailureStoreWhenEnabledByClusterSettin
498492
* a shard-level failure while writing to the failure store indices.
499493
*/
500494
public void testFailureStoreShardFailureRejectsDocument() throws Exception {
501-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
502-
503495
// Requests that go to two separate shards
504496
BulkRequest bulkRequest = new BulkRequest();
505497
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -538,8 +530,6 @@ public void testFailureStoreShardFailureRejectsDocument() throws Exception {
538530
* instead will simply report its original failure in the response, with the conversion failure present as a suppressed exception.
539531
*/
540532
public void testFailedDocumentCanNotBeConvertedFails() throws Exception {
541-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
542-
543533
// Requests that go to two separate shards
544534
BulkRequest bulkRequest = new BulkRequest();
545535
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -574,8 +564,6 @@ public void testFailedDocumentCanNotBeConvertedFails() throws Exception {
574564
* returns an unblocked cluster, the redirection of failure documents should proceed and not return early.
575565
*/
576566
public void testRetryableBlockAcceptsFailureStoreDocument() throws Exception {
577-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
578-
579567
// Requests that go to two separate shards
580568
BulkRequest bulkRequest = new BulkRequest();
581569
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -667,8 +655,6 @@ public void testRetryableBlockAcceptsFailureStoreDocument() throws Exception {
667655
* non-retryable block when the redirected documents would be sent to the shard-level action.
668656
*/
669657
public void testBlockedClusterRejectsFailureStoreDocument() throws Exception {
670-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
671-
672658
// Requests that go to two separate shards
673659
BulkRequest bulkRequest = new BulkRequest();
674660
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -720,8 +706,6 @@ public void testBlockedClusterRejectsFailureStoreDocument() throws Exception {
720706
* retryable block to clear when the redirected documents would be sent to the shard-level action.
721707
*/
722708
public void testOperationTimeoutRejectsFailureStoreDocument() throws Exception {
723-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
724-
725709
// Requests that go to two separate shards
726710
BulkRequest bulkRequest = new BulkRequest();
727711
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -781,8 +765,6 @@ public void testOperationTimeoutRejectsFailureStoreDocument() throws Exception {
781765
* for a retryable block to clear when the redirected documents would be sent to the shard-level action.
782766
*/
783767
public void testNodeClosureRejectsFailureStoreDocument() {
784-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
785-
786768
// Requests that go to two separate shards
787769
BulkRequest bulkRequest = new BulkRequest();
788770
bulkRequest.add(new IndexRequest(fsDataStreamName).id("1").source(Map.of("key", "val")).opType(DocWriteRequest.OpType.CREATE));
@@ -826,8 +808,6 @@ public void testNodeClosureRejectsFailureStoreDocument() {
826808
* rollover, it first needs to roll over the failure store and then redirect the failure to the <i>new</i> failure index.
827809
*/
828810
public void testLazilyRollingOverFailureStore() throws Exception {
829-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
830-
831811
// Requests that go to two separate shards
832812
BulkRequest bulkRequest = new BulkRequest();
833813
bulkRequest.add(
@@ -885,8 +865,6 @@ public void testLazilyRollingOverFailureStore() throws Exception {
885865
* should be added to the list of suppressed causes in the <code>BulkItemResponse</code>.
886866
*/
887867
public void testFailureWhileRollingOverFailureStore() throws Exception {
888-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
889-
890868
// Requests that go to two separate shards
891869
BulkRequest bulkRequest = new BulkRequest();
892870
bulkRequest.add(

‎server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,6 @@ public void testRejectionAfterCreateIndexIsPropagated() {
446446
}
447447

448448
public void testResolveFailureStoreFromMetadata() throws Exception {
449-
assumeThat(DataStream.isFailureStoreFeatureFlagEnabled(), is(true));
450-
451449
String dataStreamWithFailureStoreEnabled = "test-data-stream-failure-enabled";
452450
String dataStreamWithFailureStoreDefault = "test-data-stream-failure-default";
453451
String dataStreamWithFailureStoreDisabled = "test-data-stream-failure-disabled";
@@ -537,8 +535,6 @@ public void testResolveFailureStoreFromMetadata() throws Exception {
537535
}
538536

539537
public void testResolveFailureStoreFromTemplate() throws Exception {
540-
assumeThat(DataStream.isFailureStoreFeatureFlagEnabled(), is(true));
541-
542538
String dsTemplateWithFailureStoreEnabled = "test-data-stream-failure-enabled";
543539
String dsTemplateWithFailureStoreDefault = "test-data-stream-failure-default";
544540
String dsTemplateWithFailureStoreDisabled = "test-data-stream-failure-disabled";

‎test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,7 @@ public static ClusterState getClusterStateWithDataStreams(
491491
"template_1",
492492
ComposableIndexTemplate.builder()
493493
.indexPatterns(List.of("*"))
494-
.template(
495-
Template.builder()
496-
.dataStreamOptions(
497-
DataStream.isFailureStoreFeatureFlagEnabled() ? createDataStreamOptionsTemplate(storeFailures) : null
498-
)
499-
)
494+
.template(Template.builder().dataStreamOptions(createDataStreamOptionsTemplate(storeFailures)))
500495
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate())
501496
.build()
502497
);
@@ -512,7 +507,7 @@ public static ClusterState getClusterStateWithDataStreams(
512507
allIndices.addAll(backingIndices);
513508

514509
List<IndexMetadata> failureStores = new ArrayList<>();
515-
if (DataStream.isFailureStoreFeatureFlagEnabled() && Boolean.TRUE.equals(storeFailures)) {
510+
if (Boolean.TRUE.equals(storeFailures)) {
516511
for (int failureStoreNumber = 1; failureStoreNumber <= dsTuple.v2(); failureStoreNumber++) {
517512
failureStores.add(
518513
createIndexMetadata(

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public void testValidationErrorWithUnknownClusterPrivilegeName() {
5050
}
5151

5252
public void testValidationErrorWithFailureStorePrivilegeInRemoteIndices() {
53-
assumeTrue("requires failure store feature", DataStream.isFailureStoreFeatureFlagEnabled());
5453
final PutRoleRequest request = new PutRoleRequest();
5554
request.name(randomAlphaOfLengthBetween(4, 9));
5655
request.addRemoteIndex(

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/RoleDescriptorRequestValidatorTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
public class RoleDescriptorRequestValidatorTests extends ESTestCase {
2424

2525
public void testSelectorsValidation() {
26-
assumeTrue("failure store feature flag must be enabled", DataStream.isFailureStoreFeatureFlagEnabled());
2726
String[] invalidIndexNames = {
2827
"index::failures",
2928
".fs-*::failures",

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/permission/LimitedRoleTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ public void testAllowedActionsMatcher() {
648648
}
649649

650650
public void testAllowedActionsMatcherWithSelectors() {
651-
assumeTrue("failure store feature must be enabled", DataStream.isFailureStoreFeatureFlagEnabled());
652651
Role fromRole = Role.builder(EMPTY_RESTRICTED_INDICES, "fromRole")
653652
.add(IndexPrivilege.READ_FAILURE_STORE, "ind*")
654653
.add(IndexPrivilege.READ, "ind*")

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/privilege/IndexPrivilegeTests.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,13 @@ public void testFindPrivilegesThatGrant() {
7070
);
7171
assertThat(findPrivilegesThatGrant(RefreshAction.NAME), equalTo(List.of("maintenance", "manage", "all")));
7272

73-
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
74-
Predicate<IndexPrivilege> failuresOnly = p -> p.getSelectorPredicate() == IndexComponentSelectorPredicate.FAILURES;
75-
assertThat(findPrivilegesThatGrant(TransportSearchAction.TYPE.name(), failuresOnly), equalTo(List.of("read_failure_store")));
76-
assertThat(findPrivilegesThatGrant(TransportIndexAction.NAME, failuresOnly), equalTo(List.of()));
77-
assertThat(findPrivilegesThatGrant(TransportUpdateAction.NAME, failuresOnly), equalTo(List.of()));
78-
assertThat(findPrivilegesThatGrant(TransportDeleteAction.NAME, failuresOnly), equalTo(List.of()));
79-
assertThat(findPrivilegesThatGrant(IndicesStatsAction.NAME, failuresOnly), equalTo(List.of("manage_failure_store")));
80-
assertThat(findPrivilegesThatGrant(RefreshAction.NAME, failuresOnly), equalTo(List.of("manage_failure_store")));
81-
}
73+
Predicate<IndexPrivilege> failuresOnly = p -> p.getSelectorPredicate() == IndexComponentSelectorPredicate.FAILURES;
74+
assertThat(findPrivilegesThatGrant(TransportSearchAction.TYPE.name(), failuresOnly), equalTo(List.of("read_failure_store")));
75+
assertThat(findPrivilegesThatGrant(TransportIndexAction.NAME, failuresOnly), equalTo(List.of()));
76+
assertThat(findPrivilegesThatGrant(TransportUpdateAction.NAME, failuresOnly), equalTo(List.of()));
77+
assertThat(findPrivilegesThatGrant(TransportDeleteAction.NAME, failuresOnly), equalTo(List.of()));
78+
assertThat(findPrivilegesThatGrant(IndicesStatsAction.NAME, failuresOnly), equalTo(List.of("manage_failure_store")));
79+
assertThat(findPrivilegesThatGrant(RefreshAction.NAME, failuresOnly), equalTo(List.of("manage_failure_store")));
8280
}
8381

8482
public void testGet() {
@@ -117,7 +115,6 @@ public void testGet() {
117115
}
118116

119117
public void testResolveSameSelectorPrivileges() {
120-
assumeTrue("requires failure store feature", DataStream.isFailureStoreFeatureFlagEnabled());
121118
{
122119
IndexPrivilege actual = resolvePrivilegeAndAssertSingleton(Set.of("read_failure_store"));
123120
assertThat(actual, equalTo(IndexPrivilege.READ_FAILURE_STORE));
@@ -144,7 +141,6 @@ public void testResolveSameSelectorPrivileges() {
144141
}
145142

146143
public void testResolveBySelectorAccess() {
147-
assumeTrue("requires failure store feature", DataStream.isFailureStoreFeatureFlagEnabled());
148144
{
149145
Set<IndexPrivilege> actual = IndexPrivilege.resolveBySelectorAccess(Set.of("read_failure_store"));
150146
assertThat(actual, containsInAnyOrder(IndexPrivilege.READ_FAILURE_STORE));

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,6 @@ public void testIndexPatterns() throws Exception {
10271027
}
10281028

10291029
public void testDataStreamPatterns() throws Exception {
1030-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
1031-
10321030
Map<String, Long> testCases = new HashMap<>();
10331031
// Concrete data stream with each selector
10341032
testCases.put("test_ds_patterns_1", 5L);
@@ -1087,8 +1085,6 @@ public void testDataStreamPatterns() throws Exception {
10871085
}
10881086

10891087
public void testDataStreamInvalidPatterns() throws Exception {
1090-
Assume.assumeTrue(DataStream.isFailureStoreFeatureFlagEnabled());
1091-
10921088
Map<String, String> testCases = new HashMap<>();
10931089
// === Errors
10941090
// Only recognized components can be selected

‎x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,9 @@ public class Constants {
513513
"indices:admin/data_stream/lifecycle/get",
514514
"indices:admin/data_stream/lifecycle/put",
515515
"indices:admin/data_stream/lifecycle/explain",
516-
DataStream.isFailureStoreFeatureFlagEnabled() ? "indices:admin/data_stream/options/delete" : null,
517-
DataStream.isFailureStoreFeatureFlagEnabled() ? "indices:admin/data_stream/options/get" : null,
518-
DataStream.isFailureStoreFeatureFlagEnabled() ? "indices:admin/data_stream/options/put" : null,
516+
"indices:admin/data_stream/options/delete",
517+
"indices:admin/data_stream/options/get",
518+
"indices:admin/data_stream/options/put",
519519
"indices:admin/delete",
520520
"indices:admin/flush",
521521
"indices:admin/flush[s]",

‎x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/action/user/TransportHasPrivilegesActionTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ public void testHasPrivilegesRequestDoesNotAllowDLSRoleQueryBasedIndicesPrivileg
9292
}
9393

9494
public void testHasPrivilegesRequestDoesNotAllowSelectorsInIndexPatterns() {
95-
assumeTrue("failure store required", DataStream.isFailureStoreFeatureFlagEnabled());
96-
9795
final ThreadContext threadContext = new ThreadContext(Settings.EMPTY);
9896
final SecurityContext context = mock(SecurityContext.class);
9997
final User user = new User("user-1", "superuser");

0 commit comments

Comments
 (0)