Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion google/cloud/bigtable/internal/defaults.cc
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ Options DefaultOptions(Options opts) {
// Set the specific data endpoints if Direct Path is enabled.
if (IsDirectPath()) {
opts.set<::google::cloud::bigtable_internal::DataEndpointOption>(
"c2p:///bigtable.googleapis.com")
"google-c2p:///bigtable.googleapis.com")
.set<AuthorityOption>("bigtable.googleapis.com");
}

Expand Down
10 changes: 6 additions & 4 deletions google/cloud/bigtable/internal/defaults_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ TEST(EndpointEnvTest, CloudDirectPathEnabled) {
ScopedEnvironment cbt_direct_path("CBT_ENABLE_DIRECTPATH", absl::nullopt);

auto opts = DefaultOptions();
EXPECT_EQ("c2p:///bigtable.googleapis.com",
EXPECT_EQ("google-c2p:///bigtable.googleapis.com",
opts.get<::google::cloud::bigtable_internal::DataEndpointOption>());
EXPECT_EQ("bigtable.googleapis.com", opts.get<AuthorityOption>());
// Admin endpoints are not affected.
Expand All @@ -525,7 +525,7 @@ TEST(EndpointEnvTest, BigtableDirectPathEnabled) {
ScopedEnvironment cbt_direct_path("CBT_ENABLE_DIRECTPATH", "true");

auto opts = DefaultOptions();
EXPECT_EQ("c2p:///bigtable.googleapis.com",
EXPECT_EQ("google-c2p:///bigtable.googleapis.com",
opts.get<::google::cloud::bigtable_internal::DataEndpointOption>());
EXPECT_EQ("bigtable.googleapis.com", opts.get<AuthorityOption>());
// Admin endpoints are not affected.
Expand Down Expand Up @@ -564,7 +564,8 @@ TEST(EndpointEnvTest, CloudDirectPathOverridesUserEndpoints) {

auto opts = DefaultDataOptions(
Options{}.set<EndpointOption>("ignored").set<AuthorityOption>("ignored"));
EXPECT_EQ("c2p:///bigtable.googleapis.com", opts.get<EndpointOption>());
EXPECT_EQ("google-c2p:///bigtable.googleapis.com",
opts.get<EndpointOption>());
EXPECT_EQ("bigtable.googleapis.com", opts.get<AuthorityOption>());
}

Expand All @@ -574,7 +575,8 @@ TEST(EndpointEnvTest, BigtableDirectPathOverridesUserEndpoints) {

auto opts = DefaultDataOptions(
Options{}.set<EndpointOption>("ignored").set<AuthorityOption>("ignored"));
EXPECT_EQ("c2p:///bigtable.googleapis.com", opts.get<EndpointOption>());
EXPECT_EQ("google-c2p:///bigtable.googleapis.com",
opts.get<EndpointOption>());
EXPECT_EQ("bigtable.googleapis.com", opts.get<AuthorityOption>());
}

Expand Down
Loading