fix: make channel priming work with batch endpoint (#1600)

mutianf · gcf-owl-bot[bot] · web-flow · commit 133c7e50a5a8 · 2023-01-24T16:55:20.000-05:00
* fix: make channel priming work with batch endpoint * fix format * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -168,8 +168,8 @@ public static EnhancedBigtableStubSettings finalizeSettings(
     if (settings.isRefreshingChannel()) {
       // Fix the credentials so that they can be shared
       Credentials credentials = null;
-      if (settings.getCredentialsProvider() != null) {
-        credentials = settings.getCredentialsProvider().getCredentials();
+      if (builder.getCredentialsProvider() != null) {
+        credentials = builder.getCredentialsProvider().getCredentials();
       }
       builder.setCredentialsProvider(FixedCredentialsProvider.create(credentials));
 
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/CloudEnv.java
@@ -120,10 +120,7 @@ private CloudEnv(
     this.kmsKeyName = kmsKeyName;
 
     this.dataSettings =
-        BigtableDataSettings.newBuilder()
-            .setProjectId(projectId)
-            .setInstanceId(instanceId)
-            .setRefreshingChannel(false);
+        BigtableDataSettings.newBuilder().setProjectId(projectId).setInstanceId(instanceId);
     if (!Strings.isNullOrEmpty(dataEndpoint)) {
       dataSettings.stubSettings().setEndpoint(dataEndpoint);
     }
