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

Jump to bottom

provider: Support AWS C2S/SC2S Regional ARNs in ARN validation #11471

Merged
merged 1 commit into from
Jan 6, 2020
Merged

provider: Support AWS C2S/SC2S Regional ARNs in ARN validation #11471

merged 1 commit into from
Jan 6, 2020

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Jan 3, 2020

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #11444

Release note for CHANGELOG:

* provider: Support AWS C2S/SC2S Regional ARNs in ARN validation

Output from acceptance testing: Handled via unit testing

@bflad bflad added bug Addresses a defect in current functionality. provider Pertains to the provider itself, rather than any interaction with AWS. partition/aws-iso Pertains to the aws-iso partition. partition/aws-iso-b Pertains to the aws-iso-b partition. labels Jan 3, 2020
@bflad bflad requested a review from a team January 3, 2020 17:52
@ghost ghost added size/S Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 3, 2020
@bflad bflad removed the needs-triage Waiting for first response or review from a maintainer. label Jan 3, 2020
@bflad bflad mentioned this pull request Jan 3, 2020
Closed
PatMyron
PatMyron reviewed Jan 4, 2020
View reviewed changes
aws/validators.go
const (
awsAccountIDRegexpPattern = `^(aws|\d{12})$`
awsPartitionRegexpPattern = `^aws(-[a-z]+)*$`
awsRegionRegexpPattern = `^[a-z]{2}(-[a-z]+)+-\d$`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
awsRegionRegexpPattern = `^[a-z]{2}(-[a-z]+)+-\d$`
awsRegionRegexpPattern = `^[a-z]{2}(-[a-z]+)+-\d+$`

could be more future-proof

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@PatMyron indeed, however this would accept invalid values such as us-east-01. It would be more correct to use -[1-9][0-9]*$ as the pattern suffix. Please feel free to submit a follow up pull request on this, if desired, since this is not a current concern with publicly documented region names.

gdavison
gdavison approved these changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@gdavison gdavison left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@bflad bflad added this to the v2.44.0 milestone Jan 6, 2020
@bflad bflad merged commit da68adf into master Jan 6, 2020
@bflad bflad deleted the b-validateArn-regions branch January 6, 2020 19:01
bflad added a commit that referenced this pull request Jan 6, 2020
@bflad
Update CHANGELOG for #11471
7683414
@ewbankkit ewbankkit mentioned this pull request Jan 7, 2020
Closed
@ewbankkit
Copy link
Contributor

@bflad I think this also closes #8307.

@bflad
Copy link
Contributor Author

bflad commented Jan 7, 2020

@ewbankkit thanks!!

@ghost
Copy link

ghost commented Jan 10, 2020

This has been released in version 2.44.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Mar 27, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@PatMyron PatMyron PatMyron left review comments

@gdavison gdavison gdavison approved these changes

Assignees
No one assigned
Labels
bug Addresses a defect in current functionality. partition/aws-iso Pertains to the aws-iso partition. partition/aws-iso-b Pertains to the aws-iso-b partition. provider Pertains to the provider itself, rather than any interaction with AWS. size/S Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v2.44.0
Development

Successfully merging this pull request may close these issues.

func ValidateARN regex check needs to support additional regions
4 participants
@bflad @ewbankkit @gdavison @PatMyron