---

olavloite · kolea2 · commit d7b9655f5639 · 2019-03-28T13:52:39.000-04:00
yaml --- r: 20943 b: refs/heads/master c: 7a9f3fe h: refs/heads/master i: 20941: 20486e2 20939: 7096006 20935: 9dcd9aa 20927: 6f6b45d
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e706ba1d72589cb73ca3cdb6fcdf039b42698da6
+refs/heads/master: 7a9f3fe52a3838ad3b743f8c5664e2f27f8d7b5c
 refs/heads/gh-pages: e987e2a9ec867bfa17876e1e9ff673a9bc2cc085
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
diff --git a/trunk/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/trunk/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(
