address comments

googleapis · Sep 15, 2021 · 808e10f · 808e10f
1 parent 752b460
commit 808e10f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java
@@ -213,7 +213,7 @@ public static ClientContext create(StubSettings settings) throws IOException {
     if (transportChannelProvider.needsHeaders()) {
       transportChannelProvider = transportChannelProvider.withHeaders(headers);
     }
-    if (!hasApiKey && transportChannelProvider.needsCredentials() && credentials != null) {
+    if (!hasApiKey && transportChannelProvider.needsCredentials()) {
       transportChannelProvider = transportChannelProvider.withCredentials(credentials);
     }
     String endpoint =

diff --git a/gax/src/test/java/com/google/api/gax/rpc/ClientContextTest.java b/gax/src/test/java/com/google/api/gax/rpc/ClientContextTest.java
@@ -178,7 +178,7 @@ public TransportChannelProvider withPoolSize(int size) {
 
     @Override
     public TransportChannel getTransportChannel() throws IOException {
-      if (needsCredentials()) {
+      if (needsCredentials() && !headers.containsKey("x-goog-api-key")) {
         throw new IllegalStateException("Needs Credentials");
       }
       transport.setExecutor(executor);
@@ -192,7 +192,7 @@ public String getTransportName() {
 
     @Override
     public boolean needsCredentials() {
-      return credentials == null && !headers.containsKey("x-goog-api-key");
+      return credentials == null;
     }
 
     @Override