Skip to content

Commit 145213e

Browse files
Fix serverless scope for distrib APIs (#97175)
Mark APIs public/internal/unavailable as per prior discussion.
1 parent 9453d69 commit 145213e

File tree

7 files changed

+21
-0
lines changed

7 files changed

+21
-0
lines changed

modules/reindex/src/main/java/org/elasticsearch/reindex/RestRethrottleAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
import org.elasticsearch.cluster.node.DiscoveryNodes;
1313
import org.elasticsearch.rest.BaseRestHandler;
1414
import org.elasticsearch.rest.RestRequest;
15+
import org.elasticsearch.rest.ServerlessScope;
1516
import org.elasticsearch.tasks.TaskId;
1617

1718
import java.util.List;
1819
import java.util.function.Supplier;
1920

2021
import static org.elasticsearch.rest.RestRequest.Method.POST;
22+
import static org.elasticsearch.rest.Scope.INTERNAL;
2123
import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
2224

25+
@ServerlessScope(INTERNAL)
2326
public class RestRethrottleAction extends BaseRestHandler {
2427
private final Supplier<DiscoveryNodes> nodesInCluster;
2528

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@
1414
import org.elasticsearch.common.Strings;
1515
import org.elasticsearch.rest.BaseRestHandler;
1616
import org.elasticsearch.rest.RestRequest;
17+
import org.elasticsearch.rest.ServerlessScope;
1718
import org.elasticsearch.tasks.TaskId;
1819

1920
import java.io.IOException;
2021
import java.util.List;
2122
import java.util.function.Supplier;
2223

2324
import static org.elasticsearch.rest.RestRequest.Method.POST;
25+
import static org.elasticsearch.rest.Scope.INTERNAL;
2426
import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.listTasksResponseListener;
2527

28+
@ServerlessScope(INTERNAL)
2629
public class RestCancelTasksAction extends BaseRestHandler {
2730
private final Supplier<DiscoveryNodes> nodesInCluster;
2831

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetTaskAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313
import org.elasticsearch.core.TimeValue;
1414
import org.elasticsearch.rest.BaseRestHandler;
1515
import org.elasticsearch.rest.RestRequest;
16+
import org.elasticsearch.rest.ServerlessScope;
1617
import org.elasticsearch.rest.action.RestToXContentListener;
1718
import org.elasticsearch.tasks.TaskId;
1819

1920
import java.io.IOException;
2021
import java.util.List;
2122

2223
import static org.elasticsearch.rest.RestRequest.Method.GET;
24+
import static org.elasticsearch.rest.Scope.PUBLIC;
2325

26+
@ServerlessScope(PUBLIC)
2427
public class RestGetTaskAction extends BaseRestHandler {
2528

2629
@Override

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestListTasksAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.elasticsearch.rest.BaseRestHandler;
1919
import org.elasticsearch.rest.RestChannel;
2020
import org.elasticsearch.rest.RestRequest;
21+
import org.elasticsearch.rest.ServerlessScope;
2122
import org.elasticsearch.rest.action.RestCancellableNodeClient;
2223
import org.elasticsearch.rest.action.RestChunkedToXContentListener;
2324
import org.elasticsearch.tasks.TaskId;
@@ -27,7 +28,9 @@
2728
import java.util.function.Supplier;
2829

2930
import static org.elasticsearch.rest.RestRequest.Method.GET;
31+
import static org.elasticsearch.rest.Scope.INTERNAL;
3032

33+
@ServerlessScope(INTERNAL)
3134
public class RestListTasksAction extends BaseRestHandler {
3235

3336
private final Supplier<DiscoveryNodes> nodesInCluster;

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestAddIndexBlockAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
import org.elasticsearch.common.Strings;
1616
import org.elasticsearch.rest.BaseRestHandler;
1717
import org.elasticsearch.rest.RestRequest;
18+
import org.elasticsearch.rest.ServerlessScope;
1819
import org.elasticsearch.rest.action.RestToXContentListener;
1920

2021
import java.io.IOException;
2122
import java.util.List;
2223

2324
import static org.elasticsearch.rest.RestRequest.Method.PUT;
25+
import static org.elasticsearch.rest.Scope.PUBLIC;
2426

27+
@ServerlessScope(PUBLIC)
2528
public class RestAddIndexBlockAction extends BaseRestHandler {
2629

2730
@Override

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestFlushAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
import org.elasticsearch.common.Strings;
1515
import org.elasticsearch.rest.BaseRestHandler;
1616
import org.elasticsearch.rest.RestRequest;
17+
import org.elasticsearch.rest.ServerlessScope;
1718
import org.elasticsearch.rest.action.RestToXContentListener;
1819

1920
import java.io.IOException;
2021
import java.util.List;
2122

2223
import static org.elasticsearch.rest.RestRequest.Method.GET;
2324
import static org.elasticsearch.rest.RestRequest.Method.POST;
25+
import static org.elasticsearch.rest.Scope.INTERNAL;
2426

27+
@ServerlessScope(INTERNAL)
2528
public class RestFlushAction extends BaseRestHandler {
2629

2730
@Override

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestResizeHandler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public final RestChannelConsumer prepareRequest(final RestRequest request, final
5555
return channel -> client.admin().indices().resizeIndex(resizeRequest, new RestToXContentListener<>(channel));
5656
}
5757

58+
// no @ServerlessScope on purpose, not available
5859
public static class RestShrinkIndexAction extends RestResizeHandler {
5960

6061
@Override
@@ -74,6 +75,7 @@ protected ResizeType getResizeType() {
7475

7576
}
7677

78+
// no @ServerlessScope on purpose, not available
7779
public static class RestSplitIndexAction extends RestResizeHandler {
7880

7981
@Override
@@ -93,6 +95,7 @@ protected ResizeType getResizeType() {
9395

9496
}
9597

98+
// no @ServerlessScope on purpose, not available
9699
public static class RestCloneIndexAction extends RestResizeHandler {
97100

98101
@Override

0 commit comments

Comments
 (0)