even more wiring

Author: ywangd

modules/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java

@@ -23,6 +23,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
 import org.elasticsearch.cluster.metadata.RepositoryMetadata;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.BackoffPolicy;
 import org.elasticsearch.common.blobstore.BlobContainer;
@@ -235,8 +236,8 @@ public TestGoogleCloudStoragePlugin(Settings settings) {
         }
 
         @Override
-        protected GoogleCloudStorageService createStorageService(ClusterService clusterService) {
-            return new GoogleCloudStorageService(clusterService) {
+        protected GoogleCloudStorageService createStorageService(ClusterService clusterService, ProjectResolver projectResolver) {
+            return new GoogleCloudStorageService(clusterService, projectResolver) {
                 @Override
                 StorageOptions createStorageOptions(
                     final GoogleCloudStorageClientSettings gcsClientSettings,

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageClientsManager.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.repositories.gcs;
+
+import org.elasticsearch.cluster.ClusterChangedEvent;
+import org.elasticsearch.cluster.ClusterStateApplier;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
+
+public class GoogleCloudStorageClientsManager implements ClusterStateApplier {
+
+    private static final Logger logger = LogManager.getLogger(GoogleCloudStorageClientsManager.class);
+
+    @Override
+    public void applyClusterState(ClusterChangedEvent event) {
+
+    }
+}

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java

@@ -10,6 +10,7 @@
 package org.elasticsearch.repositories.gcs;
 
 import org.apache.lucene.util.SetOnce;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
@@ -31,14 +32,17 @@
 
 public class GoogleCloudStoragePlugin extends Plugin implements RepositoryPlugin, ReloadablePlugin {
 
+    private final Settings settings;
     // package-private for tests
     final SetOnce<GoogleCloudStorageService> storageService = new SetOnce<>();
 
-    public GoogleCloudStoragePlugin(final Settings settings) {}
+    public GoogleCloudStoragePlugin(final Settings settings) {
+        this.settings = settings;
+    }
 
     // overridable for tests
-    protected GoogleCloudStorageService createStorageService(ClusterService clusterService) {
-        return new GoogleCloudStorageService(clusterService);
+    protected GoogleCloudStorageService createStorageService(ClusterService clusterService, ProjectResolver projectResolver) {
+        return new GoogleCloudStorageService(clusterService, projectResolver);
     }
 
     @Override
@@ -68,9 +72,9 @@ public Map<String, Repository.Factory> getRepositories(
     @Override
     public Collection<?> createComponents(PluginServices services) {
         final ClusterService clusterService = services.clusterService();
-        storageService.set(createStorageService(clusterService));
+        storageService.set(createStorageService(clusterService, services.projectResolver()));
         // eagerly load client settings so that secure settings are readable (not closed)
-        reload(clusterService.getSettings());
+        reload(settings);
         return List.of(storageService.get());
     }
 

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageService.java

@@ -26,6 +26,7 @@
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.Maps;
@@ -54,13 +55,18 @@
 public class GoogleCloudStorageService {
 
     private static final Logger logger = LogManager.getLogger(GoogleCloudStorageService.class);
+    private final GoogleCloudStorageClientsManager googleCloudStorageClientsManager;
 
     private volatile Map<String, GoogleCloudStorageClientSettings> clientSettings = emptyMap();
 
     private final boolean isServerless;
 
-    public GoogleCloudStorageService(ClusterService clusterService) {
+    public GoogleCloudStorageService(ClusterService clusterService, ProjectResolver projectResolver) {
         this.isServerless = DiscoveryNode.isStateless(clusterService.getSettings());
+        this.googleCloudStorageClientsManager = new GoogleCloudStorageClientsManager();
+        if (projectResolver.supportsMultipleProjects()) {
+            clusterService.addHighPriorityApplier(this.googleCloudStorageClientsManager);
+        }
     }
 
     public boolean isServerless() {

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java

@@ -24,6 +24,7 @@
 
 import org.apache.http.HttpStatus;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.BackoffPolicy;
 import org.elasticsearch.common.Strings;
@@ -149,7 +150,7 @@ protected BlobContainer createBlobContainer(
         secureSettings.setFile(CREDENTIALS_FILE_SETTING.getConcreteSettingForNamespace(client).getKey(), createServiceAccount(random()));
         clientSettings.setSecureSettings(secureSettings);
 
-        final GoogleCloudStorageService service = new GoogleCloudStorageService(clusterService) {
+        final GoogleCloudStorageService service = new GoogleCloudStorageService(clusterService, TestProjectResolvers.DEFAULT_PROJECT_ONLY) {
             @Override
             StorageOptions createStorageOptions(
                 final GoogleCloudStorageClientSettings gcsClientSettings,

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerStatsTests.java

@@ -15,6 +15,7 @@
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.sun.net.httpserver.HttpServer;
 
+import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.common.BackoffPolicy;
 import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.blobstore.BlobStoreActionStats;
@@ -105,7 +106,8 @@ public void createStorageService() throws Exception {
         threadPool = new TestThreadPool(getTestClass().getName());
         httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
         httpServer.start();
-        googleCloudStorageService = new GoogleCloudStorageService(ClusterServiceUtils.createClusterService(threadPool));
+        googleCloudStorageService = new GoogleCloudStorageService(ClusterServiceUtils.createClusterService(threadPool),
+            TestProjectResolvers.DEFAULT_PROJECT_ONLY);
         googleCloudStorageHttpHandler = new GoogleCloudStorageHttpHandler(BUCKET);
         httpServer.createContext("/", googleCloudStorageHttpHandler);
         httpServer.createContext("/token", new FakeOAuth2HttpHandler());

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageServiceTests.java

@@ -17,6 +17,7 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.protocol.HttpContext;
 import org.apache.lucene.util.SetOnce;
+import org.elasticsearch.cluster.project.TestProjectResolvers;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Setting;
@@ -77,7 +78,7 @@ public void testClientInitializer() throws Exception {
             .build();
         SetOnce<Proxy> proxy = new SetOnce<>();
         final var clusterService = ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool());
-        final GoogleCloudStorageService service = new GoogleCloudStorageService(clusterService) {
+        final GoogleCloudStorageService service = new GoogleCloudStorageService(clusterService, TestProjectResolvers.DEFAULT_PROJECT_ONLY) {
             @Override
             void notifyProxyIsSet(Proxy p) {
                 proxy.set(p);
@@ -122,6 +123,7 @@ public void testReinitClientSettings() throws Exception {
         when(pluginServices.clusterService()).thenReturn(
             ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool())
         );
+        when(pluginServices.projectResolver()).thenReturn(TestProjectResolvers.DEFAULT_PROJECT_ONLY);
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings1)) {
             plugin.createComponents(pluginServices);
             final GoogleCloudStorageService storageService = plugin.storageService.get();
@@ -165,6 +167,7 @@ public void testClientsAreNotSharedAcrossRepositories() throws Exception {
         when(pluginServices.clusterService()).thenReturn(
             ClusterServiceUtils.createClusterService(new DeterministicTaskQueue().getThreadPool())
         );
+        when(pluginServices.projectResolver()).thenReturn(TestProjectResolvers.DEFAULT_PROJECT_ONLY);
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings)) {
             plugin.createComponents(pluginServices);
             final GoogleCloudStorageService storageService = plugin.storageService.get();