From ca17eb43121e4d8ce85bc470e8f90c8feb2551e5 Mon Sep 17 00:00:00 2001 From: Kenny Lee Sin Cheong <2530351+kleesc@users.noreply.github.com> Date: Mon, 21 Feb 2022 11:58:26 -0500 Subject: [PATCH] storage: handle cn-north-1 region (PROJQUAY-3082) (#1129) Handle S3 cn-north-1's endpoint, which has a com.cn TLD. --- storage/cloud.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/storage/cloud.py b/storage/cloud.py index 5f83153b4..70effcc7d 100644 --- a/storage/cloud.py +++ b/storage/cloud.py @@ -744,6 +744,9 @@ class S3Storage(_CloudStorage): connect_kwargs["endpoint_url"] = "https://s3.{region}.amazonaws.com".format( region=s3_region ) + # cn-north-1's endpoint has a .com.cn TLD + if s3_region == "cn-north-1": + connect_kwargs["endpoint_url"] = connect_kwargs["endpoint_url"] + ".cn" elif host or endpoint_url: connect_kwargs["endpoint_url"] = endpoint_url or _build_endpoint_url( host, port=port, is_secure=True