Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-emr-20663.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "emr",
"description": "Fixed the ARN partition suffix returned by ``get_policy_arn_suffix`` for AWS ISO (``aws-iso``, ``aws-iso-b``, ``aws-iso-e``, ``aws-iso-f``) and European Sovereign Cloud (``aws-eusc``) regions, so ``emr create-default-roles``, ``dlm create-default-role`` and ``emr-containers update-role-trust-policy`` build valid IAM policy ARNs in those partitions instead of defaulting to ``aws``."
}
12 changes: 12 additions & 0 deletions awscli/customizations/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -226,5 +226,17 @@ def get_policy_arn_suffix(region):
return "aws-cn"
elif region_string.startswith("us-gov"):
return "aws-us-gov"
# The isob/isof prefixes must be checked before the more general "us-iso"
# prefix, since "us-isob-east-1" also starts with "us-iso".
elif region_string.startswith("us-isob"):
return "aws-iso-b"
elif region_string.startswith("us-isof"):
return "aws-iso-f"
elif region_string.startswith("us-iso"):
return "aws-iso"
elif region_string.startswith("eu-isoe"):
return "aws-iso-e"
elif region_string.startswith("eusc-"):
return "aws-eusc"
else:
return "aws"
15 changes: 15 additions & 0 deletions tests/unit/customizations/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,18 @@ 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-iso", utils.get_policy_arn_suffix("us-iso-east-1")
)
self.assertEqual(
"aws-iso-b", utils.get_policy_arn_suffix("us-isob-east-1")
)
self.assertEqual(
"aws-iso-e", utils.get_policy_arn_suffix("eu-isoe-west-1")
)
self.assertEqual(
"aws-iso-f", utils.get_policy_arn_suffix("us-isof-south-1")
)
self.assertEqual(
"aws-eusc", utils.get_policy_arn_suffix("eusc-de-east-1")
)