From c6015b76f896965db3a4c579cc620a4e14e0d1be Mon Sep 17 00:00:00 2001 From: Darren Bolduc Date: Wed, 13 Dec 2023 18:21:32 -0500 Subject: [PATCH] fix(bigtable): use FQDN (#13305) --- google/cloud/bigtable/client_options.cc | 6 ++--- google/cloud/bigtable/client_options_test.cc | 22 +++++++++---------- google/cloud/bigtable/internal/defaults.cc | 6 ++--- .../cloud/bigtable/internal/defaults_test.cc | 16 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/google/cloud/bigtable/client_options.cc b/google/cloud/bigtable/client_options.cc index 7bee3a22e4675..d2b751cc105f8 100644 --- a/google/cloud/bigtable/client_options.cc +++ b/google/cloud/bigtable/client_options.cc @@ -50,9 +50,9 @@ ClientOptions::ClientOptions(std::shared_ptr creds) { // This constructor ignores the emulator environment variables, which might be // set by `internal::DefaultOptions()`. - opts_.set("bigtable.googleapis.com"); - opts_.set("bigtableadmin.googleapis.com"); - opts_.set("bigtableadmin.googleapis.com"); + opts_.set("bigtable.googleapis.com."); + opts_.set("bigtableadmin.googleapis.com."); + opts_.set("bigtableadmin.googleapis.com."); } // NOLINTNEXTLINE(readability-identifier-naming) diff --git a/google/cloud/bigtable/client_options_test.cc b/google/cloud/bigtable/client_options_test.cc index 203e55eee151a..9ad1e9e34a799 100644 --- a/google/cloud/bigtable/client_options_test.cc +++ b/google/cloud/bigtable/client_options_test.cc @@ -44,8 +44,8 @@ using ::testing::HasSubstr; TEST(ClientOptionsTest, ClientOptionsDefaultSettings) { ClientOptions client_options; - EXPECT_EQ("bigtable.googleapis.com", client_options.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", client_options.admin_endpoint()); + EXPECT_EQ("bigtable.googleapis.com.", client_options.data_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", client_options.admin_endpoint()); EXPECT_EQ(typeid(grpc::GoogleDefaultCredentials()), typeid(client_options.credentials())); @@ -173,8 +173,8 @@ TEST_F(ClientOptionsDefaultEndpointTest, Default) { TEST_F(ClientOptionsDefaultEndpointTest, WithCredentials) { auto credentials = grpc::GoogleDefaultCredentials(); ClientOptions tested(credentials); - EXPECT_EQ("bigtable.googleapis.com", tested.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", tested.admin_endpoint()); + EXPECT_EQ("bigtable.googleapis.com.", tested.data_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", tested.admin_endpoint()); EXPECT_EQ(credentials.get(), tested.credentials().get()); } @@ -183,9 +183,9 @@ TEST_F(ClientOptionsDefaultEndpointTest, DefaultNoEmulator) { auto credentials = grpc::GoogleDefaultCredentials(); ClientOptions tested(credentials); - EXPECT_EQ("bigtable.googleapis.com", tested.data_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", tested.admin_endpoint()); - EXPECT_EQ("bigtableadmin.googleapis.com", GetInstanceAdminEndpoint(tested)); + EXPECT_EQ("bigtable.googleapis.com.", tested.data_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", tested.admin_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", GetInstanceAdminEndpoint(tested)); } TEST_F(ClientOptionsDefaultEndpointTest, SeparateEmulators) { @@ -201,12 +201,12 @@ TEST_F(ClientOptionsDefaultEndpointTest, SeparateEmulators) { TEST_F(ClientOptionsDefaultEndpointTest, DataNoEnv) { ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtable.googleapis.com", ClientOptions{}.data_endpoint()); + EXPECT_EQ("bigtable.googleapis.com.", ClientOptions{}.data_endpoint()); } TEST_F(ClientOptionsDefaultEndpointTest, AdminNoEnv) { ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtableadmin.googleapis.com", ClientOptions{}.admin_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", ClientOptions{}.admin_endpoint()); } TEST_F(ClientOptionsDefaultEndpointTest, AdminEmulatorOverrides) { @@ -219,12 +219,12 @@ TEST_F(ClientOptionsDefaultEndpointTest, AdminInstanceAdminNoEffect) { ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); ScopedEnvironment bigtable_instance_admin_emulator_host( "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", "127.0.0.1:1234"); - EXPECT_EQ("bigtableadmin.googleapis.com", ClientOptions{}.admin_endpoint()); + EXPECT_EQ("bigtableadmin.googleapis.com.", ClientOptions{}.admin_endpoint()); } TEST_F(ClientOptionsDefaultEndpointTest, InstanceAdminNoEnv) { ScopedEnvironment bigtable_emulator_host("BIGTABLE_EMULATOR_HOST", {}); - EXPECT_EQ("bigtableadmin.googleapis.com", + EXPECT_EQ("bigtableadmin.googleapis.com.", GetInstanceAdminEndpoint(ClientOptions())); } diff --git a/google/cloud/bigtable/internal/defaults.cc b/google/cloud/bigtable/internal/defaults.cc index 3be4d276491dd..fe9134dff73b6 100644 --- a/google/cloud/bigtable/internal/defaults.cc +++ b/google/cloud/bigtable/internal/defaults.cc @@ -168,9 +168,9 @@ Options DefaultOptions(Options opts) { // Fill any missing default values. auto defaults = Options{} - .set("bigtable.googleapis.com") - .set("bigtableadmin.googleapis.com") - .set("bigtableadmin.googleapis.com") + .set("bigtable.googleapis.com.") + .set("bigtableadmin.googleapis.com.") + .set("bigtableadmin.googleapis.com.") .set(emulator ? grpc::InsecureChannelCredentials() : grpc::GoogleDefaultCredentials()) diff --git a/google/cloud/bigtable/internal/defaults_test.cc b/google/cloud/bigtable/internal/defaults_test.cc index 809b3a3734142..82b1033da5287 100644 --- a/google/cloud/bigtable/internal/defaults_test.cc +++ b/google/cloud/bigtable/internal/defaults_test.cc @@ -49,9 +49,9 @@ TEST(OptionsTest, Defaults) { "BIGTABLE_INSTANCE_ADMIN_EMULATOR_HOST", absl::nullopt); auto opts = DefaultOptions(); - EXPECT_EQ("bigtable.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", + EXPECT_EQ("bigtable.googleapis.com.", opts.get()); + EXPECT_EQ("bigtableadmin.googleapis.com.", opts.get()); + EXPECT_EQ("bigtableadmin.googleapis.com.", opts.get()); EXPECT_EQ(typeid(grpc::GoogleDefaultCredentials()), typeid(opts.get())); @@ -230,8 +230,8 @@ TEST(EndpointEnvTest, InstanceEmulatorEnvOnly) { "instance-emulator-host:9000"); auto opts = DefaultOptions(); - EXPECT_EQ("bigtable.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); + EXPECT_EQ("bigtable.googleapis.com.", opts.get()); + EXPECT_EQ("bigtableadmin.googleapis.com.", opts.get()); EXPECT_EQ("instance-emulator-host:9000", opts.get()); } @@ -304,8 +304,8 @@ TEST(EndpointEnvTest, DirectPathEnabled) { opts.get()); EXPECT_EQ("directpath-bigtable.googleapis.com", opts.get()); // Admin endpoints are not affected. - EXPECT_EQ("bigtableadmin.googleapis.com", opts.get()); - EXPECT_EQ("bigtableadmin.googleapis.com", + EXPECT_EQ("bigtableadmin.googleapis.com.", opts.get()); + EXPECT_EQ("bigtableadmin.googleapis.com.", opts.get()); EXPECT_EQ(1, opts.get()); } @@ -316,7 +316,7 @@ TEST(EndpointEnvTest, DirectPathNoMatch) { "bigtable-not,almost-bigtable"); auto opts = DefaultDataOptions(Options{}); - EXPECT_EQ("bigtable.googleapis.com", opts.get()); + EXPECT_EQ("bigtable.googleapis.com.", opts.get()); EXPECT_EQ("bigtable.googleapis.com", opts.get()); }