fix(common): use FQDN for the metadata service (#13139)

googleapis · Nov 15, 2023 · a6cdcdb · a6cdcdb
1 parent 04c532a
commit a6cdcdb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/google/cloud/internal/compute_engine_util.cc b/google/cloud/internal/compute_engine_util.cc
@@ -25,7 +25,7 @@ std::string GceMetadataScheme() { return "http"; }
 
 std::string GceMetadataHostname() {
   return google::cloud::internal::GetEnv(GceMetadataHostnameEnvVar())
-      .value_or("metadata.google.internal");
+      .value_or("metadata.google.internal.");
 }
 
 }  // namespace internal

diff --git a/google/cloud/internal/compute_engine_util_test.cc b/google/cloud/internal/compute_engine_util_test.cc
@@ -33,7 +33,7 @@ TEST(ComputeEngineUtilTest, CanOverrideGceMetadataHostname) {
   // If not overridden for testing, we should get the actual hostname.
   google::cloud::testing_util::ScopedEnvironment gce_metadata_hostname_unset(
       GceMetadataHostnameEnvVar(), {});
-  EXPECT_EQ(std::string("metadata.google.internal"), GceMetadataHostname());
+  EXPECT_EQ(std::string("metadata.google.internal."), GceMetadataHostname());
 }
 
 }  // namespace

diff --git a/google/cloud/internal/unified_rest_credentials_test.cc b/google/cloud/internal/unified_rest_credentials_test.cc
@@ -245,7 +245,7 @@ TEST(UnifiedRestCredentialsTest, AdcIsComputeEngine) {
     auto client = std::make_unique<MockRestClient>();
     auto expected_request = AllOf(
         Property(&RestRequest::path,
-                 absl::StrCat("http://metadata.google.internal/",
+                 absl::StrCat("http://metadata.google.internal./",
                               "computeMetadata/v1/instance/service-accounts/",
                               "default/")),
         Property(&RestRequest::headers,
@@ -259,7 +259,7 @@ TEST(UnifiedRestCredentialsTest, AdcIsComputeEngine) {
     auto client = std::make_unique<MockRestClient>();
     auto expected_request = AllOf(
         Property(&RestRequest::path,
-                 absl::StrCat("http://metadata.google.internal/",
+                 absl::StrCat("http://metadata.google.internal./",
                               "computeMetadata/v1/instance/service-accounts/",
                               "default/", "token")),
         Property(&RestRequest::headers,

diff --git a/google/cloud/storage/internal/compute_engine_util.cc b/google/cloud/storage/internal/compute_engine_util.cc
@@ -24,7 +24,7 @@ namespace internal {
 
 std::string GceMetadataHostname() {
   return google::cloud::internal::GetEnv(GceMetadataHostnameEnvVar())
-      .value_or("metadata.google.internal");
+      .value_or("metadata.google.internal.");
 }
 
 }  // namespace internal

diff --git a/google/cloud/storage/internal/compute_engine_util_test.cc b/google/cloud/storage/internal/compute_engine_util_test.cc
@@ -41,7 +41,7 @@ TEST_F(ComputeEngineUtilTest, CanOverrideGceMetadataHostname) {
   // If not overridden for testing, we should get the actual hostname.
   google::cloud::testing_util::ScopedEnvironment gce_metadata_hostname_unset(
       GceMetadataHostnameEnvVar(), {});
-  EXPECT_EQ(std::string("metadata.google.internal"), GceMetadataHostname());
+  EXPECT_EQ(std::string("metadata.google.internal."), GceMetadataHostname());
 }
 
 }  // namespace