From f8efd6919989937b70feb28dce383db5ee9d569f Mon Sep 17 00:00:00 2001 From: Mayya Sharipova Date: Thu, 13 Jul 2023 11:34:25 -0400 Subject: [PATCH] Add synonyms feature for test clusters (#97658) Fix for #97334 where incorrect feature name was provided. Correct more instances of synonyms_feature_flag_enabled for synonyms_api_feature_flag_enabled Closes #96641, #97177 --- modules/analysis-common/build.gradle | 2 +- rest-api-spec/build.gradle | 2 +- .../src/main/resources/rest-api-spec/api/synonym_rule.put.json | 2 +- .../src/main/resources/rest-api-spec/api/synonyms.delete.json | 2 +- .../src/main/resources/rest-api-spec/api/synonyms.get.json | 2 +- .../src/main/resources/rest-api-spec/api/synonyms.put.json | 2 +- .../src/main/resources/rest-api-spec/api/synonyms_sets.get.json | 2 +- .../main/java/org/elasticsearch/test/cluster/FeatureFlag.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle index 5979f10192add..1290c8528af4f 100644 --- a/modules/analysis-common/build.gradle +++ b/modules/analysis-common/build.gradle @@ -26,7 +26,7 @@ restResources { testClusters.configureEach { module ':modules:reindex' module ':modules:mapper-extras' - requiresFeature 'es.synonyms_feature_flag_enabled', Version.fromString("8.9.0") + requiresFeature 'es.synonyms_api_feature_flag_enabled', Version.fromString("8.9.0") } dependencies { diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle index aefe2a9485f48..2e8a3a41f127d 100644 --- a/rest-api-spec/build.gradle +++ b/rest-api-spec/build.gradle @@ -40,7 +40,7 @@ dependencies { } testClusters.configureEach { - requiresFeature 'es.synonyms_feature_flag_enabled', Version.fromString("8.9.0") + requiresFeature 'es.synonyms_api_feature_flag_enabled', Version.fromString("8.9.0") } tasks.named("yamlRestTestV7CompatTransform").configure { task -> diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonym_rule.put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonym_rule.put.json index d99ec1f871aa6..42b76503b13cb 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonym_rule.put.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonym_rule.put.json @@ -6,7 +6,7 @@ }, "stability": "experimental", "visibility": "feature_flag", - "feature_flag": "es.synonyms_feature_flag_enabled", + "feature_flag": "es.synonyms_api_feature_flag_enabled", "headers": { "accept": [ "application/json" diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete.json index c7a10932a6185..18d5dfeb93d73 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.delete.json @@ -6,7 +6,7 @@ }, "stability": "experimental", "visibility": "feature_flag", - "feature_flag": "es.synonyms_feature_flag_enabled", + "feature_flag": "es.synonyms_api_feature_flag_enabled", "headers": { "accept": [ "application/json" diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get.json index 363793272dd2b..9ea2929cd4d50 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.get.json @@ -6,7 +6,7 @@ }, "stability": "experimental", "visibility": "feature_flag", - "feature_flag": "es.synonyms_feature_flag_enabled", + "feature_flag": "es.synonyms_api_feature_flag_enabled", "headers": { "accept": [ "application/json" diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put.json index 52d54b8521426..31a387abfeb1b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms.put.json @@ -6,7 +6,7 @@ }, "stability": "experimental", "visibility": "feature_flag", - "feature_flag": "es.synonyms_feature_flag_enabled", + "feature_flag": "es.synonyms_api_feature_flag_enabled", "headers": { "accept": [ "application/json" diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms_sets.get.json b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms_sets.get.json index 6115b258dbbfd..231de94490e04 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms_sets.get.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/synonyms_sets.get.json @@ -6,7 +6,7 @@ }, "stability": "experimental", "visibility": "feature_flag", - "feature_flag": "es.synonyms_feature_flag_enabled", + "feature_flag": "es.synonyms_api_feature_flag_enabled", "headers": { "accept": [ "application/json" diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java index 8c8fe355a60f0..1b5d805ce4ab0 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java @@ -18,7 +18,7 @@ public enum FeatureFlag { TIME_SERIES_MODE("es.index_mode_feature_flag_registered=true", Version.fromString("8.0.0"), null), NEW_RCS_MODE("es.untrusted_remote_cluster_feature_flag_registered=true", Version.fromString("8.5.0"), null), DLM_ENABLED("es.dlm_feature_flag_enabled=true", Version.fromString("8.8.0"), null), - SYNONYMS_ENABLED("es.synonyms_feature_flag_enabled=true", Version.fromString("8.9.0"), null), + SYNONYMS_ENABLED("es.synonyms_api_feature_flag_enabled=true", Version.fromString("8.9.0"), null), QUERY_RULES_ENABLED("es.query_rules_feature_flag_enabled=true", Version.fromString("8.9.0"), null); public final String systemProperty;