nibix · lukasz-soszynski-eliatra · Jun 26, 2025
diff --git a/...che/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java b/...che/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.script.mustache;
 
+import org.opensearch.action.search.TransportSearchAction;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
@@ -23,8 +24,17 @@ public TransportRenderSearchTemplateAction(
         ActionFilters actionFilters,
         ScriptService scriptService,
         NamedXContentRegistry xContentRegistry,
-        NodeClient client
+        NodeClient client,
+        TransportSearchAction transportSearchAction
     ) {
-        super(RenderSearchTemplateAction.NAME, transportService, actionFilters, scriptService, xContentRegistry, client);
+        super(
+            RenderSearchTemplateAction.NAME,
+            transportService,
+            actionFilters,
+            scriptService,
+            xContentRegistry,
+            client,
+            transportSearchAction
+        );
     }
 }
diff --git a/...-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/...-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java
@@ -34,8 +34,11 @@
 
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.TransportSearchAction;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.core.action.ActionListener;
@@ -57,26 +60,30 @@
 import java.io.IOException;
 import java.util.Collections;
 
-public class TransportSearchTemplateAction extends HandledTransportAction<SearchTemplateRequest, SearchTemplateResponse> {
-
+public class TransportSearchTemplateAction extends HandledTransportAction<SearchTemplateRequest, SearchTemplateResponse>
+    implements
+        TransportIndicesResolvingAction<SearchTemplateRequest> {
     private static final String TEMPLATE_LANG = MustacheScriptEngine.NAME;
 
     protected final ScriptService scriptService;
     protected final NamedXContentRegistry xContentRegistry;
     protected final NodeClient client;
+    private final TransportSearchAction transportSearchAction;
 
     @Inject
     public TransportSearchTemplateAction(
         TransportService transportService,
         ActionFilters actionFilters,
         ScriptService scriptService,
         NamedXContentRegistry xContentRegistry,
-        NodeClient client
+        NodeClient client,
+        TransportSearchAction transportSearchAction
     ) {
         super(SearchTemplateAction.NAME, transportService, actionFilters, SearchTemplateRequest::new);
         this.scriptService = scriptService;
         this.xContentRegistry = xContentRegistry;
         this.client = client;
+        this.transportSearchAction = transportSearchAction;
     }
 
     public TransportSearchTemplateAction(
@@ -85,12 +92,14 @@ public TransportSearchTemplateAction(
         ActionFilters actionFilters,
         ScriptService scriptService,
         NamedXContentRegistry xContentRegistry,
-        NodeClient client
+        NodeClient client,
+        TransportSearchAction transportSearchAction
     ) {
         super(actionName, transportService, actionFilters, SearchTemplateRequest::new);
         this.scriptService = scriptService;
         this.xContentRegistry = xContentRegistry;
         this.client = client;
+        this.transportSearchAction = transportSearchAction;
     }
 
     @Override
@@ -180,4 +189,10 @@ private static void checkRestTotalHitsAsInt(SearchRequest searchRequest, SearchS
                 }
         }
     }
+
+    @Override
+    public ResolvedIndices resolveIndices(SearchTemplateRequest request) {
+        SearchRequest searchRequest = request.getRequest();
+        return transportSearchAction.resolveIndices(searchRequest);
+    }
 }
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java
@@ -32,8 +32,12 @@
 
 package org.opensearch.index.reindex;
 
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.TransportSearchAction;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
@@ -45,12 +49,15 @@
 import org.opensearch.transport.client.Client;
 import org.opensearch.transport.client.ParentTaskAssigningClient;
 
-public class TransportDeleteByQueryAction extends HandledTransportAction<DeleteByQueryRequest, BulkByScrollResponse> {
+public class TransportDeleteByQueryAction extends HandledTransportAction<DeleteByQueryRequest, BulkByScrollResponse>
+    implements
+        TransportIndicesResolvingAction<DeleteByQueryRequest> {
 
     private final ThreadPool threadPool;
     private final Client client;
     private final ScriptService scriptService;
     private final ClusterService clusterService;
+    private final TransportSearchAction transportSearchAction;
 
     @Inject
     public TransportDeleteByQueryAction(
@@ -59,7 +66,8 @@ public TransportDeleteByQueryAction(
         Client client,
         TransportService transportService,
         ScriptService scriptService,
-        ClusterService clusterService
+        ClusterService clusterService,
+        TransportSearchAction transportSearchAction
     ) {
         super(
             DeleteByQueryAction.NAME,
@@ -71,6 +79,7 @@ public TransportDeleteByQueryAction(
         this.client = client;
         this.scriptService = scriptService;
         this.clusterService = clusterService;
+        this.transportSearchAction = transportSearchAction;
     }
 
     @Override
@@ -94,4 +103,10 @@ public void doExecute(Task task, DeleteByQueryRequest request, ActionListener<Bu
             }
         );
     }
+
+    @Override
+    public ResolvedIndices resolveIndices(DeleteByQueryRequest request) {
+        SearchRequest searchRequest = request.getSearchRequest();
+        return transportSearchAction.resolveIndices(searchRequest);
+    }
 }
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java
@@ -34,9 +34,12 @@
 
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.search.TransportSearchAction;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.cluster.ClusterState;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
@@ -55,12 +58,15 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 
-public class TransportUpdateByQueryAction extends HandledTransportAction<UpdateByQueryRequest, BulkByScrollResponse> {
+public class TransportUpdateByQueryAction extends HandledTransportAction<UpdateByQueryRequest, BulkByScrollResponse>
+    implements
+        TransportIndicesResolvingAction<UpdateByQueryRequest> {
 
     private final ThreadPool threadPool;
     private final Client client;
     private final ScriptService scriptService;
     private final ClusterService clusterService;
+    private final TransportSearchAction transportSearchAction;
 
     @Inject
     public TransportUpdateByQueryAction(
@@ -69,7 +75,8 @@ public TransportUpdateByQueryAction(
         Client client,
         TransportService transportService,
         ScriptService scriptService,
-        ClusterService clusterService
+        ClusterService clusterService,
+        TransportSearchAction transportSearchAction
     ) {
         super(
             UpdateByQueryAction.NAME,
@@ -81,6 +88,7 @@ public TransportUpdateByQueryAction(
         this.client = client;
         this.scriptService = scriptService;
         this.clusterService = clusterService;
+        this.transportSearchAction = transportSearchAction;
     }
 
     @Override
@@ -106,6 +114,11 @@ protected void doExecute(Task task, UpdateByQueryRequest request, ActionListener
         );
     }
 
+    @Override
+    public ResolvedIndices resolveIndices(UpdateByQueryRequest request) {
+        return transportSearchAction.resolveIndices(request.getSearchRequest());
+    }
+
     /**
      * Simple implementation of update-by-query using scrolling and bulk.
      */

diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java
@@ -79,6 +79,7 @@ protected TransportUpdateByQueryAction.AsyncIndexBySearchAction action(ScriptSer
             null,
             transportService,
             scriptService,
+            null,
             null
         );
         return new TransportUpdateByQueryAction.AsyncIndexBySearchAction(

diff --git a/...n/java/org/opensearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/...n/java/org/opensearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
@@ -33,11 +33,13 @@
 package org.opensearch.action.admin.cluster.shards;
 
 import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeReadAction;
 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.node.DiscoveryNode;
 import org.opensearch.cluster.routing.GroupShardsIterator;
 import org.opensearch.cluster.routing.ShardIterator;
@@ -65,7 +67,7 @@
  */
 public class TransportClusterSearchShardsAction extends TransportClusterManagerNodeReadAction<
     ClusterSearchShardsRequest,
-    ClusterSearchShardsResponse> {
+    ClusterSearchShardsResponse> implements TransportIndicesResolvingAction<ClusterSearchShardsRequest> {
 
     private final IndicesService indicesService;
 
@@ -99,8 +101,7 @@ protected String executor() {
 
     @Override
     protected ClusterBlockException checkBlock(ClusterSearchShardsRequest request, ClusterState state) {
-        return state.blocks()
-            .indicesBlockedException(ClusterBlockLevel.METADATA_READ, indexNameExpressionResolver.concreteIndexNames(state, request));
+        return state.blocks().indicesBlockedException(ClusterBlockLevel.METADATA_READ, resolveIndices(state, request));
     }
 
     @Override
@@ -115,7 +116,7 @@ protected void clusterManagerOperation(
         final ActionListener<ClusterSearchShardsResponse> listener
     ) {
         ClusterState clusterState = clusterService.state();
-        String[] concreteIndices = indexNameExpressionResolver.concreteIndexNames(clusterState, request);
+        String[] concreteIndices = resolveIndices(clusterState, request);
         Map<String, Set<String>> routingMap = indexNameExpressionResolver.resolveSearchRouting(state, request.routing(), request.indices());
         Map<String, AliasFilter> indicesAndFilters = new HashMap<>();
         Set<String> indicesAndAliases = indexNameExpressionResolver.resolveExpressions(clusterState, request.indices());
@@ -155,4 +156,13 @@ protected void clusterManagerOperation(
         }
         listener.onResponse(new ClusterSearchShardsResponse(groupResponses, nodes, indicesAndFilters));
     }
+
+    private String[] resolveIndices(ClusterState clusterState, ClusterSearchShardsRequest request) {
+        return indexNameExpressionResolver.concreteIndexNames(clusterState, request);
+    }
+
+    @Override
+    public ResolvedIndices resolveIndices(ClusterSearchShardsRequest request) {
+        return ResolvedIndices.of(resolveIndices(clusterService.state(), request));
+    }
 }
diff --git a/...a/org/opensearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/...a/org/opensearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
@@ -33,11 +33,13 @@
 package org.opensearch.action.admin.cluster.snapshots.create;
 
 import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction;
 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.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
@@ -57,7 +59,9 @@
  *
  * @opensearch.internal
  */
-public class TransportCreateSnapshotAction extends TransportClusterManagerNodeAction<CreateSnapshotRequest, CreateSnapshotResponse> {
+public class TransportCreateSnapshotAction extends TransportClusterManagerNodeAction<CreateSnapshotRequest, CreateSnapshotResponse>
+    implements
+        TransportIndicesResolvingAction<CreateSnapshotRequest> {
     private final SnapshotsService snapshotsService;
 
     private final RepositoriesService repositoriesService;
@@ -121,4 +125,9 @@ protected void clusterManagerOperation(
             snapshotsService.createSnapshot(request, ActionListener.map(listener, snapshot -> new CreateSnapshotResponse()));
         }
     }
+
+    @Override
+    public ResolvedIndices resolveIndices(CreateSnapshotRequest request) {
+        return snapshotsService.resolveIndices(request);
+    }
 }
diff --git a/...rc/main/java/org/opensearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/...rc/main/java/org/opensearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
@@ -32,13 +32,15 @@
 package org.opensearch.action.admin.indices.alias.get;
 
 import org.opensearch.action.support.ActionFilters;
+import org.opensearch.action.support.TransportIndicesResolvingAction;
 import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeReadAction;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockException;
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.AliasMetadata;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
+import org.opensearch.cluster.metadata.ResolvedIndices;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.logging.DeprecationLogger;
@@ -65,7 +67,9 @@
  *
  * @opensearch.internal
  */
-public class TransportGetAliasesAction extends TransportClusterManagerNodeReadAction<GetAliasesRequest, GetAliasesResponse> {
+public class TransportGetAliasesAction extends TransportClusterManagerNodeReadAction<GetAliasesRequest, GetAliasesResponse>
+    implements
+        TransportIndicesResolvingAction<GetAliasesRequest> {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(TransportGetAliasesAction.class);
 
     private final SystemIndices systemIndices;
@@ -195,4 +199,12 @@ private static void checkSystemAliasAccess(GetAliasesRequest request, SystemIndi
             );
         }
     }
+
+    @Override
+    public ResolvedIndices resolveIndices(GetAliasesRequest request) {
+        ClusterState state = this.clusterService.state();
+        try (ThreadContext.StoredContext ignore = threadPool.getThreadContext().newStoredContext(false)) {
+            return ResolvedIndices.of(indexNameExpressionResolver.concreteIndexNames(state, request));
+        }
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 null,
                 transportService,
                 scriptService,
+                null,
                 null
             );
             return new TransportUpdateByQueryAction.AsyncIndexBySearchAction(
@@ Expand Down @@