TransportIndicesResolvingAction implemented by a few actions

Author: lukasz-soszynski-eliatra

server/src/main/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamAction.java

@@ -38,6 +38,7 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.IndicesOptions;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
@@ -49,6 +50,7 @@
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.metadata.MetadataDeleteIndexService;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
@@ -169,7 +171,7 @@ public IndicesRequest indices(String... indices) {
      *
      * @opensearch.internal
      */
-    public static class TransportAction extends TransportClusterManagerNodeAction<Request, AcknowledgedResponse> {
+    public static class TransportAction extends TransportClusterManagerNodeAction<Request, AcknowledgedResponse> implements TransportIndicesResolvingAction<Request>{
 
         private final MetadataDeleteIndexService deleteIndexService;
         private final ClusterManagerTaskThrottler.ThrottlingKey removeDataStreamTaskKey;
@@ -279,6 +281,21 @@ static ClusterState removeDataStream(MetadataDeleteIndexService deleteIndexServi
         protected ClusterBlockException checkBlock(Request request, ClusterState state) {
             return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
         }
+
+        @Override
+        public ResolvedIndices resolveIndices(Request request) {
+            ClusterState currentState = clusterService.state();
+            Set<String> dataStreams = new HashSet<>();
+            for (String name : request.names) {
+                for (String dataStreamName : currentState.metadata().dataStreams().keySet()) {
+                    if (Regex.simpleMatch(name, dataStreamName)) {
+                        dataStreams.add(dataStreamName);
+                    }
+                }
+
+            }
+            return ResolvedIndices.of(dataStreams);
+        }
     }
 
 }

server/src/main/java/org/opensearch/action/admin/indices/tiering/TransportHotToWarmTieringAction.java

@@ -11,12 +11,14 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
 import org.opensearch.cluster.ClusterInfoService;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockException;
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.routing.allocation.DiskThresholdSettings;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.annotation.ExperimentalApi;
@@ -39,7 +41,8 @@
  * @opensearch.experimental
  */
 @ExperimentalApi
-public class TransportHotToWarmTieringAction extends TransportClusterManagerNodeAction<TieringIndexRequest, HotToWarmTieringResponse> {
+public class TransportHotToWarmTieringAction extends TransportClusterManagerNodeAction<TieringIndexRequest, HotToWarmTieringResponse> implements
+    TransportIndicesResolvingAction<TieringIndexRequest> {
 
     private static final Logger logger = LogManager.getLogger(TransportHotToWarmTieringAction.class);
     private final ClusterInfoService clusterInfoService;
@@ -90,7 +93,7 @@ protected void clusterManagerOperation(
         ClusterState state,
         ActionListener<HotToWarmTieringResponse> listener
     ) throws Exception {
-        Index[] concreteIndices = indexNameExpressionResolver.concreteIndices(state, request);
+        Index[] concreteIndices = resolveIndices(state, request);
         if (concreteIndices == null || concreteIndices.length == 0) {
             listener.onResponse(new HotToWarmTieringResponse(true));
             return;
@@ -107,4 +110,13 @@ protected void clusterManagerOperation(
             return;
         }
     }
+
+    private Index[] resolveIndices(ClusterState state, TieringIndexRequest request) {
+        return indexNameExpressionResolver.concreteIndices(state, request);
+    }
+
+    @Override
+    public ResolvedIndices resolveIndices(TieringIndexRequest request) {
+        return ResolvedIndices.of(resolveIndices(clusterService.state(), request));
+    }
 }