Browse Source

Fix serverless scope for distrib APIs (#97175)

Mark APIs public/internal/unavailable as per prior discussion.
Henning Andersen 2 years ago
parent
commit
145213ef39

+ 3 - 0
modules/reindex/src/main/java/org/elasticsearch/reindex/RestRethrottleAction.java

@@ -12,14 +12,17 @@ import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.tasks.TaskId;
 
 import java.util.List;
 import java.util.function.Supplier;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
+import static org.elasticsearch.rest.Scope.INTERNAL;
 import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
 
+@ServerlessScope(INTERNAL)
 public class RestRethrottleAction extends BaseRestHandler {
     private final Supplier<DiscoveryNodes> nodesInCluster;
 

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java

@@ -14,6 +14,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.tasks.TaskId;
 
 import java.io.IOException;
@@ -21,8 +22,10 @@ import java.util.List;
 import java.util.function.Supplier;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
+import static org.elasticsearch.rest.Scope.INTERNAL;
 import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
 
+@ServerlessScope(INTERNAL)
 public class RestCancelTasksAction extends BaseRestHandler {
     private final Supplier<DiscoveryNodes> nodesInCluster;
 

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java

@@ -13,6 +13,7 @@ import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 import org.elasticsearch.tasks.TaskId;
 
@@ -20,7 +21,9 @@ import java.io.IOException;
 import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
+import static org.elasticsearch.rest.Scope.PUBLIC;
 
+@ServerlessScope(PUBLIC)
 public class RestGetTaskAction extends BaseRestHandler {
 
     @Override

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java

@@ -18,6 +18,7 @@ import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestCancellableNodeClient;
 import org.elasticsearch.rest.action.RestChunkedToXContentListener;
 import org.elasticsearch.tasks.TaskId;
@@ -27,7 +28,9 @@ import java.util.List;
 import java.util.function.Supplier;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
+import static org.elasticsearch.rest.Scope.INTERNAL;
 
+@ServerlessScope(INTERNAL)
 public class RestListTasksAction extends BaseRestHandler {
 
     private final Supplier<DiscoveryNodes> nodesInCluster;

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAddIndexBlockAction.java

@@ -15,13 +15,16 @@ import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
 import java.io.IOException;
 import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.PUT;
+import static org.elasticsearch.rest.Scope.PUBLIC;
 
+@ServerlessScope(PUBLIC)
 public class RestAddIndexBlockAction extends BaseRestHandler {
 
     @Override

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java

@@ -14,6 +14,7 @@ import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
 import java.io.IOException;
@@ -21,7 +22,9 @@ import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
+import static org.elasticsearch.rest.Scope.INTERNAL;
 
+@ServerlessScope(INTERNAL)
 public class RestFlushAction extends BaseRestHandler {
 
     @Override

+ 3 - 0
server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestResizeHandler.java

@@ -55,6 +55,7 @@ public abstract class RestResizeHandler extends BaseRestHandler {
         return channel -> client.admin().indices().resizeIndex(resizeRequest, new RestToXContentListener<>(channel));
     }
 
+    // no @ServerlessScope on purpose, not available
     public static class RestShrinkIndexAction extends RestResizeHandler {
 
         @Override
@@ -74,6 +75,7 @@ public abstract class RestResizeHandler extends BaseRestHandler {
 
     }
 
+    // no @ServerlessScope on purpose, not available
     public static class RestSplitIndexAction extends RestResizeHandler {
 
         @Override
@@ -93,6 +95,7 @@ public abstract class RestResizeHandler extends BaseRestHandler {
 
     }
 
+    // no @ServerlessScope on purpose, not available
     public static class RestCloneIndexAction extends RestResizeHandler {
 
         @Override