Skip to content

Commit 60870d6

Browse files
authored
Move GCS TestUtils to fixture (#92370)
1 parent 89c396f commit 60870d6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import fixture.gcs.FakeOAuth2HttpHandler;
1212
import fixture.gcs.GoogleCloudStorageHttpHandler;
13+
import fixture.gcs.TestUtils;
1314

1415
import com.google.api.gax.retrying.RetrySettings;
1516
import com.google.cloud.http.HttpTransportOptions;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeLimit;
6161
import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeStart;
6262
import static fixture.gcs.GoogleCloudStorageHttpHandler.parseMultipartRequestBody;
63+
import static fixture.gcs.TestUtils.createServiceAccount;
6364
import static java.nio.charset.StandardCharsets.UTF_8;
6465
import static org.elasticsearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.randomBytes;
6566
import static org.elasticsearch.repositories.gcs.GoogleCloudStorageBlobStore.MAX_DELETES_PER_BATCH;
6667
import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.CREDENTIALS_FILE_SETTING;
6768
import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.ENDPOINT_SETTING;
6869
import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.READ_TIMEOUT_SETTING;
6970
import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.TOKEN_URI_SETTING;
70-
import static org.elasticsearch.repositories.gcs.TestUtils.createServiceAccount;
7171
import static org.hamcrest.Matchers.anyOf;
7272
import static org.hamcrest.Matchers.containsString;
7373
import static org.hamcrest.Matchers.equalTo;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* in compliance with, at your election, the Elastic License 2.0 or the Server
66
* Side Public License, v 1.
77
*/
8-
package org.elasticsearch.repositories.gcs;
8+
package fixture.gcs;
99

1010
import org.elasticsearch.xcontent.XContentBuilder;
1111
import org.elasticsearch.xcontent.XContentType;
@@ -16,14 +16,14 @@
1616
import java.util.Random;
1717
import java.util.UUID;
1818

19-
final class TestUtils {
19+
public final class TestUtils {
2020

2121
private TestUtils() {}
2222

2323
/**
2424
* Creates a random Service Account file for testing purpose
2525
*/
26-
static byte[] createServiceAccount(final Random random) {
26+
public static byte[] createServiceAccount(final Random random) {
2727
try {
2828
final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
2929
keyPairGenerator.initialize(2048);

0 commit comments

Comments
 (0)