Skip to content

Commit 5440348

Browse files
authored
[CI] Fix operator constants for data_lifecycle, synonyms and query_rules (#98760)
The same issue for data_lifecycle was fixed in #98307. This PR applies the same fix to 8.9. Synonyms and query_rules are still behind feature flag in 8.9. This PR adds the feature flag checks accordingly. Resolves: #98704
1 parent 1f25984 commit 5440348

File tree

1 file changed

+11
-9
lines changed
  • x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator

1 file changed

+11
-9
lines changed

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

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

1010
import org.elasticsearch.cluster.metadata.DataLifecycle;
11+
import org.elasticsearch.common.util.FeatureFlag;
12+
import org.elasticsearch.synonyms.SynonymsAPI;
1113
import org.elasticsearch.transport.TcpTransport;
1214

1315
import java.util.Objects;
@@ -67,11 +69,11 @@ public class Constants {
6769
"cluster:admin/script_language/get",
6870
"cluster:admin/scripts/painless/context",
6971
"cluster:admin/scripts/painless/execute",
70-
"cluster:admin/synonyms/delete",
71-
"cluster:admin/synonyms/get",
72-
"cluster:admin/synonyms/put",
73-
"cluster:admin/synonyms_sets/get",
74-
"cluster:admin/synonym_rules/put",
72+
SynonymsAPI.isEnabled() ? "cluster:admin/synonyms/delete" : null,
73+
SynonymsAPI.isEnabled() ? "cluster:admin/synonyms/get" : null,
74+
SynonymsAPI.isEnabled() ? "cluster:admin/synonyms/put" : null,
75+
SynonymsAPI.isEnabled() ? "cluster:admin/synonyms_sets/get" : null,
76+
SynonymsAPI.isEnabled() ? "cluster:admin/synonym_rules/put" : null,
7577
"cluster:admin/settings/update",
7678
"cluster:admin/slm/delete",
7779
"cluster:admin/slm/execute",
@@ -190,9 +192,9 @@ public class Constants {
190192
"cluster:admin/xpack/ml/upgrade_mode",
191193
"cluster:admin/xpack/monitoring/bulk",
192194
"cluster:admin/xpack/monitoring/migrate/alerts",
193-
"cluster:admin/xpack/query_rules/delete",
194-
"cluster:admin/xpack/query_rules/get",
195-
"cluster:admin/xpack/query_rules/put",
195+
new FeatureFlag("query_rules").isEnabled() ? "cluster:admin/xpack/query_rules/delete" : null,
196+
new FeatureFlag("query_rules").isEnabled() ? "cluster:admin/xpack/query_rules/get" : null,
197+
new FeatureFlag("query_rules").isEnabled() ? "cluster:admin/xpack/query_rules/put" : null,
196198
"cluster:admin/xpack/rollup/delete",
197199
"cluster:admin/xpack/rollup/put",
198200
"cluster:admin/xpack/rollup/start",
@@ -375,7 +377,7 @@ public class Constants {
375377
"cluster:monitor/xpack/usage/analytics",
376378
"cluster:monitor/xpack/usage/archive",
377379
"cluster:monitor/xpack/usage/ccr",
378-
DataLifecycle.isEnabled() ? "cluster:monitor/xpack/usage/data_lifecycle" : null,
380+
"cluster:monitor/xpack/usage/data_lifecycle",
379381
"cluster:monitor/xpack/usage/data_streams",
380382
"cluster:monitor/xpack/usage/data_tiers",
381383
"cluster:monitor/xpack/usage/enrich",

0 commit comments

Comments
 (0)