impl(universe_domain): update implementation to reflect testing resul…

…ts (#13530)
googleapis · Jan 31, 2024 · 3f8954c · 3f8954c
1 parent 39fdf04
commit 3f8954c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 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/oauth2_compute_engine_credentials.cc b/google/cloud/internal/oauth2_compute_engine_credentials.cc
@@ -263,9 +263,11 @@ StatusOr<std::string> ComputeEngineCredentials::RetrieveUniverseDomain(
     }
     return AsStatus(std::move(**response));
   }
-  auto metadata = ParseMetadataServerResponse(**response);
-  if (!metadata) return std::move(metadata).status();
-  universe_domain_ = std::move(metadata->universe_domain);
+
+  auto payload =
+      rest_internal::ReadAll((std::move(**response)).ExtractPayload());
+  if (!payload.ok()) return payload.status();
+  universe_domain_ = *std::move(payload);
   return *universe_domain_;
 }
 

diff --git a/google/cloud/internal/oauth2_compute_engine_credentials_test.cc b/google/cloud/internal/oauth2_compute_engine_credentials_test.cc
@@ -430,9 +430,7 @@ auto expected_universe_domain_request = []() {
 };
 
 TEST(ComputeEngineCredentialsTest, UniverseDomainSuccess) {
-  auto const universe_domain_resp = std::string{R"""({
-      "universe_domain": "my-ud.net"
-  })"""};
+  auto const universe_domain_resp = std::string{R"""(my-ud.net)"""};
 
   auto client = std::make_unique<MockRestClient>();
   EXPECT_CALL(*client, Get(_, expected_universe_domain_request()))

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,