Skip to content

Commit 8a24add

Browse files
authored
fix: align bucket bound hostname url builder consistency (#875)
1 parent 2b3e8f9 commit 8a24add

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

google/cloud/storage/_helpers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ def _bucket_bound_hostname_url(host, scheme=None):
546546
if url_parts.scheme and url_parts.netloc:
547547
return host
548548

549-
return f"{scheme}://{host}/"
549+
return f"{scheme}://{host}"
550550

551551

552552
def _api_core_retry_to_resumable_media_retry(retry, num_retries=None):

google/cloud/storage/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@ def generate_signed_post_policy_v4(
17591759
if virtual_hosted_style:
17601760
url = f"https://{bucket_name}.storage.googleapis.com/"
17611761
elif bucket_bound_hostname:
1762-
url = _bucket_bound_hostname_url(bucket_bound_hostname, scheme)
1762+
url = f"{_bucket_bound_hostname_url(bucket_bound_hostname, scheme)}/"
17631763
else:
17641764
url = f"https://storage.googleapis.com/{bucket_name}/"
17651765

tests/unit/test__helpers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -675,13 +675,13 @@ def _call_fut(self, **args):
675675
return _bucket_bound_hostname_url(**args)
676676

677677
def test_full_hostname(self):
678-
HOST = "scheme://domain.tcl/"
678+
HOST = "scheme://domain.tcl"
679679
self.assertEqual(self._call_fut(host=HOST), HOST)
680680

681681
def test_hostname_and_scheme(self):
682682
HOST = "domain.tcl"
683683
SCHEME = "scheme"
684-
EXPECTED_URL = SCHEME + "://" + HOST + "/"
684+
EXPECTED_URL = SCHEME + "://" + HOST
685685

686686
self.assertEqual(self._call_fut(host=HOST, scheme=SCHEME), EXPECTED_URL)
687687

tests/unit/test_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2572,7 +2572,7 @@ def test_get_signed_policy_v4_bucket_bound_hostname(self):
25722572
bucket_bound_hostname="https://bucket.bound_hostname",
25732573
credentials=_create_signing_credentials(),
25742574
)
2575-
self.assertEqual(policy["url"], "https://bucket.bound_hostname")
2575+
self.assertEqual(policy["url"], "https://bucket.bound_hostname/")
25762576

25772577
def test_get_signed_policy_v4_bucket_bound_hostname_with_scheme(self):
25782578
import datetime

0 commit comments

Comments
 (0)