Add capabilities to avoid failing on bwc tests

Author: carlosdelest

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/10_synonyms_put.yml

@@ -67,6 +67,15 @@ setup:
 
 ---
 "Timeout can be specified":
+
+  - requires:
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: PUT
+          path: /_synonyms/{rule_id}
+          capabilities: [ put_synonyms_timeout ]
+      reason: "synonyms timeout capability needed"
+
   - do:
       synonyms.put_synonym:
         id: test-update-synonyms
@@ -81,6 +90,16 @@ setup:
   - match: { reload_analyzers_details._shards.total: 0 }
   - length: { reload_analyzers_details.reload_details: 0 }
 
+  # Validate timeout values
+  - do:
+      catch: /as a time value:\ negative durations are not supported/
+      synonyms.put_synonym:
+        id: test-update-synonyms
+        timeout: -100s
+        body:
+          synonyms_set:
+            - synonyms: "bye, goodbye"
+
 ---
 "Validation fails tests":
   - do:
@@ -123,12 +142,3 @@ setup:
           synonyms_set:
             - synonyms: "bye, goodbye,  "
 
-  - do:
-      catch: /as a time value:\ negative durations are not supported/
-      synonyms.put_synonym:
-        id: test-update-synonyms
-        timeout: -100s
-        body:
-          synonyms_set:
-            - synonyms: "bye, goodbye"
-

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/synonyms/50_synonym_rule_put.yml

@@ -82,6 +82,14 @@ setup:
 
 ---
 "Timeout can be specified":
+  - requires:
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: PUT
+          path: /_synonyms/{set_id}/{rule_id}
+          capabilities: [ put_synonyms_timeout ]
+      reason: "synonyms timeout capability needed"
+
   - do:
       synonyms.put_synonym_rule:
         set_id: "test-synonyms"
@@ -94,6 +102,17 @@ setup:
   - match: { reload_analyzers_details._shards.total: 0 }
   - length: { reload_analyzers_details.reload_details: 0 }
 
+  # Validates timeout values
+  - do:
+      catch: /as a time value:\ negative durations are not supported/
+      synonyms.put_synonym_rule:
+        set_id: "test-synonyms"
+        rule_id: "test-id-0"
+        timeout: -100s
+        body:
+          synonyms_set:
+            - synonyms: "bye, goodbye"
+
 ---
 "Validation failure tests":
   - do:
@@ -135,13 +154,3 @@ setup:
         rule_id: "test-id-0"
         body:
           synonyms: "bye, goodbye,  "
-
-  - do:
-      catch: /as a time value:\ negative durations are not supported/
-      synonyms.put_synonym_rule:
-        set_id: "test-synonyms"
-        rule_id: "test-id-0"
-        timeout: -100s
-        body:
-          synonyms_set:
-            - synonyms: "bye, goodbye"

server/src/main/java/org/elasticsearch/rest/action/synonyms/RestPutSynonymRuleAction.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Set;
 
 import static org.elasticsearch.action.synonyms.PutSynonymRuleAction.DEFAULT_TIMEOUT;
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
@@ -53,4 +54,9 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
             new RestToXContentListener<>(channel, SynonymUpdateResponse::status, r -> null)
         );
     }
+
+    @Override
+    public Set<String> supportedCapabilities() {
+        return SynonymPutCapabilities.CAPABILITIES;
+    }
 }

server/src/main/java/org/elasticsearch/rest/action/synonyms/RestPutSynonymsAction.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Set;
 
 import static org.elasticsearch.action.synonyms.PutSynonymRuleAction.DEFAULT_TIMEOUT;
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
@@ -52,4 +53,9 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
             new RestToXContentListener<>(channel, SynonymUpdateResponse::status, r -> null)
         );
     }
+
+    @Override
+    public Set<String> supportedCapabilities() {
+        return SynonymPutCapabilities.CAPABILITIES;
+    }
 }

server/src/main/java/org/elasticsearch/rest/action/synonyms/SynonymPutCapabilities.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.rest.action.synonyms;
+
+import java.util.Set;
+
+/**
+ * A {@link Set} of "capabilities" supported by the {@link RestPutSynonymsAction} and {@link RestPutSynonymRuleAction}.
+ */
+public final class SynonymPutCapabilities {
+
+    private SynonymPutCapabilities() {
+        throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+    }
+
+    private static final String PUT_SYNONYMS_TIMEOUT = "put_synonyms_timeout";
+
+    public static final Set<String> CAPABILITIES = Set.of(
+        PUT_SYNONYMS_TIMEOUT
+    );
+}