Fix tests

Author: nicktindall

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

@@ -21,6 +21,7 @@
 import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.blobstore.BlobStore;
+import org.elasticsearch.common.blobstore.OperationPurpose;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.test.ESTestCase;
 
@@ -79,7 +80,14 @@ public void testDeleteBlobsIgnoringIfNotExistsThrowsIOException() throws Excepti
         when(storage.batch()).thenReturn(batch);
 
         final GoogleCloudStorageService storageService = mock(GoogleCloudStorageService.class);
-        when(storageService.client(any(String.class), any(String.class), any(GoogleCloudStorageOperationsStats.class))).thenReturn(storage);
+        when(
+            storageService.client(
+                any(String.class),
+                any(String.class),
+                any(OperationPurpose.class),
+                any(GoogleCloudStorageOperationsStats.class)
+            )
+        ).thenReturn(storage);
 
         try (
             BlobStore store = new GoogleCloudStorageBlobStore(

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

@@ -36,6 +36,7 @@
 import java.util.Locale;
 import java.util.UUID;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomPurpose;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -82,13 +83,13 @@ void notifyProxyIsSet(Proxy p) {
         GoogleCloudStorageOperationsStats statsCollector = new GoogleCloudStorageOperationsStats("bucket");
         final IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
-            () -> service.client("another_client", "repo", statsCollector)
+            () -> service.client("another_client", "repo", randomPurpose(), statsCollector)
         );
         assertThat(e.getMessage(), Matchers.startsWith("Unknown client name"));
         assertSettingDeprecationsAndWarnings(
             new Setting<?>[] { GoogleCloudStorageClientSettings.APPLICATION_NAME_SETTING.getConcreteSettingForNamespace(clientName) }
         );
-        final Storage storage = service.client(clientName, "repo", statsCollector);
+        final Storage storage = service.client(clientName, "repo", randomPurpose(), statsCollector);
         assertThat(storage.getOptions().getApplicationName(), Matchers.containsString(applicationName));
         assertThat(storage.getOptions().getHost(), Matchers.is(endpoint));
         assertThat(storage.getOptions().getProjectId(), Matchers.is(projectIdName));
@@ -116,33 +117,33 @@ public void testReinitClientSettings() throws Exception {
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings1)) {
             final GoogleCloudStorageService storageService = plugin.storageService;
             GoogleCloudStorageOperationsStats statsCollector = new GoogleCloudStorageOperationsStats("bucket");
-            final Storage client11 = storageService.client("gcs1", "repo1", statsCollector);
+            final Storage client11 = storageService.client("gcs1", "repo1", randomPurpose(), statsCollector);
             assertThat(client11.getOptions().getProjectId(), equalTo("project_gcs11"));
-            final Storage client12 = storageService.client("gcs2", "repo2", statsCollector);
+            final Storage client12 = storageService.client("gcs2", "repo2", randomPurpose(), statsCollector);
             assertThat(client12.getOptions().getProjectId(), equalTo("project_gcs12"));
             // client 3 is missing
             final IllegalArgumentException e1 = expectThrows(
                 IllegalArgumentException.class,
-                () -> storageService.client("gcs3", "repo3", statsCollector)
+                () -> storageService.client("gcs3", "repo3", randomPurpose(), statsCollector)
             );
             assertThat(e1.getMessage(), containsString("Unknown client name [gcs3]."));
             // update client settings
             plugin.reload(settings2);
             // old client 1 not changed
             assertThat(client11.getOptions().getProjectId(), equalTo("project_gcs11"));
             // new client 1 is changed
-            final Storage client21 = storageService.client("gcs1", "repo1", statsCollector);
+            final Storage client21 = storageService.client("gcs1", "repo1", randomPurpose(), statsCollector);
             assertThat(client21.getOptions().getProjectId(), equalTo("project_gcs21"));
             // old client 2 not changed
             assertThat(client12.getOptions().getProjectId(), equalTo("project_gcs12"));
             // new client2 is gone
             final IllegalArgumentException e2 = expectThrows(
                 IllegalArgumentException.class,
-                () -> storageService.client("gcs2", "repo2", statsCollector)
+                () -> storageService.client("gcs2", "repo2", randomPurpose(), statsCollector)
             );
             assertThat(e2.getMessage(), containsString("Unknown client name [gcs2]."));
             // client 3 emerged
-            final Storage client23 = storageService.client("gcs3", "repo3", statsCollector);
+            final Storage client23 = storageService.client("gcs3", "repo3", randomPurpose(), statsCollector);
             assertThat(client23.getOptions().getProjectId(), equalTo("project_gcs23"));
         }
     }
@@ -154,11 +155,22 @@ public void testClientsAreNotSharedAcrossRepositories() throws Exception {
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings)) {
             final GoogleCloudStorageService storageService = plugin.storageService;
 
-            final Storage repo1Client = storageService.client("gcs1", "repo1", new GoogleCloudStorageOperationsStats("bucket"));
-            final Storage repo2Client = storageService.client("gcs1", "repo2", new GoogleCloudStorageOperationsStats("bucket"));
+            final Storage repo1Client = storageService.client(
+                "gcs1",
+                "repo1",
+                randomPurpose(),
+                new GoogleCloudStorageOperationsStats("bucket")
+            );
+            final Storage repo2Client = storageService.client(
+                "gcs1",
+                "repo2",
+                randomPurpose(),
+                new GoogleCloudStorageOperationsStats("bucket")
+            );
             final Storage repo1ClientSecondInstance = storageService.client(
                 "gcs1",
                 "repo1",
+                randomPurpose(),
                 new GoogleCloudStorageOperationsStats("bucket")
             );