Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bigtable] Added HeaderProvider onto ClientContext#create settings #4491

Merged
merged 2 commits into from
Feb 14, 2019
Merged

[Bigtable] Added HeaderProvider onto ClientContext#create settings #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a0a07c
Added HeaderProvider onto ClientContext#create settings
rahulKQL Feb 14, 2019
9e53eff
fixed formatting
rahulKQL Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public static EnhancedBigtableStub create(EnhancedBigtableStubSettings settings)
.setTransportChannelProvider(settings.getTransportChannelProvider())
.setEndpoint(settings.getEndpoint())
.setCredentialsProvider(settings.getCredentialsProvider())
.setHeaderProvider(settings.getHeaderProvider())
.setStreamWatchdogProvider(settings.getStreamWatchdogProvider())
.setStreamWatchdogCheckInterval(settings.getStreamWatchdogCheckInterval());

Expand Down
9 changes: 9 additions & 0 deletions ...oud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import com.google.api.gax.core.NoCredentialsProvider;
import com.google.api.gax.grpc.testing.InProcessServer;
import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.api.gax.rpc.FixedHeaderProvider;
import com.google.api.gax.rpc.HeaderProvider;
import com.google.bigtable.v2.BigtableGrpc;
import com.google.cloud.bigtable.data.v2.BigtableDataClient;
import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
Expand Down Expand Up @@ -48,6 +50,9 @@ public class ResourceHeaderTest {
private static final Pattern EXPECTED_HEADER_PATTERN =
Pattern.compile(".*" + NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID) + ".*");
private static final String HEADER_NAME = "x-goog-request-params";
private static final String TEST_HEADER_NAME = "simple-header-name";
private static final String TEST_HEADER_VALUE = "simple-header-value";
private static final Pattern TEST_PATTERN = Pattern.compile(".*" + TEST_HEADER_VALUE + ".*");

private InProcessServer<?> server;
private LocalChannelProvider channelProvider;
Expand All @@ -59,11 +64,13 @@ public void setUp() throws Exception {
server.start();
channelProvider = LocalChannelProvider.create(NAME);

HeaderProvider headerProvider = FixedHeaderProvider.create(TEST_HEADER_NAME, TEST_HEADER_VALUE);
BigtableDataSettings.Builder settings =
BigtableDataSettings.newBuilder()
.setProjectId(PROJECT_ID)
.setInstanceId(INSTANCE_ID)
.setTransportChannelProvider(channelProvider)
.setHeaderProvider(headerProvider)
.setCredentialsProvider(NoCredentialsProvider.create());

// Force immediate flush
Expand Down Expand Up @@ -132,5 +139,7 @@ public void readModifyWriteTest() {
private void verifyHeaderSent() {
boolean headerSent = channelProvider.isHeaderSent(HEADER_NAME, EXPECTED_HEADER_PATTERN);
assertWithMessage("Header was sent").that(headerSent).isTrue();
boolean testHeader = channelProvider.isHeaderSent(TEST_HEADER_NAME, TEST_PATTERN);
assertWithMessage("HeaderProvider's header received in Channel").that(testHeader).isTrue();
}
}