Skip to content

updating customizations/utils #9817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
varungovinda wants to merge 4 commits into
base: v2
Choose a base branch
from
+13 −7
Open

updating customizations/utils #9817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9071e49
updating customizations/utils
varungovinda Oct 27, 2025
4971af5
refactor
varungovinda Oct 31, 2025
6d05f5b
Add changelog entry
AndrewAsseily Nov 4, 2025
637de17
Remove unnecessary blank line in utils.py
AndrewAsseily Nov 6, 2025
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-DLMEMR-99146.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "DLM, EMR",
Copy link
Contributor

@aemous aemous Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we don't have existing changelog entries in this format with two entities separated by a comma. may be worth considering using a single more generic category that captures both.

"description": "Dynamically load AWS partition information using partitions.json instead of hardcoded region mappings. Affects ``dlm create-default-role``, ``emr create-default-roles``, ``emr-containers create-role-associations``, and ``emr-containers update-role-trust-policy`` commands."
}
14 changes: 7 additions & 7 deletions awscli/customizations/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import xml

from botocore.exceptions import ClientError
from botocore.loaders import Loader
from botocore.endpoint_provider import RuleSetStandardLibary

from awscli.customizations.exceptions import ParamValidationError

Expand Down Expand Up @@ -207,13 +209,11 @@ 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()
partitions_data = loader.load_data('partitions')
rule_lib = RuleSetStandardLibary(partitions_data)
partition_result = rule_lib.aws_partition(region.lower())
return partition_result['name']


def get_shape_doc_overview(shape):
Expand Down
1 change: 1 addition & 0 deletions tests/unit/customizations/test_utils.py
View file
Open in desktop
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