---

olavloite · kolea2 · commit f193d7043cb0 · 2019-03-28T13:52:39.000-04:00
yaml --- r: 26801 b: refs/heads/v4support c: 7a9f3fe h: refs/heads/master i: 26799: 8aefc2b
diff --git a/[refs] b/[refs]
@@ -176,7 +176,7 @@ refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
 refs/heads/mrschmidt-collectiongroup: a6d948bf3731a7e1ce1fcd3db8ab733a3c9b17de
 refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
 refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
-refs/heads/v4support: e706ba1d72589cb73ca3cdb6fcdf039b42698da6
+refs/heads/v4support: 7a9f3fe52a3838ad3b743f8c5664e2f27f8d7b5c
 refs/tags/v0.82.0: 7b9807d5d0a400c757b8905fee768be4c85eba25
 refs/tags/v0.83.0: 370ec5a1131a86b36db8efce4f1a943607de8a60
 refs/tags/v0.84.0: 71e85198495a39f4524afa2669434b5075c17c3d
diff --git a/branches/v4support/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/branches/v4support/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
+import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.spanner.spi.v1.SpannerInterceptorProvider;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
@@ -28,13 +29,16 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Configure TestEnv based on configuration provided. */
 public class GceTestEnvConfig implements TestEnvConfig {
   public static final String GCE_PROJECT_ID = "spanner.gce.config.project_id";
   public static final String GCE_SERVER_URL = "spanner.gce.config.server_url";
+  public static final String GCE_CREDENTIALS_FILE = "spanner.gce.config.credentials_file";
   public static final String GCE_STREAM_BROKEN_PROBABILITY =
       "spanner.gce.config.stream_broken_probability";
 
@@ -43,6 +47,7 @@ public class GceTestEnvConfig implements TestEnvConfig {
   public GceTestEnvConfig() {
     String projectId = System.getProperty(GCE_PROJECT_ID, "");
     String serverUrl = System.getProperty(GCE_SERVER_URL, "");
+    String credentialsFile = System.getProperty(GCE_CREDENTIALS_FILE, "");
     double errorProbability =
         Double.parseDouble(System.getProperty(GCE_STREAM_BROKEN_PROBABILITY, "0.0"));
     checkState(errorProbability <= 1.0);
@@ -53,6 +58,13 @@ public GceTestEnvConfig() {
     if (!serverUrl.isEmpty()) {
       builder.setHost(serverUrl);
     }
+    if (!credentialsFile.isEmpty()) {
+      try {
+        builder.setCredentials(GoogleCredentials.fromStream(new FileInputStream(credentialsFile)));
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
     options =
         builder
             .setInterceptorProvider(
