Skip to content

Commit d30d272

Browse files
authored
Only perform operator check for migration reindex actions when feature flag is present (#118388)
1 parent b2d07fc commit d30d272

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,6 @@ tests:
274274
- class: org.elasticsearch.datastreams.DataStreamsClientYamlTestSuiteIT
275275
method: test {p0=data_stream/120_data_streams_stats/Multiple data stream}
276276
issue: https://github.com/elastic/elasticsearch/issues/118217
277-
- class: org.elasticsearch.xpack.security.operator.OperatorPrivilegesIT
278-
method: testEveryActionIsEitherOperatorOnlyOrNonOperator
279-
issue: https://github.com/elastic/elasticsearch/issues/118220
280277
- class: org.elasticsearch.validation.DotPrefixClientYamlTestSuiteIT
281278
issue: https://github.com/elastic/elasticsearch/issues/118224
282279
- class: org.elasticsearch.packaging.test.ArchiveTests

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package org.elasticsearch.xpack.security.operator;
99

1010
import org.elasticsearch.cluster.metadata.DataStream;
11+
import org.elasticsearch.common.util.FeatureFlag;
1112

1213
import java.util.Objects;
1314
import java.util.Set;
@@ -636,6 +637,8 @@ public class Constants {
636637
"internal:gateway/local/started_shards",
637638
"internal:admin/indices/prevalidate_shard_path",
638639
"internal:index/metadata/migration_version/update",
640+
new FeatureFlag("reindex_data_stream").isEnabled() ? "indices:admin/migration/reindex_status" : null,
641+
new FeatureFlag("reindex_data_stream").isEnabled() ? "indices:admin/data_stream/reindex" : null,
639642
"internal:admin/repository/verify",
640643
"internal:admin/repository/verify/coordinate"
641644
).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());

0 commit comments

Comments
 (0)