Skip to content
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

ARN: Add Support for the aws/aws-managed 'account' special cases #760

Merged
merged 3 commits into from
Apr 5, 2022
Merged

ARN: Add Support for the aws/aws-managed 'account' special cases #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ae7256
ARN: Add Support for the aws/aws-managed 'account' special cases
tremble Mar 30, 2022
8c98cd4
lint
tremble Mar 30, 2022
b84c3f9
update ec2_vol to use module_utils/arn directly rather than via modul…
tremble Mar 31, 2022
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
2 changes: 1 addition & 1 deletion plugins/module_utils/arn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def parse_aws_arn(arn):
The specific formats depend on the resource.
The ARNs for some resources omit the Region, the account ID, or both the Region and the account ID.
"""
m = re.search(r"arn:(aws(-([a-z\-]+))?):([\w-]+):([a-z0-9\-]*):(\d*):(.*)", arn)
m = re.search(r"arn:(aws(-([a-z\-]+))?):([\w-]+):([a-z0-9\-]*):(\d*|aws|aws-managed):(.*)", arn)
if m is None:
return None
result = dict()
Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/ec2_vol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@

import time

from ..module_utils.arn import is_outpost_arn
from ..module_utils.core import AnsibleAWSModule
from ..module_utils.ec2 import camel_dict_to_snake_dict
from ..module_utils.ec2 import boto3_tag_list_to_ansible_dict
from ..module_utils.ec2 import ansible_dict_to_boto3_filter_list
from ..module_utils.ec2 import describe_ec2_tags
from ..module_utils.ec2 import ensure_ec2_tags
from ..module_utils.ec2 import is_outposts_arn
from ..module_utils.ec2 import AWSRetry
from ..module_utils.core import is_boto3_error_code
from ..module_utils.tagging import boto3_tag_specifications
Expand Down Expand Up @@ -502,7 +502,7 @@ def create_volume(module, ec2_conn, zone):
additional_params['MultiAttachEnabled'] = True

if outpost_arn:
if is_outposts_arn(outpost_arn):
if is_outpost_arn(outpost_arn):
additional_params['OutpostArn'] = outpost_arn
else:
module.fail_json('OutpostArn does not match the pattern specified in API specifications.')
Expand Down
45 changes: 32 additions & 13 deletions tests/unit/module_utils/test_arn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,50 @@
("arn:aws:outpost:us east 1:123456789012:outpost/op-1234567890abcdef0"),
("invalid:aws:outpost:us-east-1:123456789012:outpost/op-1234567890abcdef0"),
("arn:junk:outpost:us-east-1:123456789012:outpost/op-1234567890abcdef0"),
("arn:aws:outpost:us-east-1:junk:outpost/op-1234567890abcdef0"),
]

arn_good_values = [
# Play about with partition name in valid ways
dict(partition='aws', service='outpost', region='us-east-1', account_id='123456789012', resource='outpost/op-1234567890abcdef0'),
dict(partition='aws-gov', service='outpost', region='us-gov-east-1', account_id='123456789012', resource='outpost/op-1234567890abcdef0'),
dict(partition='aws-cn', service='outpost', region='us-east-1', account_id='123456789012', resource='outpost/op-1234567890abcdef0'),
dict(partition='aws', service='outpost', region='us-east-1', account_id='123456789012',
resource='outpost/op-1234567890abcdef0'),
dict(partition='aws-gov', service='outpost', region='us-gov-east-1', account_id='123456789012',
resource='outpost/op-1234567890abcdef0'),
dict(partition='aws-cn', service='outpost', region='us-east-1', account_id='123456789012',
resource='outpost/op-1234567890abcdef0'),
# Start the account ID with 0s, it's a 12 digit *string*, if someone treats
# it as an integer the leading 0s can disappear.
dict(partition='aws-cn', service='outpost', region='us-east-1', account_id='000123000123', resource='outpost/op-1234567890abcdef0'),
dict(partition='aws-cn', service='outpost', region='us-east-1', account_id='000123000123',
resource='outpost/op-1234567890abcdef0'),
# S3 doesn't "need" region/account_id as bucket names are globally unique
dict(partition='aws', service='s3', region='', account_id='', resource='bucket/object'),
# IAM is a 'global' service, so the ARNs don't have regions
dict(partition='aws', service='iam', region='', account_id='123456789012', resource='policy/foo/bar/PolicyName'),
dict(partition='aws', service='iam', region='', account_id='123456789012', resource='instance-profile/ExampleProfile'),
dict(partition='aws', service='iam', region='', account_id='123456789012',
resource='policy/foo/bar/PolicyName'),
dict(partition='aws', service='iam', region='', account_id='123456789012',
resource='instance-profile/ExampleProfile'),
dict(partition='aws', service='iam', region='', account_id='123456789012', resource='root'),
# Some examples with different regions
dict(partition='aws', service='sqs', region='eu-west-3', account_id='123456789012', resource='example-queue'),
dict(partition='aws', service='sqs', region='us-gov-east-1', account_id='123456789012', resource='example-queue'),
dict(partition='aws', service='sqs', region='sa-east-1', account_id='123456789012', resource='example-queue'),
dict(partition='aws', service='sqs', region='ap-northeast-2', account_id='123456789012', resource='example-queue'),
dict(partition='aws', service='sqs', region='ca-central-1', account_id='123456789012', resource='example-queue'),
dict(partition='aws', service='sqs', region='eu-west-3', account_id='123456789012',
resource='example-queue'),
dict(partition='aws', service='sqs', region='us-gov-east-1', account_id='123456789012',
resource='example-queue'),
dict(partition='aws', service='sqs', region='sa-east-1', account_id='123456789012',
resource='example-queue'),
dict(partition='aws', service='sqs', region='ap-northeast-2', account_id='123456789012',
resource='example-queue'),
dict(partition='aws', service='sqs', region='ca-central-1', account_id='123456789012',
resource='example-queue'),
# Some more unusual service names
dict(partition='aws', service='network-firewall', region='us-east-1', account_id='123456789012', resource='stateful-rulegroup/ExampleDomainList'),
dict(partition='aws', service='resource-groups', region='us-east-1', account_id='123456789012', resource='group/group-name'),
dict(partition='aws', service='network-firewall', region='us-east-1', account_id='123456789012',
resource='stateful-rulegroup/ExampleDomainList'),
dict(partition='aws', service='resource-groups', region='us-east-1', account_id='123456789012',
resource='group/group-name'),
# A special case for resources AWS curate
dict(partition='aws', service='network-firewall', region='us-east-1', account_id='aws-managed',
resource='stateful-rulegroup/BotNetCommandAndControlDomainsActionOrder'),
dict(partition='aws', service='iam', region='', account_id='aws',
resource='policy/AWSDirectConnectReadOnlyAccess'),
]


Expand Down