Make TransportGetSnapshotLifecycleStatsAction project aware

Author: samxbr

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/action/GetSnapshotLifecycleStatsAction.java

@@ -7,8 +7,10 @@
 
 package org.elasticsearch.xpack.core.slm.action;
 
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,6 +34,18 @@ protected GetSnapshotLifecycleStatsAction() {
         super(NAME);
     }
 
+    public static class Request extends MasterNodeReadRequest<Request> {
+
+        public Request(StreamInput input) throws IOException {
+            super(input);
+        }
+
+        @Override
+        public ActionRequestValidationException validate() {
+            return null;
+        }
+    }
+
     public static class Response extends ActionResponse implements ToXContentObject {
 
         private SnapshotLifecycleStats slmStats;

x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSnapshotLifecycleStatsAction.java

@@ -9,11 +9,11 @@
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.AcknowledgedRequest;
-import org.elasticsearch.action.support.master.TransportMasterNodeAction;
-import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadProjectAction;
+import org.elasticsearch.cluster.ProjectState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.injection.guice.Inject;
@@ -24,24 +24,26 @@
 import org.elasticsearch.xpack.core.slm.SnapshotLifecycleStats;
 import org.elasticsearch.xpack.core.slm.action.GetSnapshotLifecycleStatsAction;
 
-public class TransportGetSnapshotLifecycleStatsAction extends TransportMasterNodeAction<
-    AcknowledgedRequest.Plain,
+public class TransportGetSnapshotLifecycleStatsAction extends TransportMasterNodeReadProjectAction<
+    GetSnapshotLifecycleStatsAction.Request,
     GetSnapshotLifecycleStatsAction.Response> {
 
     @Inject
     public TransportGetSnapshotLifecycleStatsAction(
         TransportService transportService,
         ClusterService clusterService,
         ThreadPool threadPool,
-        ActionFilters actionFilters
+        ActionFilters actionFilters,
+        ProjectResolver projectResolver
     ) {
         super(
             GetSnapshotLifecycleStatsAction.NAME,
             transportService,
             clusterService,
             threadPool,
             actionFilters,
-            AcknowledgedRequest.Plain::new,
+            GetSnapshotLifecycleStatsAction.Request::new,
+            projectResolver,
             GetSnapshotLifecycleStatsAction.Response::new,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
@@ -50,11 +52,11 @@ public TransportGetSnapshotLifecycleStatsAction(
     @Override
     protected void masterOperation(
         Task task,
-        AcknowledgedRequest.Plain request,
-        ClusterState state,
+        GetSnapshotLifecycleStatsAction.Request request,
+        ProjectState projectState,
         ActionListener<GetSnapshotLifecycleStatsAction.Response> listener
     ) {
-        SnapshotLifecycleMetadata slmMeta = state.metadata().getProject().custom(SnapshotLifecycleMetadata.TYPE);
+        SnapshotLifecycleMetadata slmMeta = projectState.metadata().custom(SnapshotLifecycleMetadata.TYPE);
         if (slmMeta == null) {
             listener.onResponse(new GetSnapshotLifecycleStatsAction.Response(new SnapshotLifecycleStats()));
         } else {
@@ -63,7 +65,7 @@ protected void masterOperation(
     }
 
     @Override
-    protected ClusterBlockException checkBlock(AcknowledgedRequest.Plain request, ClusterState state) {
-        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_READ);
+    protected ClusterBlockException checkBlock(GetSnapshotLifecycleStatsAction.Request request, ProjectState state) {
+        return state.blocks().globalBlockedException(state.projectId(), ClusterBlockLevel.METADATA_READ);
     }
 }