Move ProjectRoutingResolver to NodeConstruction

Author: smalyshev

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -209,6 +209,8 @@
 import org.elasticsearch.search.SearchService;
 import org.elasticsearch.search.SearchUtils;
 import org.elasticsearch.search.aggregations.support.AggregationUsageService;
+import org.elasticsearch.search.crossproject.CrossProjectRoutingResolver;
+import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
 import org.elasticsearch.shutdown.PluginShutdownService;
 import org.elasticsearch.snapshots.CachingSnapshotAndShardByStateMetricsService;
 import org.elasticsearch.snapshots.IndexMetadataRestoreTransformer;
@@ -1011,6 +1013,11 @@ public Map<String, String> queryFields() {
             .create()
             .orElseGet(() -> new ClusterSettingsLinkedProjectConfigService(settings, clusterService.getClusterSettings(), projectResolver));
 
+        final var projectRoutingResolver = pluginsService.loadSingletonServiceProvider(
+            ProjectRoutingResolver.class,
+            CrossProjectRoutingResolver::new
+        );
+
         PluginServiceInstances pluginServices = new PluginServiceInstances(
             client,
             clusterService,
@@ -1035,7 +1042,8 @@ public Map<String, String> queryFields() {
             projectResolver,
             slowLogFieldProvider,
             indexingLimits,
-            linkedProjectConfigService
+            linkedProjectConfigService,
+            projectRoutingResolver
         );
 
         Collection<?> pluginComponents = pluginsService.flatMap(plugin -> {
@@ -1364,6 +1372,7 @@ public Map<String, String> queryFields() {
             b.bind(ShutdownPrepareService.class).toInstance(shutdownPrepareService);
             b.bind(OnlinePrewarmingService.class).toInstance(onlinePrewarmingService);
             b.bind(MergeMetrics.class).toInstance(mergeMetrics);
+            b.bind(ProjectRoutingResolver.class).toInstance(projectRoutingResolver);
         });
 
         if (ReadinessService.enabled(environment)) {

server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java

@@ -28,6 +28,7 @@
 import org.elasticsearch.plugins.internal.DocumentParsingProvider;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
 import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -59,5 +60,6 @@ public record PluginServiceInstances(
     ProjectResolver projectResolver,
     SlowLogFieldProvider slowLogFieldProvider,
     IndexingPressure indexingPressure,
-    LinkedProjectConfigService linkedProjectConfigService
+    LinkedProjectConfigService linkedProjectConfigService,
+    ProjectRoutingResolver projectRoutingResolver
 ) implements Plugin.PluginServices {}

server/src/main/java/org/elasticsearch/plugins/Plugin.java

@@ -36,6 +36,7 @@
 import org.elasticsearch.plugins.internal.DocumentParsingProvider;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
 import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ExecutorBuilder;
@@ -198,6 +199,9 @@ public interface PluginServices {
          * A service for registering for linked project configuration updates.
          */
         LinkedProjectConfigService linkedProjectConfigService();
+
+        /** A resolver for project routing information */
+        ProjectRoutingResolver projectRoutingResolver();
     }
 
     /**

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

@@ -104,7 +104,6 @@
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
-import org.elasticsearch.search.crossproject.CrossProjectRoutingResolver;
 import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
 import org.elasticsearch.search.internal.ShardSearchRequest;
 import org.elasticsearch.telemetry.TelemetryProvider;
@@ -647,7 +646,6 @@ public class Security extends Plugin
     private final SetOnce<RemoteClusterSecurityExtension.Provider> remoteClusterSecurityExtensionProvider = new SetOnce<>();
     private final SetOnce<RemoteClusterSecurityExtension> remoteClusterSecurityExtension = new SetOnce<>();
     private final SetOnce<RemoteClusterAuthenticationService> remoteClusterAuthenticationService = new SetOnce<>();
-    private final SetOnce<ProjectRoutingResolver> projectRoutingResolver = new SetOnce<>();
 
     private final SetOnce<SecurityMigrations.Manager> migrationManager = new SetOnce<>();
     private final SetOnce<List<Closeable>> closableComponents = new SetOnce<>();
@@ -765,7 +763,8 @@ public Collection<?> createComponents(PluginServices services) {
                 services.telemetryProvider(),
                 new PersistentTasksService(services.clusterService(), services.threadPool(), services.client()),
                 services.linkedProjectConfigService(),
-                services.projectResolver()
+                services.projectResolver(),
+                services.projectRoutingResolver()
             );
         } catch (final Exception e) {
             throw new IllegalStateException("security initialization failed", e);
@@ -786,7 +785,8 @@ Collection<Object> createComponents(
         TelemetryProvider telemetryProvider,
         PersistentTasksService persistentTasksService,
         LinkedProjectConfigService linkedProjectConfigService,
-        ProjectResolver projectResolver
+        ProjectResolver projectResolver,
+        ProjectRoutingResolver projectRoutingResolver
     ) throws Exception {
         logger.info("Security is {}", enabled ? "enabled" : "disabled");
         if (enabled == false) {
@@ -1170,11 +1170,9 @@ Collection<Object> createComponents(
             projectResolver,
             authorizedProjectsResolver,
             new CrossProjectModeDecider(settings),
-            projectRoutingResolver.get()
+            projectRoutingResolver
         );
 
-        components.add(new PluginComponentBinding<>(ProjectRoutingResolver.class, projectRoutingResolver.get()));
-
         components.add(nativeRolesStore); // used by roles actions
         components.add(reservedRolesStore); // used by roles actions
         components.add(allRolesStore); // for SecurityInfoTransportAction and clear roles cache
@@ -2563,7 +2561,6 @@ public void loadExtensions(ExtensionLoader loader) {
             RemoteClusterSecurityExtension.Provider.class,
             CrossClusterAccessSecurityExtension.Provider::new
         );
-        loadSingletonExtensionAndSetOnce(loader, projectRoutingResolver, ProjectRoutingResolver.class, CrossProjectRoutingResolver::new);
     }
 
     private <T> void loadSingletonExtensionAndSetOnce(ExtensionLoader loader, SetOnce<T> setOnce, Class<T> clazz) {

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityTests.java

@@ -63,6 +63,7 @@
 import org.elasticsearch.rest.RestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.search.crossproject.ProjectRoutingResolver;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.telemetry.metric.MeterRegistry;
 import org.elasticsearch.test.ESTestCase;
@@ -265,7 +266,8 @@ private Collection<Object> createComponentsUtil(Settings settings) throws Except
             TelemetryProvider.NOOP,
             mock(PersistentTasksService.class),
             StubLinkedProjectConfigService.INSTANCE,
-            TestProjectResolvers.alwaysThrow()
+            TestProjectResolvers.alwaysThrow(),
+            mock(ProjectRoutingResolver.class)
         );
     }