Made resolveIndices() in TransportSingleShardAction exception-safe

Originally, the resolveIndices() method of TransportSingleShardAction was implemented with concreteSingleIndex(), which however can throw exceptions for validation issues.

As throwing exceptions is not suitable for the intended meta-data use, this was moved to concreteResolvedIndices(). This MIGHT return a super-set of the indices of concreteSingleIndex() when the latter would throw an exception. This is for the intended purposes of resolveIndices() however acceptable.

Signed-off-by: Nils Bandener <nils.bandener@eliatra.com>

Author: nibix

server/src/main/java/org/opensearch/action/support/single/shard/TransportSingleShardAction.java

@@ -160,7 +160,17 @@ protected void resolveRequest(ClusterState state, InternalRequest request) {
 
     @Override
     public ResolvedIndices resolveIndices(Request request) {
-        return ResolvedIndices.ofNonNull(resolveToConcreteSingleIndex(request, clusterService.state()));
+        if (resolveIndex(request)) {
+            // We do not use resolveToConcreteSingleIndex() here because it might throw exceptions for validation errors.
+            // Instead, we use indexNameExpressionResolver.concreteResolvedIndices(), which allows us to retrieve
+            // index names without validation errors. This is potentially a super-set of the indices resolved in
+            // resolveToConcreteSingleIndex(), but this is only a hypothetical state. In practise, we should
+            // also always get one element here. If for some reason that's not the case, the code will hit the
+            // validation error when executing the action.
+            return ResolvedIndices.of(indexNameExpressionResolver.concreteResolvedIndices(clusterService.state(), request));
+        } else {
+            return ResolvedIndices.of(request.index());
+        }
     }
 
     private String resolveToConcreteSingleIndex(Request request, ClusterState clusterState) {