Make index resolution required

Author: idegtiarenko

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/IndexResolutionIT.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.datastreams.DataStreamsPlugin;
-import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.xpack.esql.VerificationException;
 import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
@@ -196,17 +195,19 @@ public void testPartialResolution() {
         assertAcked(client().admin().indices().prepareCreate("index-2"));
         indexRandom(true, "index-2", 10);
 
-        try (var response = run(syncEsqlQueryRequest().query("FROM index-1,nonexisting-1"))) {
-            assertOk(response); // okay when present index is empty
-        }
         expectThrows(
-            IndexNotFoundException.class,
-            equalTo("no such index [nonexisting-1]"), // fails when present index is non-empty
+            VerificationException.class,
+            containsString("Unknown index [nonexisting-1]"), // fails when present index is empty
+            () -> run(syncEsqlQueryRequest().query("FROM index-1,nonexisting-1"))
+        );
+        expectThrows(
+            VerificationException.class,
+            containsString("Unknown index [nonexisting-1]"), // fails when present index is non-empty
             () -> run(syncEsqlQueryRequest().query("FROM index-2,nonexisting-1"))
         );
         expectThrows(
-            IndexNotFoundException.class,
-            equalTo("no such index [nonexisting-1]"), // only the first missing index is reported
+            VerificationException.class,
+            containsString("Unknown index [nonexisting-1]"), // only the first missing index is reported
             () -> run(syncEsqlQueryRequest().query("FROM index-2,nonexisting-1,nonexisting-2"))
         );
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/IndexResolver.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -56,7 +57,7 @@ public class IndexResolver {
     public static final String UNMAPPED = "unmapped";
 
     public static final IndicesOptions FIELD_CAPS_INDICES_OPTIONS = IndicesOptions.builder()
-        .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ALLOW_UNAVAILABLE_TARGETS)
+        .concreteTargetOptions(IndicesOptions.ConcreteTargetOptions.ERROR_WHEN_UNAVAILABLE_TARGETS)
         .wildcardOptions(
             IndicesOptions.WildcardOptions.builder()
                 .matchOpen(true)
@@ -91,11 +92,34 @@ public void resolveAsMergedMapping(
         client.execute(
             EsqlResolveFieldsAction.TYPE,
             createFieldCapsRequest(indexWildcard, fieldNames, requestFilter, includeAllDimensions),
-            listener.delegateFailureAndWrap(
-                (l, response) -> l.onResponse(
-                    mergedMappings(indexWildcard, new FieldsInfo(response, supportsAggregateMetricDouble, supportsDenseVector))
-                )
+            ActionListener.wrap(
+                r -> listener.onResponse(
+                    mergedMappings(indexWildcard, new FieldsInfo(r, supportsAggregateMetricDouble, supportsDenseVector))
+                ),
+                f -> {
+                    if (f instanceof IndexNotFoundException e) {
+                        listener.onResponse(IndexResolution.notFound(e.getIndex().getName()));
+                    } else {
+                        listener.onFailure(f);
+                    }
+                }
             )
+            // new ActionListener<FieldCapabilitiesResponse>() {
+            // @Override
+            // public void onResponse(FieldCapabilitiesResponse fieldCapabilitiesResponse) {
+            //
+            // }
+            //
+            // @Override
+            // public void onFailure(Exception e) {
+            //
+            // }
+            // }
+            // listener.delegateFailureAndWrap(
+            // (l, response) -> l.onResponse(
+            // mergedMappings(indexWildcard, new FieldsInfo(response, supportsAggregateMetricDouble, supportsDenseVector))
+            // )
+            // )
         );
     }