---

olavloite · kolea2 · commit 98470d7f3a82 · 2019-03-28T13:52:39.000-04:00
yaml --- r: 26111 b: refs/heads/pubsub-ordering-keys c: 7a9f3fe h: refs/heads/master i: 26109: 6a643ec 26107: c843245 26103: 0e2e8c4 26095: f835fc2 26079: d76235a 26047: 8cf7d3e 25983: e54f41d 25855: 06f1288 25599: a2b55fc
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: e706ba1d72589cb73ca3cdb6fcdf039b42698da6
+refs/heads/pubsub-ordering-keys: 7a9f3fe52a3838ad3b743f8c5664e2f27f8d7b5c
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GceTestEnvConfig.java b/branches/pubsub-ordering-keys/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(
