further corrections

googleapis · May 23, 2024 · 568aab6 · 568aab6
1 parent f2210f4
commit 568aab6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/google/cloud/storage/client.cc b/google/cloud/storage/client.cc
@@ -490,11 +490,11 @@ std::string Client::Endpoint() const {
 // But the code is rarely used and not in any critical path.
 std::string Client::EndpointAuthority() const {
   auto endpoint = Endpoint();
-  auto host = absl::string_view(endpoint);
-  if (!absl::ConsumePrefix(&host, "https://")) {
-    absl::ConsumePrefix(&host, "http://");
+  auto endpoint_authority = absl::string_view(endpoint);
+  if (!absl::ConsumePrefix(&endpoint_authority, "https://")) {
+    absl::ConsumePrefix(&endpoint_authority, "http://");
   }
-  return std::string(host);
+  return std::string(endpoint_authority);
 }
 
 namespace internal {

diff --git a/google/cloud/storage/client_sign_policy_document_test.cc b/google/cloud/storage/client_sign_policy_document_test.cc
@@ -266,7 +266,7 @@ TEST(CreateSignedPolicyDocTest, SignV4CustomEndpoint) {
       client.GenerateSignedPostPolicyV4(CreatePolicyDocumentV4ForTest());
 
   ASSERT_STATUS_OK(actual);
-  EXPECT_THAT(actual->url, StartsWith("https://storage.mydomain.com"));
+  EXPECT_THAT(actual->url, StartsWith(custom_endpoint));
 }
 
 }  // namespace

diff --git a/google/cloud/storage/internal/policy_document_request_test.cc b/google/cloud/storage/internal/policy_document_request_test.cc
@@ -158,7 +158,7 @@ TEST(PolicyDocumentV4Request, Url) {
   PolicyDocumentV4 doc;
   doc.bucket = "test-bucket";
   PolicyDocumentV4Request request(doc);
-  auto const custom_endpoint_authority = std::string{"mydomain.com"};
+  auto const custom_endpoint_authority = std::string{"storage.mydomain.com"};
   request.SetEndpointAuthority(custom_endpoint_authority);
   EXPECT_THAT(request.Url(),
               StartsWith("https://" + custom_endpoint_authority));
@@ -167,7 +167,7 @@ TEST(PolicyDocumentV4Request, Url) {
 TEST(PolicyDocumentV4Request, UrlWithVirtualHostName) {
   PolicyDocumentV4 doc;
   doc.bucket = "test-bucket";
-  auto const custom_endpoint_authority = std::string{"mydomain.com"};
+  auto const custom_endpoint_authority = std::string{"storage.mydomain.com"};
   PolicyDocumentV4Request request(doc);
   request.SetOption(VirtualHostname(true));
   request.SetEndpointAuthority(custom_endpoint_authority);

diff --git a/google/cloud/storage/internal/signed_url_requests_test.cc b/google/cloud/storage/internal/signed_url_requests_test.cc
@@ -643,7 +643,7 @@ TEST(V4SignedUrlRequests, BucketBoundHostnameReset) {
 }
 
 TEST(V4SignedUrlRequests, CustomEndpoint) {
-  auto const custom_endpoint_authority = std::string{"mydomain.com"};
+  auto const custom_endpoint_authority = std::string{"storage.mydomain.com"};
   V4SignUrlRequest request("GET", "test-bucket", "test-object",
                            custom_endpoint_authority);
   ASSERT_STATUS_OK(request.Validate());