Use test features instead of capabilities

carlosdelest · carlosdelest · commit 636bea9d111b · 2025-03-26T16:37:12.000+01:00
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/110_synonyms_invalid.yml
@@ -317,11 +317,7 @@ setup:
 ---
 "Load index with non existent synonyms set":
   - requires:
-      test_runner_features: [ capabilities ]
-      capabilities:
-        - method: PUT
-          path: /{index}
-          capabilities: [ synonyms_set_lenient_on_non_existing ]
+      cluster_features: [ synonyms_set_lenient_on_non_existing ]
       reason: "requires synonyms_set_lenient_on_non_existing bug fix"
   - do:
       indices.create:
diff --git a/server/src/main/java/org/elasticsearch/index/IndexFeatures.java b/server/src/main/java/org/elasticsearch/index/IndexFeatures.java
@@ -23,8 +23,10 @@ public Set<NodeFeature> getFeatures() {
 
     public static final NodeFeature LOGSDB_NO_HOST_NAME_FIELD = new NodeFeature("index.logsdb_no_host_name_field");
 
+    private static final NodeFeature SYNONYMS_SET_LENIENT_ON_NON_EXISTING = new NodeFeature("index.synonyms_set_lenient_on_non_existing");
+
     @Override
     public Set<NodeFeature> getTestFeatures() {
-        return Set.of(LOGSDB_NO_HOST_NAME_FIELD);
+        return Set.of(LOGSDB_NO_HOST_NAME_FIELD, SYNONYMS_SET_LENIENT_ON_NON_EXISTING);
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/CreateIndexCapabilities.java
@@ -32,14 +32,11 @@ public class CreateIndexCapabilities {
 
     private static final String HUNSPELL_DICT_400 = "hunspell_dict_400";
 
-    private static final String SYNONYMS_SET_LENIENT_ON_NON_EXISTING = "synonyms_set_lenient_on_non_existing";
-
     public static final Set<String> CAPABILITIES = Set.of(
         LOGSDB_INDEX_MODE_CAPABILITY,
         LOOKUP_INDEX_MODE_CAPABILITY,
         NESTED_DENSE_VECTOR_SYNTHETIC_TEST,
         POORLY_FORMATTED_BAD_REQUEST,
-        HUNSPELL_DICT_400,
-        SYNONYMS_SET_LENIENT_ON_NON_EXISTING
+        HUNSPELL_DICT_400
     );
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@ public Set<NodeFeature> getFeatures() {`
`23`	`23`
`24`	`24`	`public static final NodeFeature LOGSDB_NO_HOST_NAME_FIELD = new NodeFeature("index.logsdb_no_host_name_field");`
`25`	`25`
	`26`	`+ private static final NodeFeature SYNONYMS_SET_LENIENT_ON_NON_EXISTING = new NodeFeature("index.synonyms_set_lenient_on_non_existing");`
	`27`	`+`
`26`	`28`	`@Override`
`27`	`29`	`public Set<NodeFeature> getTestFeatures() {`
`28`		`- return Set.of(LOGSDB_NO_HOST_NAME_FIELD);`
	`30`	`+ return Set.of(LOGSDB_NO_HOST_NAME_FIELD, SYNONYMS_SET_LENIENT_ON_NON_EXISTING);`
`29`	`31`	`}`
`30`	`32`	`}`