fix: never use credentials in combination with plain text (#98)

olavloite · web-flow · commit 7eb8d49cd6c3 · 2020-03-13T11:28:25.000+11:00
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
@@ -20,6 +20,7 @@
 import com.google.api.gax.grpc.GrpcInterceptorProvider;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
+import com.google.cloud.NoCredentials;
 import com.google.cloud.ServiceDefaults;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.ServiceRpc;
@@ -518,6 +519,8 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder builder) {
                 return builder.usePlaintext();
               }
             });
+        // As we are using plain text, we should never send any credentials.
+        this.setCredentials(NoCredentials.getInstance());
       }
       return new SpannerOptions(this);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import com.google.api.gax.grpc.GrpcInterceptorProvider;`
`21`	`21`	`import com.google.api.gax.retrying.RetrySettings;`
`22`	`22`	`import com.google.api.gax.rpc.TransportChannelProvider;`
	`23`	`+import com.google.cloud.NoCredentials;`
`23`	`24`	`import com.google.cloud.ServiceDefaults;`
`24`	`25`	`import com.google.cloud.ServiceOptions;`
`25`	`26`	`import com.google.cloud.ServiceRpc;`
`@@ -518,6 +519,8 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder builder) {`
`518`	`519`	`return builder.usePlaintext();`
`519`	`520`	`}`
`520`	`521`	`});`
	`522`	`+ // As we are using plain text, we should never send any credentials.`
	`523`	`+ this.setCredentials(NoCredentials.getInstance());`
`521`	`524`	`}`
`522`	`525`	`return new SpannerOptions(this);`
`523`	`526`	`}`