Skip to content

Commit

Permalink
fix: make channel priming work with batch endpoint (#1600)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
mutianf and gcf-owl-bot[bot] committed Jan 24, 2023
1 parent 31f7942 commit 133c7e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 133c7e5

Please sign in to comment.