tweak

Author: ywangd

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Service.java

@@ -184,8 +184,7 @@ ProjectId effectiveProjectId(@Nullable ProjectId projectId) {
         return projectId == null ? ProjectId.DEFAULT : projectId;
     }
 
-    // visible for tests
-    protected AmazonS3Reference buildClientReference(final S3ClientSettings clientSettings) {
+    private AmazonS3Reference buildClientReference(final S3ClientSettings clientSettings) {
         final SdkHttpClient httpClient = buildHttpClient(clientSettings, getCustomDnsResolver());
         Releasable toRelease = httpClient::close;
         try {
@@ -198,8 +197,13 @@ protected AmazonS3Reference buildClientReference(final S3ClientSettings clientSe
         }
     }
 
+    @FixForMultiProject(description = "can be removed once blobstore is project aware")
     S3ClientSettings settings(RepositoryMetadata repositoryMetadata) {
-        return s3ClientsManager.settingsForClient(ProjectId.DEFAULT, repositoryMetadata);
+        return settings(ProjectId.DEFAULT, repositoryMetadata);
+    }
+
+    S3ClientSettings settings(@Nullable ProjectId projectId, RepositoryMetadata repositoryMetadata) {
+        return s3ClientsManager.settingsForClient(effectiveProjectId(projectId), repositoryMetadata);
     }
 
     // proxy for testing