Make TransportGetDatabaseConfigurationAction project aware (#130065)

Author: samxbr

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/direct/TransportGetDatabaseConfigurationAction.java

@@ -13,11 +13,14 @@
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.nodes.TransportNodesAction;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.ingest.geoip.DatabaseNodeService;
+import org.elasticsearch.ingest.geoip.GeoIpDownloaderTaskExecutor;
 import org.elasticsearch.ingest.geoip.GeoIpTaskState;
 import org.elasticsearch.ingest.geoip.IngestGeoIpMetadata;
 import org.elasticsearch.injection.guice.Inject;
@@ -48,14 +51,16 @@ public class TransportGetDatabaseConfigurationAction extends TransportNodesActio
     List<DatabaseConfigurationMetadata>> {
 
     private final DatabaseNodeService databaseNodeService;
+    private final ProjectResolver projectResolver;
 
     @Inject
     public TransportGetDatabaseConfigurationAction(
         TransportService transportService,
         ClusterService clusterService,
         ThreadPool threadPool,
         ActionFilters actionFilters,
-        DatabaseNodeService databaseNodeService
+        DatabaseNodeService databaseNodeService,
+        ProjectResolver projectResolver
     ) {
         super(
             GetDatabaseConfigurationAction.NAME,
@@ -66,6 +71,7 @@ public TransportGetDatabaseConfigurationAction(
             threadPool.executor(ThreadPool.Names.MANAGEMENT)
         );
         this.databaseNodeService = databaseNodeService;
+        this.projectResolver = projectResolver;
     }
 
     protected List<DatabaseConfigurationMetadata> createActionContext(Task task, GetDatabaseConfigurationAction.Request request) {
@@ -82,25 +88,29 @@ protected List<DatabaseConfigurationMetadata> createActionContext(Task task, Get
                 "wildcard only supports a single value, please use comma-separated values or a single wildcard value"
             );
         }
-
         List<DatabaseConfigurationMetadata> results = new ArrayList<>();
-        PersistentTasksCustomMetadata tasksMetadata = PersistentTasksCustomMetadata.getPersistentTasksCustomMetadata(
-            clusterService.state()
-        );
+        ProjectMetadata projectMetadata = projectResolver.getProjectMetadata(clusterService.state());
+        PersistentTasksCustomMetadata tasksMetadata = PersistentTasksCustomMetadata.get(projectMetadata);
+        String geoIpTaskId = GeoIpDownloaderTaskExecutor.getTaskId(projectMetadata.id(), projectResolver.supportsMultipleProjects());
+
         for (String id : ids) {
-            results.addAll(getWebDatabases(tasksMetadata, id));
-            results.addAll(getMaxmindDatabases(clusterService, id));
+            results.addAll(getWebDatabases(geoIpTaskId, tasksMetadata, id));
+            results.addAll(getMaxmindDatabases(projectMetadata, id));
         }
         return results;
     }
 
     /*
      * This returns read-only database information about the databases managed by the standard downloader
      */
-    private static Collection<DatabaseConfigurationMetadata> getWebDatabases(PersistentTasksCustomMetadata tasksMetadata, String id) {
+    private static Collection<DatabaseConfigurationMetadata> getWebDatabases(
+        String geoIpTaskId,
+        PersistentTasksCustomMetadata tasksMetadata,
+        String id
+    ) {
         List<DatabaseConfigurationMetadata> webDatabases = new ArrayList<>();
         if (tasksMetadata != null) {
-            PersistentTasksCustomMetadata.PersistentTask<?> maybeGeoIpTask = tasksMetadata.getTask("geoip-downloader");
+            PersistentTasksCustomMetadata.PersistentTask<?> maybeGeoIpTask = tasksMetadata.getTask(geoIpTaskId);
             if (maybeGeoIpTask != null) {
                 GeoIpTaskState geoIpTaskState = (GeoIpTaskState) maybeGeoIpTask.getState();
                 if (geoIpTaskState != null) {
@@ -137,12 +147,9 @@ private static String getDatabaseNameForFileName(String databaseFileName) {
     /*
      * This returns information about databases that are downloaded from maxmind.
      */
-    private static Collection<DatabaseConfigurationMetadata> getMaxmindDatabases(ClusterService clusterService, String id) {
+    private static Collection<DatabaseConfigurationMetadata> getMaxmindDatabases(ProjectMetadata projectMetadata, String id) {
         List<DatabaseConfigurationMetadata> maxmindDatabases = new ArrayList<>();
-        final IngestGeoIpMetadata geoIpMeta = clusterService.state()
-            .metadata()
-            .getProject()
-            .custom(IngestGeoIpMetadata.TYPE, IngestGeoIpMetadata.EMPTY);
+        final IngestGeoIpMetadata geoIpMeta = projectMetadata.custom(IngestGeoIpMetadata.TYPE, IngestGeoIpMetadata.EMPTY);
         if (Regex.isSimpleMatchPattern(id)) {
             for (Map.Entry<String, DatabaseConfigurationMetadata> entry : geoIpMeta.getDatabases().entrySet()) {
                 if (Regex.simpleMatch(id, entry.getKey())) {