PR Fixes - Fix support for timeout and master_timeout parameters

Author: lukewhiting

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/RestSetLogStreamsEnabledAction.java

@@ -17,8 +17,8 @@
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
-import java.io.IOException;
 import java.util.List;
+import java.util.Set;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
 
@@ -35,7 +35,7 @@ public List<Route> routes() {
     }
 
     @Override
-    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
         final boolean enabled = request.path().endsWith("_enable");
         assert enabled || request.path().endsWith("_disable");
         return restChannel -> client.execute(
@@ -49,4 +49,9 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         );
     }
 
+    @Override
+    public Set<String> supportedQueryParameters() {
+        return Set.of(RestUtils.REST_MASTER_TIMEOUT_PARAM, RestUtils.REST_TIMEOUT_PARAM);
+    }
+
 }

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/RestStreamsStatusAction.java

@@ -18,8 +18,9 @@
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
-import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 
@@ -37,12 +38,16 @@ public List<RestHandler.Route> routes() {
     }
 
     @Override
-    protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+    protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
         return restChannel -> client.execute(
             StreamsStatusAction.INSTANCE,
             new StreamsStatusAction.Request(RestUtils.getMasterNodeTimeout(request)),
             new RestToXContentListener<>(restChannel)
         );
     }
 
+    @Override
+    public Set<String> supportedQueryParameters() {
+        return Collections.singleton(RestUtils.REST_MASTER_TIMEOUT_PARAM);
+    }
 }

rest-api-spec/src/main/resources/rest-api-spec/api/streams.logs_disable.json

@@ -23,6 +23,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "timeout": {
+        "type": "time",
+        "description": "Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error."
+      },
+      "master_timeout": {
+        "type": "time",
+        "description": "Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error."
+      }
+    }
   }
 }

rest-api-spec/src/main/resources/rest-api-spec/api/streams.logs_enable.json

@@ -23,6 +23,15 @@
         }
       ]
     },
-    "params": {}
+    "params": {
+      "timeout": {
+        "type": "time",
+        "description": "Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error."
+      },
+      "master_timeout": {
+        "type": "time",
+        "description": "Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error."
+      }
+    }
   }
 }

rest-api-spec/src/main/resources/rest-api-spec/api/streams.status.json

@@ -23,13 +23,9 @@
       ]
     },
     "params": {
-      "local": {
-        "type": "boolean",
-        "description": "Return local information, do not retrieve the state from master node (default: false)"
-      },
       "master_timeout": {
         "type": "time",
-        "description": "Specify timeout for connection to master"
+        "description": "Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error."
       }
     }
   }