Feat/support china partition merge #687
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Alexpngal
changed the title
Alexpngal
changed the title
StewartW
reviewed
May 7, 2024
Comment on lines
+11
to
+20
| import os | ||
| from boto3.session import Session | ||
|
|
||
| REGION = os.getenv("AWS_REGION", "us-east-1") | ||
| PARTITION = Session().get_partition_for_region(REGION) | ||
|
|
||
| if PARTITION == "aws-cn": | ||
| from .stubs import stub_iam_cn as stub_iam | ||
| else: | ||
| from .stubs import stub_iam |
There was a problem hiding this comment.
Why are we not just having separate tests for each region here? Adding this logic to the tests doesnt' seem right.
|
|
||
| @fixture | ||
| def iam_client(): | ||
| client = Mock() | ||
| client.get_role_policy.side_effect = ( | ||
| lambda **kwargs: deepcopy(stub_iam.get_role_policy) | ||
| lambda **kwargs: deepcopy(stub_iam.get_role_policy) if PARTITION == "aws-cn" else deepcopy(stub_iam.get_role_policy) |
There was a problem hiding this comment.
This is the same logic each side of the if check here. Is this needed?
| @@ -188,7 +196,10 @@ def test_grant_access_to_kms_keys_new_key_single_resource(iam_client): | |||
| ) | |||
| policy_doc_before = deepcopy(instance.policy_document) | |||
|
|
|||
| new_key_arn = 'arn:aws:kms:eu-west-1:111111111111:key/new_key' | |||
|
|
|||
| test_region = "eu-west-1" if PARTITION == "aws-cn" else "cn-north-1" | |||
There was a problem hiding this comment.
Logic in the tests seems like a red flag. Also "eu-west-1" IF partition == aws-cn seems incorrect
| if region != "cn-north-1": | ||
| return | ||
| else: | ||
| extra_deploy_region = "cn-northwest-1" |
There was a problem hiding this comment.
Should this be statically defined, or supplied by the user?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why?
ADF Support for China Partition
This pull request introduces support for the China partition in the AWS Deployment Framework (ADF). It adds necessary support for the unique requirements and configurations specific to the China region endpoints, base region and core ADF services.
This addition enables users in Beijing region to leverage the full capabilities of ADF tailored to their environment. The changes have been tested to guarantee compatibility with Global and Govcloud.
Any feedback, suggestions, or required adjustments are highly appreciated.
What?
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and
redistribute this contribution, under the terms of your choice.