Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions awscli/customizations/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import sys
import xml

from botocore.exceptions import ClientError
from botocore.exceptions import ClientError, UnknownRegionError
from botocore.loaders import Loader
from botocore.regions import EndpointResolver

from awscli.customizations.exceptions import ParamValidationError

Expand Down Expand Up @@ -208,12 +210,15 @@ def uni_print(statement, out_file=None):
def get_policy_arn_suffix(region):
"""Method to return region value as expected by policy arn"""
region_string = region.lower()
if region_string.startswith("cn-"):
return "aws-cn"
elif region_string.startswith("us-gov"):
return "aws-us-gov"
else:
return "aws"
loader = Loader()
endpoints_data = loader.load_data('endpoints')
resolver = EndpointResolver(endpoints_data)

try:
return resolver.get_partition_for_region(region_string)
except UnknownRegionError:
# Fallback to 'aws' if region is not found
return 'aws'


def get_shape_doc_overview(shape):
Expand Down
1 change: 1 addition & 0 deletions tests/unit/customizations/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ def test_get_policy_arn_suffix(self):
self.assertEqual("aws", utils.get_policy_arn_suffix("us-east-1"))
self.assertEqual("aws", utils.get_policy_arn_suffix("sa-east-1"))
self.assertEqual("aws", utils.get_policy_arn_suffix("ap-south-1"))
self.assertEqual("aws-eusc", utils.get_policy_arn_suffix("eusc-de-east-1"))


class TestGetShapeDocOverview(unittest.TestCase):
Expand Down
Loading