CPS fanout on field_caps

Author: luigidellaquila

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlConfiguration.java

@@ -33,6 +33,7 @@ public class EqlConfiguration extends org.elasticsearch.xpack.ql.session.Configu
     private final boolean allowPartialSearchResults;
     private final boolean allowPartialSequenceResults;
     private final String projectRouting;
+    private final boolean crossProjectEnabled;
 
     @Nullable
     private final QueryBuilder filter;
@@ -59,6 +60,48 @@ public EqlConfiguration(
         String clientId,
         TaskId taskId,
         EqlSearchTask task
+    ) {
+        this(
+            indices,
+            zi,
+            username,
+            clusterName,
+            filter,
+            runtimeMappings,
+            fetchFields,
+            requestTimeout,
+            indicesOptions,
+            fetchSize,
+            maxSamplesPerKey,
+            allowPartialSearchResults,
+            allowPartialSequenceResults,
+            projectRouting,
+            clientId,
+            taskId,
+            task,
+            false
+        );
+    }
+
+    public EqlConfiguration(
+        String[] indices,
+        ZoneId zi,
+        String username,
+        String clusterName,
+        QueryBuilder filter,
+        Map<String, Object> runtimeMappings,
+        List<FieldAndFormat> fetchFields,
+        TimeValue requestTimeout,
+        IndicesOptions indicesOptions,
+        int fetchSize,
+        int maxSamplesPerKey,
+        boolean allowPartialSearchResults,
+        boolean allowPartialSequenceResults,
+        String projectRouting,
+        String clientId,
+        TaskId taskId,
+        EqlSearchTask task,
+        boolean crossProjectEnabled
     ) {
         super(zi, username, clusterName);
 
@@ -76,6 +119,11 @@ public EqlConfiguration(
         this.allowPartialSearchResults = allowPartialSearchResults;
         this.allowPartialSequenceResults = allowPartialSequenceResults;
         this.projectRouting = projectRouting;
+        this.crossProjectEnabled = crossProjectEnabled;
+    }
+
+    public boolean crossProjectEnabled() {
+        return crossProjectEnabled;
     }
 
     public String projectRouting() {

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/session/EqlSession.java

@@ -12,6 +12,7 @@
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.client.internal.ParentTaskAssigningClient;
 import org.elasticsearch.common.breaker.CircuitBreaker;
+import org.elasticsearch.search.crossproject.CrossProjectIndexResolutionValidator;
 import org.elasticsearch.tasks.TaskCancelledException;
 import org.elasticsearch.xpack.eql.analysis.Analyzer;
 import org.elasticsearch.xpack.eql.analysis.AnalyzerContext;
@@ -124,12 +125,9 @@ private <T> void preAnalyze(LogicalPlan parsed, ActionListener<LogicalPlan> list
         }
         Set<String> fieldNames = fieldNames(parsed);
         IndicesOptions indicesOptions = configuration.indicesOptions();
-
-        //TODO this is for CPS, put it behind a flag
-        indicesOptions = IndicesOptions.builder(indicesOptions)
-            .crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
-            .build();
-
+        if (configuration.crossProjectEnabled()) {
+            indicesOptions = CrossProjectIndexResolutionValidator.indicesOptionsForCrossProjectFanout(indicesOptions);
+        }
         // TODO pass configuration.projectRouting();
         indexResolver.resolveAsMergedMapping(
             indexWildcard,