Try autoConfigEmulator=true;usePlainText with the right conditions

This allows the Cloud Spanner Emulator to be used in tests.
GoogleCloudDataproc · Sep 5, 2023 · 79dfb48 · 79dfb48
1 parent 363a860
commit 79dfb48
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerUtils.java b/spark-3.1-spanner-lib/src/main/java/com/google/cloud/spark/spanner/SpannerUtils.java
@@ -70,18 +70,19 @@ public static Connection connectionFromProperties(Map<String, String> properties
 
     String spannerUri =
         String.format(
-            connUriPrefix + "/projects/%s/instances/%s/databases/%s?autoConfigEmulator=%s",
+            connUriPrefix + "/projects/%s/instances/%s/databases/%s?autoConfigEmulator=%s;usePlainText=%s",
             properties.get("projectId"),
             properties.get("instanceId"),
             properties.get("databaseId"),
+            emulatorHost != null,
             emulatorHost != null);
 
     ConnectionOptions.Builder builder = ConnectionOptions.newBuilder().setUri(spannerUri);
     String gcpCredsUrl = properties.get("credentials");
-    if (gcpCredsUrl != null) {
+    if (emulatorHost != null) {
+      builder = builder.setCredentialsUrl(null);
+    } else if (gcpCredsUrl != null) {
       builder = builder.setCredentialsUrl(gcpCredsUrl);
-    } else if (emulatorHost != null) {
-      builder = builder.setCredentialsUrl(NoCredentials.getInstance().toString());
     }
     ConnectionOptions opts = builder.build();
     return opts.getConnection();