Skip to content

Commit

Permalink
fix: ECR URI for China regions (aws#3280)
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Rehn committed Sep 23, 2021
1 parent a6dc9bc commit db5e71c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
10 changes: 9 additions & 1 deletion samcli/lib/bootstrap/companion_stack/data_types.py
Expand Up @@ -133,5 +133,13 @@ def output_logical_id(self) -> Optional[str]:
self._output_logical_id = self._function_logical_id[:52] + self._function_md5[:8] + "Out"
return self._output_logical_id

@staticmethod
def get_domain(region: str) -> str:
# https://docs.amazonaws.cn/en_us/aws/latest/userguide/endpoints-Beijing.html
if region.startswith("cn-"):
return "amazonaws.com.cn"
return "amazonaws.com"

def get_repo_uri(self, account_id, region) -> str:
return f"{account_id}.dkr.ecr.{region}.amazonaws.com/{self.physical_id}"
domain = ECRRepo.get_domain(region)
return f"{account_id}.dkr.ecr.{region}.{domain}/{self.physical_id}"
4 changes: 4 additions & 0 deletions tests/unit/lib/bootstrap/companion_stack/test_data_types.py
Expand Up @@ -78,6 +78,10 @@ def test_get_repo_uri(self):
self.ecr_repo.get_repo_uri("12345", "us-west-2"),
"12345.dkr.ecr.us-west-2.amazonaws.com/parentstacknameabcdefgh/functionaqwertyuirepo",
)
self.assertEqual(
self.ecr_repo.get_repo_uri("12345", "cn-north-1"),
"12345.dkr.ecr.cn-north-1.amazonaws.com.cn/parentstacknameabcdefgh/functionaqwertyuirepo",
)

def test_physical_id_cutoff(self):
self.companion_stack_mock.escaped_parent_stack_name = "s" * 128
Expand Down

0 comments on commit db5e71c

Please sign in to comment.