This is an automated email from the ASF dual-hosted git repository.
johncasey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new c51aa8528a2 Add `credentials` as a parameter to builder in Resource
managers. (#27830)
c51aa8528a2 is described below
commit c51aa8528a26442d2df50d1fda39bc3f227ad8fa
Author: Pranav Bhandari <[email protected]>
AuthorDate: Tue Aug 8 15:43:58 2023 -0400
Add `credentials` as a parameter to builder in Resource managers. (#27830)
This change should make sure that credentials are not required for unit
tests.
---
.github/workflows/beam_PreCommit_ItFramework.yml | 7 -------
.../main/java/org/apache/beam/it/gcp/LoadTestBase.java | 5 ++---
.../beam/it/gcp/bigquery/BigQueryResourceManager.java | 10 ++++------
.../beam/it/gcp/bigtable/BigtableResourceManager.java | 16 +++++++---------
.../beam/it/gcp/dataflow/ClassicTemplateClient.java | 9 ++++-----
.../apache/beam/it/gcp/dataflow/FlexTemplateClient.java | 9 ++++-----
.../apache/beam/it/gcp/datagenerator/DataGenerator.java | 2 +-
.../beam/it/gcp/datastore/DatastoreResourceManager.java | 10 ++++------
.../it/gcp/datastream/DatastreamResourceManager.java | 12 +++++-------
.../org/apache/beam/it/gcp/dlp/DlpResourceManager.java | 11 ++++-------
.../org/apache/beam/it/gcp/kms/KMSResourceManager.java | 12 ++++--------
.../apache/beam/it/gcp/monitoring/MonitoringClient.java | 11 ++++-------
.../apache/beam/it/gcp/pubsub/PubsubResourceManager.java | 12 +++++-------
.../gcp/secretmanager/SecretManagerResourceManager.java | 11 ++++-------
.../apache/beam/it/gcp/storage/GcsResourceManager.java | 10 +++++-----
.../org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java | 2 +-
.../it/gcp/bigquery/BigQueryResourceManagerTest.java | 2 +-
.../org/apache/beam/it/gcp/bigtable/BigTableIOLT.java | 3 ++-
.../beam/it/gcp/bigtable/BigtableResourceManagerIT.java | 2 +-
.../it/gcp/bigtable/BigtableResourceManagerTest.java | 8 ++++----
.../beam/it/gcp/dataflow/ClassicTemplateClientTest.java | 2 +-
.../beam/it/gcp/dataflow/FlexTemplateClientTest.java | 2 +-
.../it/gcp/datastore/DatastoreResourceManagerIT.java | 15 +++++++++------
.../it/gcp/datastream/DatastreamResourceManagerTest.java | 7 ++++---
.../org/apache/beam/it/gcp/kms/KMSResourceManagerIT.java | 5 +----
.../apache/beam/it/gcp/kms/KMSResourceManagerTest.java | 2 +-
.../beam/it/gcp/pubsub/PubsubResourceManagerTest.java | 3 ++-
.../secretmanager/SecretManagerResourceManagerTest.java | 2 +-
.../org/apache/beam/it/gcp/storage/FileBasedIOLT.java | 3 +--
.../beam/it/gcp/storage/GcsResourceManagerTest.java | 5 +++--
30 files changed, 90 insertions(+), 120 deletions(-)
diff --git a/.github/workflows/beam_PreCommit_ItFramework.yml
b/.github/workflows/beam_PreCommit_ItFramework.yml
index 23987810b13..1db67237397 100644
--- a/.github/workflows/beam_PreCommit_ItFramework.yml
+++ b/.github/workflows/beam_PreCommit_ItFramework.yml
@@ -82,13 +82,6 @@ jobs:
requires-py-38: false
requires-py-39: false
requires-go: false
- - name: Authenticate on GCP
- uses: google-github-actions/setup-gcloud@v0
- with:
- service_account_email: ${{ secrets.GCP_SA_EMAIL }}
- service_account_key: ${{ secrets.GCP_SA_KEY }}
- project_id: ${{ secrets.GCP_PROJECT_ID }}
- export_default_credentials: true
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/LoadTestBase.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/LoadTestBase.java
index ad70e860b5b..f3546980a0c 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/LoadTestBase.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/LoadTestBase.java
@@ -112,8 +112,7 @@ public abstract class LoadTestBase {
public void setUp() throws IOException {
project = TestProperties.project();
region = TestProperties.region();
- monitoringClient =
-
MonitoringClient.builder().setCredentialsProvider(CREDENTIALS_PROVIDER).build();
+ monitoringClient = MonitoringClient.builder(CREDENTIALS_PROVIDER).build();
pipelineLauncher = launcher();
pipelineOperator = new PipelineOperator(pipelineLauncher);
}
@@ -139,7 +138,7 @@ public abstract class LoadTestBase {
// either use the user specified project for exporting, or the same
project
String exportProject =
MoreObjects.firstNonNull(TestProperties.exportProject(), project);
BigQueryResourceManager bigQueryResourceManager =
- BigQueryResourceManager.builder(testName, exportProject)
+ BigQueryResourceManager.builder(testName, exportProject, CREDENTIALS)
.setDatasetId(TestProperties.exportDataset())
.setCredentials(CREDENTIALS)
.build();
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManager.java
index 47614cfd618..07847312a17 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManager.java
@@ -19,7 +19,6 @@ package org.apache.beam.it.gcp.bigquery;
import com.google.api.gax.paging.Page;
import com.google.auth.Credentials;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.BigQueryError;
import com.google.cloud.bigquery.BigQueryOptions;
@@ -35,7 +34,6 @@ import com.google.cloud.bigquery.TableDefinition;
import com.google.cloud.bigquery.TableId;
import com.google.cloud.bigquery.TableInfo;
import com.google.cloud.bigquery.TableResult;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -96,8 +94,8 @@ public final class BigQueryResourceManager implements
ResourceManager {
this.bigQuery = bigQuery;
}
- public static Builder builder(String testId, String projectId) throws
IOException {
- return new Builder(testId, projectId);
+ public static Builder builder(String testId, String projectId, Credentials
credentials) {
+ return new Builder(testId, projectId, credentials);
}
public String getProjectId() {
@@ -478,11 +476,11 @@ public final class BigQueryResourceManager implements
ResourceManager {
private String datasetId;
private Credentials credentials;
- private Builder(String testId, String projectId) throws IOException {
+ private Builder(String testId, String projectId, Credentials credentials) {
this.testId = testId;
this.projectId = projectId;
this.datasetId = null;
- this.credentials = GoogleCredentials.getApplicationDefault();
+ this.credentials = credentials;
}
public Builder setDatasetId(String datasetId) {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManager.java
index 0ddc6886959..c2adea1e0dc 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManager.java
@@ -23,9 +23,7 @@ import static
org.apache.beam.it.gcp.bigtable.BigtableResourceManagerUtils.gener
import static
org.apache.beam.it.gcp.bigtable.BigtableResourceManagerUtils.generateInstanceId;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.rpc.ServerStream;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient;
import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminSettings;
import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient;
@@ -83,9 +81,9 @@ public class BigtableResourceManager implements
ResourceManager {
private final BigtableResourceManagerClientFactory
bigtableResourceManagerClientFactory;
// List to store created tables for static RM
- private List<String> createdTables;
+ private final List<String> createdTables;
// List to store created app profiles for static RM
- private List<String> createdAppProfiles;
+ private final List<String> createdAppProfiles;
private boolean hasInstance;
private final boolean usingStaticInstance;
@@ -157,8 +155,9 @@ public class BigtableResourceManager implements
ResourceManager {
}
}
- public static Builder builder(String testId, String projectId) throws
IOException {
- return new Builder(testId, projectId);
+ public static Builder builder(
+ String testId, String projectId, CredentialsProvider
credentialsProvider) {
+ return new Builder(testId, projectId, credentialsProvider);
}
/**
@@ -575,11 +574,10 @@ public class BigtableResourceManager implements
ResourceManager {
private boolean useStaticInstance;
private CredentialsProvider credentialsProvider;
- private Builder(String testId, String projectId) throws IOException {
+ private Builder(String testId, String projectId, CredentialsProvider
credentialsProvider) {
this.testId = testId;
this.projectId = projectId;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
this.instanceId = null;
}
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClient.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClient.java
index afd3be2582f..5359b097fc2 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClient.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClient.java
@@ -28,7 +28,6 @@ import com.google.api.services.dataflow.model.Job;
import com.google.api.services.dataflow.model.RuntimeEnvironment;
import com.google.auth.Credentials;
import com.google.auth.http.HttpCredentialsAdapter;
-import com.google.auth.oauth2.GoogleCredentials;
import dev.failsafe.Failsafe;
import java.io.IOException;
import org.slf4j.Logger;
@@ -55,8 +54,8 @@ public final class ClassicTemplateClient extends
AbstractPipelineLauncher {
return new ClassicTemplateClient(dataflow);
}
- public static Builder builder() throws IOException {
- return new Builder();
+ public static Builder builder(Credentials credentials) {
+ return new Builder(credentials);
}
@Override
@@ -110,8 +109,8 @@ public final class ClassicTemplateClient extends
AbstractPipelineLauncher {
private Credentials credentials;
- private Builder() throws IOException {
- this.credentials = GoogleCredentials.getApplicationDefault();
+ private Builder(Credentials credentials) {
+ this.credentials = credentials;
}
public Credentials getCredentials() {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClient.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClient.java
index 3971caf9d2d..72f05d15e56 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClient.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClient.java
@@ -30,7 +30,6 @@ import
com.google.api.services.dataflow.model.LaunchFlexTemplateRequest;
import com.google.api.services.dataflow.model.LaunchFlexTemplateResponse;
import com.google.auth.Credentials;
import com.google.auth.http.HttpCredentialsAdapter;
-import com.google.auth.oauth2.GoogleCredentials;
import dev.failsafe.Failsafe;
import java.io.IOException;
import org.slf4j.Logger;
@@ -56,8 +55,8 @@ public final class FlexTemplateClient extends
AbstractPipelineLauncher {
return new FlexTemplateClient(dataflow);
}
- public static Builder builder() throws IOException {
- return new Builder();
+ public static Builder builder(Credentials credentials) {
+ return new Builder(credentials);
}
@Override
@@ -117,8 +116,8 @@ public final class FlexTemplateClient extends
AbstractPipelineLauncher {
public static final class Builder {
private Credentials credentials;
- private Builder() throws IOException {
- this.credentials = GoogleCredentials.getApplicationDefault();
+ private Builder(Credentials credentials) {
+ this.credentials = credentials;
}
public Credentials getCredentials() {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
index afae5486010..76d7f32286e 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datagenerator/DataGenerator.java
@@ -52,7 +52,7 @@ public class DataGenerator {
private final PipelineOperator pipelineOperator;
private DataGenerator(Builder builder) throws IOException {
- pipelineLauncher =
FlexTemplateClient.builder().setCredentials(CREDENTIALS).build();
+ pipelineLauncher = FlexTemplateClient.builder(CREDENTIALS).build();
pipelineOperator = new PipelineOperator(pipelineLauncher);
this.dataGeneratorOptions =
LaunchConfig.builder(builder.getJobName(), SPEC_PATH)
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManager.java
index dfedf7150c6..37ccce5454d 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManager.java
@@ -20,7 +20,6 @@ package org.apache.beam.it.gcp.datastore;
import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
import com.google.auth.Credentials;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.datastore.Datastore;
import com.google.cloud.datastore.DatastoreOptions;
import com.google.cloud.datastore.Entity;
@@ -29,7 +28,6 @@ import com.google.cloud.datastore.GqlQuery;
import com.google.cloud.datastore.Key;
import com.google.cloud.datastore.Query.ResultType;
import com.google.cloud.datastore.QueryResults;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -138,10 +136,10 @@ public class DatastoreResourceManager implements
ResourceManager {
keys.clear();
}
- public static Builder builder(String project, String namespace) throws
IOException {
+ public static Builder builder(String project, String namespace, Credentials
credentials) {
checkArgument(!Strings.isNullOrEmpty(project), "project can not be empty");
checkArgument(!Strings.isNullOrEmpty(namespace), "namespace can not be
empty");
- return new Builder(project, namespace);
+ return new Builder(project, namespace, credentials);
}
public static final class Builder {
@@ -150,10 +148,10 @@ public class DatastoreResourceManager implements
ResourceManager {
private final String namespace;
private Credentials credentials;
- private Builder(String project, String namespace) throws IOException {
+ private Builder(String project, String namespace, Credentials credentials)
{
this.project = project;
this.namespace = namespace;
- this.credentials = GoogleCredentials.getApplicationDefault();
+ this.credentials = credentials;
}
public Builder credentials(Credentials credentials) {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManager.java
index bdfdbbf6237..656c53e600c 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManager.java
@@ -20,8 +20,6 @@ package org.apache.beam.it.gcp.datastream;
import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.datastream.v1.AvroFileFormat;
import com.google.cloud.datastream.v1.BigQueryDestinationConfig;
import com.google.cloud.datastream.v1.BigQueryProfile;
@@ -99,10 +97,11 @@ public final class DatastreamResourceManager implements
ResourceManager {
this.createdConnectionProfileIds = Collections.synchronizedSet(new
HashSet<>());
}
- public static Builder builder(String projectId, String location) throws
IOException {
+ public static Builder builder(
+ String projectId, String location, CredentialsProvider
credentialsProvider) {
checkArgument(!Strings.isNullOrEmpty(projectId), "projectID can not be
null or empty");
checkArgument(!Strings.isNullOrEmpty(location), "location can not be null
or empty");
- return new Builder(projectId, location);
+ return new Builder(projectId, location, credentialsProvider);
}
/**
@@ -490,11 +489,10 @@ public final class DatastreamResourceManager implements
ResourceManager {
private final String location;
private CredentialsProvider credentialsProvider;
- private Builder(String projectId, String location) throws IOException {
+ private Builder(String projectId, String location, CredentialsProvider
credentialsProvider) {
this.projectId = projectId;
this.location = location;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
}
public Builder setCredentialsProvider(CredentialsProvider
credentialsProvider) {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dlp/DlpResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dlp/DlpResourceManager.java
index 854d749857a..f59794af3e1 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dlp/DlpResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/dlp/DlpResourceManager.java
@@ -18,8 +18,6 @@
package org.apache.beam.it.gcp.dlp;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.dlp.v2.DlpServiceClient;
import com.google.cloud.dlp.v2.DlpServiceSettings;
import com.google.privacy.dlp.v2.DeidentifyTemplate;
@@ -115,8 +113,8 @@ public class DlpResourceManager implements ResourceManager {
* @param project the GCP project ID
* @return a new instance of Builder
*/
- public static Builder builder(String project) throws IOException {
- return new Builder(project);
+ public static Builder builder(String project, CredentialsProvider
credentialsProvider) {
+ return new Builder(project, credentialsProvider);
}
/** A builder class for creating instances of {@link DlpResourceManager}. */
@@ -130,10 +128,9 @@ public class DlpResourceManager implements ResourceManager
{
*
* @param project the GCP project ID
*/
- public Builder(String project) throws IOException {
+ public Builder(String project, CredentialsProvider credentialsProvider) {
this.project = project;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
}
/**
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/kms/KMSResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/kms/KMSResourceManager.java
index 394ad397d2f..87a1e06e2a4 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/kms/KMSResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/kms/KMSResourceManager.java
@@ -18,8 +18,6 @@
package org.apache.beam.it.gcp.kms;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.kms.v1.CryptoKey;
import com.google.cloud.kms.v1.CryptoKeyName;
import com.google.cloud.kms.v1.CryptoKeyVersion;
@@ -31,7 +29,6 @@ import com.google.cloud.kms.v1.KeyRing;
import com.google.cloud.kms.v1.KeyRingName;
import com.google.cloud.kms.v1.LocationName;
import com.google.protobuf.ByteString;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Optional;
@@ -75,8 +72,8 @@ public class KMSResourceManager implements ResourceManager {
this.keyRing = null;
}
- public static Builder builder(String projectId) throws IOException {
- return new Builder(projectId);
+ public static Builder builder(String projectId, CredentialsProvider
credentialsProvider) {
+ return new Builder(projectId, credentialsProvider);
}
/**
@@ -237,11 +234,10 @@ public class KMSResourceManager implements
ResourceManager {
private CredentialsProvider credentialsProvider;
private String region;
- private Builder(String projectId) throws IOException {
+ private Builder(String projectId, CredentialsProvider credentialsProvider)
{
this.projectId = projectId;
this.region = DEFAULT_KMS_REGION;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
}
/**
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/monitoring/MonitoringClient.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/monitoring/MonitoringClient.java
index 800ec444d55..0fc5614a363 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/monitoring/MonitoringClient.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/monitoring/MonitoringClient.java
@@ -18,8 +18,6 @@
package org.apache.beam.it.gcp.monitoring;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.monitoring.v3.MetricServiceClient;
import
com.google.cloud.monitoring.v3.MetricServiceClient.ListTimeSeriesPagedResponse;
import com.google.cloud.monitoring.v3.MetricServiceSettings;
@@ -64,8 +62,8 @@ public final class MonitoringClient {
return new MonitoringClient(metricServiceClient);
}
- public static Builder builder() throws IOException {
- return new Builder();
+ public static Builder builder(CredentialsProvider credentialsProvider) {
+ return new Builder(credentialsProvider);
}
/**
@@ -449,9 +447,8 @@ public final class MonitoringClient {
public static final class Builder {
private CredentialsProvider credentialsProvider;
- private Builder() throws IOException {
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ private Builder(CredentialsProvider credentialsProvider) {
+ this.credentialsProvider = credentialsProvider;
}
public CredentialsProvider getCredentialsProvider() {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManager.java
index fe444c92fb0..60ef5ea2c51 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManager.java
@@ -20,8 +20,6 @@ package org.apache.beam.it.gcp.pubsub;
import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.pubsub.v1.Publisher;
import com.google.cloud.pubsub.v1.SchemaServiceClient;
import com.google.cloud.pubsub.v1.SchemaServiceSettings;
@@ -118,10 +116,11 @@ public final class PubsubResourceManager implements
ResourceManager {
this.schemaServiceClient = schemaServiceClient;
}
- public static Builder builder(String testName, String projectId) throws
IOException {
+ public static Builder builder(
+ String testName, String projectId, CredentialsProvider
credentialsProvider) {
checkArgument(!Strings.isNullOrEmpty(testName), "testName can not be null
or empty");
checkArgument(!projectId.isEmpty(), "projectId can not be empty");
- return new Builder(testName, projectId);
+ return new Builder(testName, projectId, credentialsProvider);
}
/**
@@ -361,11 +360,10 @@ public final class PubsubResourceManager implements
ResourceManager {
private final String testName;
private CredentialsProvider credentialsProvider;
- private Builder(String testName, String projectId) throws IOException {
+ private Builder(String testName, String projectId, CredentialsProvider
credentialsProvider) {
this.testName = testName;
this.projectId = projectId;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
}
public Builder credentialsProvider(CredentialsProvider
credentialsProvider) {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManager.java
index e852a05b904..5d09f17cb58 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManager.java
@@ -20,8 +20,6 @@ package org.apache.beam.it.gcp.secretmanager;
import static com.google.common.base.Preconditions.checkArgument;
import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
import com.google.cloud.secretmanager.v1.ProjectName;
import com.google.cloud.secretmanager.v1.Replication;
@@ -69,9 +67,9 @@ public class SecretManagerResourceManager implements
ResourceManager {
this.createdSecretIds = Collections.synchronizedSet(new HashSet<>());
}
- public static Builder builder(String projectId) throws IOException {
+ public static Builder builder(String projectId, CredentialsProvider
credentialsProvider) {
checkArgument(!projectId.isEmpty(), "projectId can not be empty");
- return new Builder(projectId);
+ return new Builder(projectId, credentialsProvider);
}
/**
@@ -274,10 +272,9 @@ public class SecretManagerResourceManager implements
ResourceManager {
private CredentialsProvider credentialsProvider;
- private Builder(String projectId) throws IOException {
+ private Builder(String projectId, CredentialsProvider credentialsProvider)
{
this.projectId = projectId;
- this.credentialsProvider =
-
FixedCredentialsProvider.create(GoogleCredentials.getApplicationDefault());
+ this.credentialsProvider = credentialsProvider;
}
public Builder credentialsProvider(CredentialsProvider
credentialsProvider) {
diff --git
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/storage/GcsResourceManager.java
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/storage/GcsResourceManager.java
index 9364546b14e..3c2253e79a3 100644
---
a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/storage/GcsResourceManager.java
+++
b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/storage/GcsResourceManager.java
@@ -21,7 +21,6 @@ import static
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Prec
import com.google.api.gax.paging.Page;
import com.google.auth.Credentials;
-import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.storage.Blob;
import com.google.cloud.storage.BlobId;
import com.google.cloud.storage.BlobInfo;
@@ -85,11 +84,12 @@ public final class GcsResourceManager implements
ArtifactClient, ResourceManager
}
/** Returns a new {@link Builder} for configuring a client. */
- public static Builder builder(String bucket, String testClassName) throws
IOException {
+ public static Builder builder(String bucket, String testClassName,
Credentials credentials)
+ throws IOException {
checkArgument(!bucket.equals(""));
checkArgument(!testClassName.equals(""));
- return new Builder(bucket, testClassName);
+ return new Builder(bucket, testClassName, credentials);
}
@Override
@@ -286,10 +286,10 @@ public final class GcsResourceManager implements
ArtifactClient, ResourceManager
private final String testClassName;
private Credentials credentials;
- private Builder(String bucket, String testClassName) throws IOException {
+ private Builder(String bucket, String testClassName, Credentials
credentials) {
this.bucket = bucket;
this.testClassName = testClassName;
- this.credentials = GoogleCredentials.getApplicationDefault();
+ this.credentials = credentials;
}
public Builder setCredentials(Credentials credentials) {
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
index 0a27672550b..25904919434 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
@@ -111,7 +111,7 @@ public final class BigQueryIOLT extends IOLoadTestBase {
@BeforeClass
public static void beforeClass() throws IOException {
resourceManager =
- BigQueryResourceManager.builder("io-bigquery-lt", project)
+ BigQueryResourceManager.builder("io-bigquery-lt", project, CREDENTIALS)
.setCredentials(CREDENTIALS)
.build();
resourceManager.createDataset(region);
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManagerTest.java
index eb85cd33171..10acb195ce5 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManagerTest.java
@@ -86,7 +86,7 @@ public class BigQueryResourceManagerTest {
@Test
public void testGetDatasetIdReturnsCorrectValue() throws IOException {
- BigQueryResourceManager tm = BigQueryResourceManager.builder(TEST_ID,
PROJECT_ID).build();
+ BigQueryResourceManager tm = BigQueryResourceManager.builder(TEST_ID,
PROJECT_ID, null).build();
assertThat(tm.getDatasetId()).matches(TEST_ID.replace('-', '_') +
"_\\d{8}_\\d{6}_\\d{6}");
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
index b1f3016700f..cf3a867c6eb 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java
@@ -77,7 +77,8 @@ public class BigTableIOLT extends IOLoadTestBase {
@Before
public void setup() throws IOException {
- resourceManager = BigtableResourceManager.builder(testName,
project).build();
+ resourceManager =
+ BigtableResourceManager.builder(testName, project,
CREDENTIALS_PROVIDER).build();
String testConfig =
TestProperties.getProperty("configuration", "small",
TestProperties.Type.PROPERTY);
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerIT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerIT.java
index 1d971781db1..ce2315efa6e 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerIT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerIT.java
@@ -48,7 +48,7 @@ public class BigtableResourceManagerIT extends GCPBaseIT {
@Before
public void setUp() throws IOException {
bigtableResourceManager =
- BigtableResourceManager.builder("dummy", PROJECT)
+ BigtableResourceManager.builder("dummy", PROJECT, null)
.setCredentialsProvider(credentialsProvider)
.build();
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerTest.java
index e5cd7553045..6e657803064 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigtableResourceManagerTest.java
@@ -76,7 +76,7 @@ public class BigtableResourceManagerTest {
public void setUp() throws IOException {
testManager =
new BigtableResourceManager(
- BigtableResourceManager.builder(TEST_ID, PROJECT_ID),
+ BigtableResourceManager.builder(TEST_ID, PROJECT_ID, null),
bigtableResourceManagerClientFactory);
cluster =
ImmutableList.of(
@@ -88,7 +88,7 @@ public class BigtableResourceManagerTest {
public void testCreateResourceManagerCreatesCorrectIdValues() throws
IOException {
BigtableResourceManager rm =
new BigtableResourceManager(
- BigtableResourceManager.builder(TEST_ID, PROJECT_ID),
+ BigtableResourceManager.builder(TEST_ID, PROJECT_ID, null),
bigtableResourceManagerClientFactory);
assertThat(rm.getInstanceId()).matches(TEST_ID + "-\\d{8}-\\d{6}-\\d{6}");
@@ -124,7 +124,7 @@ public class BigtableResourceManagerTest {
String instanceId = "static-instance";
testManager =
new BigtableResourceManager(
- BigtableResourceManager.builder(TEST_ID, PROJECT_ID)
+ BigtableResourceManager.builder(TEST_ID, PROJECT_ID, null)
.setInstanceId(instanceId)
.useStaticInstance(),
bigtableResourceManagerClientFactory);
@@ -419,7 +419,7 @@ public class BigtableResourceManagerTest {
String instanceId = "static-instance";
testManager =
new BigtableResourceManager(
- BigtableResourceManager.builder(TEST_ID, PROJECT_ID)
+ BigtableResourceManager.builder(TEST_ID, PROJECT_ID, null)
.setInstanceId(instanceId)
.useStaticInstance(),
bigtableResourceManagerClientFactory);
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClientTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClientTest.java
index 95428bb2288..41dc6763738 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClientTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/ClassicTemplateClientTest.java
@@ -81,7 +81,7 @@ public final class ClassicTemplateClientTest {
@Test
public void testCreateWithCredentials() throws IOException {
Credentials credentials = mock(Credentials.class);
- ClassicTemplateClient.builder().setCredentials(credentials).build();
+ ClassicTemplateClient.builder(credentials).build();
// Lack of exception is all we really can test
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClientTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClientTest.java
index 8d235921c98..ae49972bd06 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClientTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/dataflow/FlexTemplateClientTest.java
@@ -83,7 +83,7 @@ public final class FlexTemplateClientTest {
@Test
public void testCreateWithCredentials() throws IOException {
Credentials credentials = mock(Credentials.class);
- FlexTemplateClient.builder().setCredentials(credentials).build();
+ FlexTemplateClient.builder(credentials).build();
// Lack of exception is all we really can test
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManagerIT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManagerIT.java
index 9ebc38ca9b7..95e11597d74 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManagerIT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastore/DatastoreResourceManagerIT.java
@@ -33,8 +33,9 @@ public class DatastoreResourceManagerIT {
public void testInsert() throws IOException {
DatastoreResourceManager resourceManager =
DatastoreResourceManager.builder(
- TestProperties.project(),
DatastoreUtils.createTestId("testInsert"))
- .credentials(TestProperties.credentials())
+ TestProperties.project(),
+ DatastoreUtils.createTestId("testInsert"),
+ TestProperties.credentials())
.build();
List<Entity> entities =
resourceManager.insert(
@@ -53,8 +54,9 @@ public class DatastoreResourceManagerIT {
public void testInsertQuery() throws IOException {
DatastoreResourceManager resourceManager =
DatastoreResourceManager.builder(
- TestProperties.project(),
DatastoreUtils.createTestId("testInsertQuery"))
- .credentials(TestProperties.buildCredentialsFromEnv())
+ TestProperties.project(),
+ DatastoreUtils.createTestId("testInsertQuery"),
+ TestProperties.buildCredentialsFromEnv())
.build();
List<Entity> entities =
@@ -76,8 +78,9 @@ public class DatastoreResourceManagerIT {
public void testInsertCleanUp() throws IOException {
DatastoreResourceManager resourceManager =
DatastoreResourceManager.builder(
- TestProperties.project(),
DatastoreUtils.createTestId("testInsertCleanUp"))
- .credentials(TestProperties.buildCredentialsFromEnv())
+ TestProperties.project(),
+ DatastoreUtils.createTestId("testInsertCleanUp"),
+ TestProperties.buildCredentialsFromEnv())
.build();
resourceManager.insert(
"person", ImmutableMap.of(1L, Entity.newBuilder().set("name", "John
Doe").build()));
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManagerTest.java
index cda679968da..cb9e9f8f9bc 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/datastream/DatastreamResourceManagerTest.java
@@ -69,14 +69,15 @@ public class DatastreamResourceManagerTest {
public void setup() throws IOException {
testManager =
new DatastreamResourceManager(
- datastreamClient, DatastreamResourceManager.builder(PROJECT_ID,
LOCATION));
+ datastreamClient, DatastreamResourceManager.builder(PROJECT_ID,
LOCATION, null));
}
@Test
public void testBuilderWithInvalidProjectShouldFail() {
IllegalArgumentException exception =
assertThrows(
- IllegalArgumentException.class, () ->
DatastreamResourceManager.builder("", LOCATION));
+ IllegalArgumentException.class,
+ () -> DatastreamResourceManager.builder("", LOCATION, null));
assertThat(exception).hasMessageThat().contains("projectID can not be null
or empty");
}
@@ -85,7 +86,7 @@ public class DatastreamResourceManagerTest {
IllegalArgumentException exception =
assertThrows(
IllegalArgumentException.class,
- () -> DatastreamResourceManager.builder(PROJECT_ID, ""));
+ () -> DatastreamResourceManager.builder(PROJECT_ID, "", null));
assertThat(exception).hasMessageThat().contains("location can not be null
or empty");
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerIT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerIT.java
index 2a98cd7bf22..8cbb13b95f6 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerIT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerIT.java
@@ -43,10 +43,7 @@ public class KMSResourceManagerIT extends GCPBaseIT {
@Before
public void setUp() throws IOException {
kmsResourceManager =
- KMSResourceManager.builder(PROJECT)
- .setCredentialsProvider(credentialsProvider)
- .setRegion(KMS_REGION)
- .build();
+ KMSResourceManager.builder(PROJECT,
credentialsProvider).setRegion(KMS_REGION).build();
}
@Test
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerTest.java
index 891d44fee1d..b8b90fd1938 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/kms/KMSResourceManagerTest.java
@@ -71,7 +71,7 @@ public class KMSResourceManagerTest {
public void setUp() throws IOException {
testManager =
new KMSResourceManager(
- kmsClientFactory,
KMSResourceManager.builder(PROJECT_ID).setRegion(REGION));
+ kmsClientFactory, KMSResourceManager.builder(PROJECT_ID,
null).setRegion(REGION));
}
@Test
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManagerTest.java
index dff0f011b3b..3df8ceb49f6 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/pubsub/PubsubResourceManagerTest.java
@@ -101,7 +101,8 @@ public final class PubsubResourceManagerTest {
public void testBuilderWithInvalidProjectShouldFail() {
IllegalArgumentException exception =
assertThrows(
- IllegalArgumentException.class, () ->
PubsubResourceManager.builder("test-a", ""));
+ IllegalArgumentException.class,
+ () -> PubsubResourceManager.builder("test-a", "", null));
assertThat(exception).hasMessageThat().contains("projectId can not be
empty");
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManagerTest.java
index 6ca9f86b73f..507d53ba327 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/secretmanager/SecretManagerResourceManagerTest.java
@@ -67,7 +67,7 @@ public final class SecretManagerResourceManagerTest {
IllegalArgumentException exception =
assertThrows(
- IllegalArgumentException.class, () ->
SecretManagerResourceManager.builder(""));
+ IllegalArgumentException.class, () ->
SecretManagerResourceManager.builder("", null));
assertThat(exception).hasMessageThat().contains("projectId can not be
empty");
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
index 96dc965d34e..d0da5138780 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
@@ -119,8 +119,7 @@ public class FileBasedIOLT extends IOLoadTestBase {
@BeforeClass
public static void beforeClass() throws IOException {
resourceManager =
- GcsResourceManager.builder(TestProperties.artifactBucket(), "textiolt")
- .setCredentials(CREDENTIALS)
+ GcsResourceManager.builder(TestProperties.artifactBucket(),
"textiolt", CREDENTIALS)
.build();
}
diff --git
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/GcsResourceManagerTest.java
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/GcsResourceManagerTest.java
index b8ef4e8dd2b..b14d64c4767 100644
---
a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/GcsResourceManagerTest.java
+++
b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/GcsResourceManagerTest.java
@@ -107,13 +107,14 @@ public final class GcsResourceManagerTest {
@Test
public void testBuilderWithEmptyBucket() {
assertThrows(
- IllegalArgumentException.class, () -> GcsResourceManager.builder("",
TEST_CLASS).build());
+ IllegalArgumentException.class,
+ () -> GcsResourceManager.builder("", TEST_CLASS, null).build());
}
@Test
public void testBuilderWithEmptyTestClassName() {
assertThrows(
- IllegalArgumentException.class, () ->
GcsResourceManager.builder(BUCKET, "").build());
+ IllegalArgumentException.class, () ->
GcsResourceManager.builder(BUCKET, "", null).build());
}
@Test
