Skip to content

Commit

Permalink
Updating more Data Management serverless API permissions (#94294)
Browse files Browse the repository at this point in the history
  • Loading branch information
@masseyke
masseyke committed Mar 7, 2023
1 parent d802136 commit 8150dfd
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 14 deletions.
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCloseIndexAction.java
View file
Expand Up @@ -18,13 +18,16 @@
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
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.POST;

@ServerlessScope(Scope.INTERNAL)
public class RestCloseIndexAction extends BaseRestHandler {

private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestCloseIndexAction.class);
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestOpenIndexAction.java
View file
Expand Up @@ -15,13 +15,16 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
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.POST;

@ServerlessScope(Scope.INTERNAL)
public class RestOpenIndexAction extends BaseRestHandler {

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
View file
Expand Up @@ -23,7 +23,7 @@

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.PUBLIC)
@ServerlessScope(Scope.INTERNAL)
public class RestPendingClusterTasksAction extends AbstractCatAction {

@Override
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
View file
Expand Up @@ -22,6 +22,8 @@
import org.elasticsearch.index.engine.Segment;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestActionListener;
import org.elasticsearch.rest.action.RestCancellableNodeClient;
import org.elasticsearch.rest.action.RestResponseListener;
Expand All @@ -32,6 +34,7 @@

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.INTERNAL)
public class RestSegmentsAction extends AbstractCatAction {

@Override
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
View file
Expand Up @@ -40,6 +40,8 @@
import org.elasticsearch.index.warmer.WarmerStats;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestResponseListener;
import org.elasticsearch.search.suggest.completion.CompletionStats;

Expand All @@ -50,6 +52,7 @@

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.INTERNAL)
public class RestShardsAction extends AbstractCatAction {

@Override
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/cat/RestSnapshotAction.java
View file
Expand Up @@ -19,6 +19,8 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestResponseListener;
import org.elasticsearch.snapshots.SnapshotInfo;
import org.elasticsearch.snapshots.SnapshotState;
Expand All @@ -33,6 +35,7 @@
/**
* Cat API class to display information about snapshots
*/
@ServerlessScope(Scope.INTERNAL)
public class RestSnapshotAction extends AbstractCatAction {

@Override
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/cat/RestTasksAction.java
View file
Expand Up @@ -20,6 +20,8 @@
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestResponseListener;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.tasks.TaskInfo;
Expand All @@ -36,6 +38,7 @@
import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.generateListTasksRequest;

@ServerlessScope(Scope.INTERNAL)
public class RestTasksAction extends AbstractCatAction {

private static final Set<String> RESPONSE_PARAMS = addToCopy(AbstractCatAction.RESPONSE_PARAMS, "detailed");
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/rest/action/cat/RestTemplatesAction.java
View file
Expand Up @@ -31,7 +31,7 @@

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.PUBLIC)
@ServerlessScope(Scope.INTERNAL)
public class RestTemplatesAction extends AbstractCatAction {

@Override
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
View file
Expand Up @@ -25,6 +25,8 @@
import org.elasticsearch.monitor.process.ProcessInfo;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestResponse;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestActionListener;
import org.elasticsearch.rest.action.RestResponseListener;
import org.elasticsearch.threadpool.ThreadPool;
Expand All @@ -42,6 +44,7 @@
import static org.elasticsearch.common.util.set.Sets.addToCopy;
import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.INTERNAL)
public class RestThreadPoolAction extends AbstractCatAction {

private static final Set<String> RESPONSE_PARAMS = addToCopy(AbstractCatAction.RESPONSE_PARAMS, "thread_pool_patterns");
Expand Down
3 changes: 0 additions & 3 deletions ...ugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/RestExplainLifecycleAction.java
View file
Expand Up @@ -12,8 +12,6 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.ilm.ExplainLifecycleRequest;
import org.elasticsearch.xpack.core.ilm.action.ExplainLifecycleAction;
Expand All @@ -22,7 +20,6 @@

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.PUBLIC)
public class RestExplainLifecycleAction extends BaseRestHandler {

@Override
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/RestGetStatusAction.java
View file
Expand Up @@ -10,16 +10,13 @@
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.ilm.action.GetStatusAction;

import java.util.List;

import static org.elasticsearch.rest.RestRequest.Method.GET;

@ServerlessScope(Scope.INTERNAL)
public class RestGetStatusAction extends BaseRestHandler {

@Override
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/RestStartILMAction.java
View file
Expand Up @@ -10,8 +10,6 @@
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.ilm.StartILMRequest;
import org.elasticsearch.xpack.core.ilm.action.StartILMAction;
Expand All @@ -20,7 +18,6 @@

import static org.elasticsearch.rest.RestRequest.Method.POST;

@ServerlessScope(Scope.INTERNAL)
public class RestStartILMAction extends BaseRestHandler {

@Override
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/RestStopAction.java
View file
Expand Up @@ -10,8 +10,6 @@
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.Scope;
import org.elasticsearch.rest.ServerlessScope;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.xpack.core.ilm.StopILMRequest;
import org.elasticsearch.xpack.core.ilm.action.StopILMAction;
Expand All @@ -20,7 +18,6 @@

import static org.elasticsearch.rest.RestRequest.Method.POST;

@ServerlessScope(Scope.INTERNAL)
public class RestStopAction extends BaseRestHandler {

@Override
Expand Down

0 comments on commit 8150dfd

Please sign in to comment.