Nits

Author: n1v0lg

server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java

@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiPredicate;
@@ -38,14 +37,32 @@ public IndexAbstractionResolver(IndexNameExpressionResolver indexNameExpressionR
         this.indexNameExpressionResolver = indexNameExpressionResolver;
     }
 
+    public ReplacedIndexExpressions resolveIndexAbstractionsForCrossProjectSearch(
+        Iterable<String> indices,
+        IndicesOptions indicesOptions,
+        ProjectMetadata projectMetadata,
+        Function<IndexComponentSelector, Set<String>> allAuthorizedAndAvailableBySelector,
+        BiPredicate<String, IndexComponentSelector> isAuthorized,
+        boolean includeDataStreams
+    ) {
+        return resolveIndexAbstractions(
+            indices,
+            // lenient mode required to avoid failing if an index exists in another project
+            lenientIndicesOptions(indicesOptions),
+            projectMetadata,
+            allAuthorizedAndAvailableBySelector,
+            isAuthorized,
+            includeDataStreams
+        );
+    }
+
     public ReplacedIndexExpressions resolveIndexAbstractions(
         Iterable<String> indices,
         IndicesOptions indicesOptions,
         ProjectMetadata projectMetadata,
         Function<IndexComponentSelector, Set<String>> allAuthorizedAndAvailableBySelector,
         BiPredicate<String, IndexComponentSelector> isAuthorized,
-        boolean includeDataStreams,
-        boolean ignoreUnavailableBwcBehavior
+        boolean includeDataStreams
     ) {
         final Map<String, ReplacedIndexExpression> replaced = new LinkedHashMap<>();
 
@@ -154,25 +171,6 @@ && isIndexVisible(
         return new ReplacedIndexExpressions(replaced);
     }
 
-    public List<String> resolveIndexAbstractions(
-        Iterable<String> indices,
-        IndicesOptions indicesOptions,
-        ProjectMetadata projectMetadata,
-        Function<IndexComponentSelector, Set<String>> allAuthorizedAndAvailableBySelector,
-        BiPredicate<String, IndexComponentSelector> isAuthorized,
-        boolean includeDataStreams
-    ) {
-        return resolveIndexAbstractions(
-            indices,
-            indicesOptions,
-            projectMetadata,
-            allAuthorizedAndAvailableBySelector,
-            isAuthorized,
-            includeDataStreams,
-            true
-        ).indicesAsList();
-    }
-
     private static void resolveSelectorsAndCollect(
         String indexAbstraction,
         String selectorString,
@@ -342,4 +340,11 @@ && isIndexVisible(
     private static boolean isVisibleDueToImplicitHidden(String expression, String index) {
         return index.startsWith(".") && expression.startsWith(".") && Regex.isSimpleMatchPattern(expression);
     }
+
+    private static IndicesOptions lenientIndicesOptions(IndicesOptions indicesOptions) {
+        return IndicesOptions.builder(indicesOptions)
+            .concreteTargetOptions(new IndicesOptions.ConcreteTargetOptions(true))
+            .wildcardOptions(IndicesOptions.WildcardOptions.builder(indicesOptions.wildcardOptions()).allowEmptyExpressions(true).build())
+            .build();
+    }
 }

server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolverTests.java

@@ -369,9 +369,9 @@ private List<String> resolveAbstractions(List<String> expressions, IndicesOption
             indicesOptions,
             projectMetadata,
             (ignored) -> mask,
-            (ignored, nothing) -> true,
+            (ignored1, nothing) -> true,
             true
-        );
+        ).indicesAsList();
     }
 
     private boolean isIndexVisible(String index, String selector) {

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java

@@ -379,15 +379,15 @@ ResolvedIndices resolveIndicesAndAliases(
                     );
                     if (crossProjectReplacedIndexExpressions != null) {
                         logger.info("Handling as CPS request for [{}]", Arrays.toString(crossProjectSearchCapableRequest.indices()));
-                        ReplacedIndexExpressions replacedExpressions = indexAbstractionResolver.resolveIndexAbstractions(
-                            crossProjectReplacedIndexExpressions.getLocalExpressions(),
-                            lenientIndicesOptions(indicesOptions),
-                            projectMetadata,
-                            authorizedIndices::all,
-                            authorizedIndices::check,
-                            indicesRequest.includeDataStreams(),
-                            true
-                        );
+                        ReplacedIndexExpressions replacedExpressions = indexAbstractionResolver
+                            .resolveIndexAbstractionsForCrossProjectSearch(
+                                crossProjectReplacedIndexExpressions.getLocalExpressions(),
+                                indicesOptions,
+                                projectMetadata,
+                                authorizedIndices::all,
+                                authorizedIndices::check,
+                                indicesRequest.includeDataStreams()
+                            );
                         crossProjectReplacedIndexExpressions.replaceLocalExpressions(replacedExpressions);
                         crossProjectSearchCapableRequest.setReplacedIndexExpressions(crossProjectReplacedIndexExpressions);
                         crossProjectSearchCapableRequest.indices(crossProjectReplacedIndexExpressions.indices());
@@ -423,8 +423,7 @@ ResolvedIndices resolveIndicesAndAliases(
                     projectMetadata,
                     authorizedIndices::all,
                     authorizedIndices::check,
-                    indicesRequest.includeDataStreams(),
-                    true
+                    indicesRequest.includeDataStreams()
                 );
                 replaceable.setReplacedIndexExpressions(resolved);
                 resolvedIndicesBuilder.addLocal(resolved.indicesAsList());
@@ -500,14 +499,6 @@ ResolvedIndices resolveIndicesAndAliases(
         return resolvedIndicesBuilder.build();
     }
 
-    // TODO defs does not belong here
-    private static IndicesOptions lenientIndicesOptions(IndicesOptions indicesOptions) {
-        return IndicesOptions.builder(indicesOptions)
-            .concreteTargetOptions(new IndicesOptions.ConcreteTargetOptions(true))
-            .wildcardOptions(IndicesOptions.WildcardOptions.builder(indicesOptions.wildcardOptions()).allowEmptyExpressions(true).build())
-            .build();
-    }
-
     /**
      * Special handling of the value to authorize for a put mapping request. Dynamic put mapping
      * requests use a concrete index, but we allow permissions to be defined on aliases so if the