From 568aab69ed4d69688bbfaedf9100123f78e307ee Mon Sep 17 00:00:00 2001 From: bajajnehaa Date: Thu, 23 May 2024 10:57:02 +0000 Subject: [PATCH] further corrections --- google/cloud/storage/client.cc | 8 ++++---- google/cloud/storage/client_sign_policy_document_test.cc | 2 +- .../storage/internal/policy_document_request_test.cc | 4 ++-- google/cloud/storage/internal/signed_url_requests_test.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/google/cloud/storage/client.cc b/google/cloud/storage/client.cc index b2c54c0bfc4ab..25e4271f8a35c 100644 --- 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 index 7d3ebe2a9b130..a12b89d006911 100644 --- 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 index aa7fd11d35b8e..48d126f155395 100644 --- 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 index c8e5f578071d3..22b04c822efbb 100644 --- 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());