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.

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

resource/aws_efs_file_system and resource/aws_efs_mount_target: Support for cn-north-1 and cn-northwest-1 #11746

Merged
merged 2 commits into from
Jan 24, 2020

Conversation

fl0ge
Copy link
Contributor

@fl0ge fl0ge commented Jan 24, 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

Release note for CHANGELOG:

resource/aws_efs_file_system and resource/aws_efs_mount_target: Support for cn-north-1 and cn-northwest-1

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestResourceAWSEFSMountTarget_mountTargetDnsNameCn'
=== RUN   TestResourceAWSEFSMountTarget_mountTargetDnsNameCn
--- PASS: TestResourceAWSEFSMountTarget_mountTargetDnsNameCn (0.00s)

@fl0ge fl0ge requested a review from a team January 24, 2020 12:35
@ghost ghost added needs-triage Waiting for first response or review from a maintainer. size/XS Managed by automation to categorize the size of a PR. service/efs Issues and PRs that pertain to the efs service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 24, 2020
@ewbankkit
Copy link
Contributor

@fl0ge Thanks for this.
Instead of having to hard-code amazonaws.com.cn (and amazonaws.com) you should be able to use the dnsSuffix member of the AWSClient structure (added in #5602):
https://github.com/terraform-providers/terraform-provider-aws/blob/4af42a1420ac0b6464de07cc4bc7a0b232094d43/aws/config.go#L381-L384

for example via meta.(*AWSClient).dnsSuffix.

@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. partition/aws-cn Pertains to the aws-cn partition. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 24, 2020
…rt for cn-north-1 and cn-northwest-1 (using AWSClient.dnsSuffix)
@bflad bflad added partition/aws-iso Pertains to the aws-iso partition. partition/aws-iso-b Pertains to the aws-iso-b partition. labels Jan 24, 2020
@fl0ge
Copy link
Contributor Author

fl0ge commented Jan 24, 2020

@ewbankkit Thanks for your feedback
I've modified the PR adding a new commit with the use of dnsSuffix as you mentioned.
I hope it's now better and can be merged soon!

New output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestResourceAWSEFSMountTarget_mountTargetDnsName'
=== RUN   TestResourceAWSEFSMountTarget_mountTargetDnsName
--- PASS: TestResourceAWSEFSMountTarget_mountTargetDnsName (0.00s)

@bflad bflad self-assigned this Jan 24, 2020
@bflad bflad added this to the v2.47.0 milestone Jan 24, 2020
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Looks great, thanks @fl0ge and @ewbankkit 🚀

Output from acceptance testing:

--- PASS: TestAccAWSEFSFileSystem_basic (129.11s)
--- PASS: TestAccAWSEFSFileSystem_disappears (47.50s)
--- PASS: TestAccAWSEFSFileSystem_kmsConfigurationWithoutEncryption (27.34s)
--- PASS: TestAccAWSEFSFileSystem_kmsKey (77.16s)
--- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy (82.54s)
--- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy_removal (57.93s)
--- PASS: TestAccAWSEFSFileSystem_lifecyclePolicy_update (134.72s)
--- PASS: TestAccAWSEFSFileSystem_pagedTags (103.28s)
--- PASS: TestAccAWSEFSFileSystem_ProvisionedThroughputInMibps (93.37s)
--- PASS: TestAccAWSEFSFileSystem_tags (79.55s)
--- PASS: TestAccAWSEFSFileSystem_ThroughputMode (149.82s)

--- PASS: TestAccAWSEFSMountTarget_basic (243.16s)
--- PASS: TestAccAWSEFSMountTarget_disappears (173.77s)

--- PASS: TestAccDataSourceAwsEfsFileSystem_id (203.85s)
--- PASS: TestAccDataSourceAwsEfsFileSystem_name (226.40s)

--- PASS: TestAccDataSourceAwsEfsMountTargetByMountTargetId (221.82s)

@bflad bflad merged commit 605737e into hashicorp:master Jan 24, 2020
bflad added a commit that referenced this pull request Jan 24, 2020
@fl0ge
Copy link
Contributor Author

fl0ge commented Jan 24, 2020

Thanks @bflad for the merge. We'll be able to use v2.47.0 release when it comes out!

@fl0ge fl0ge deleted the resource_aws_efs_china branch January 24, 2020 16:56
bflad added a commit that referenced this pull request Jan 29, 2020
@ghost
Copy link

ghost commented Jan 30, 2020

This has been released in version 2.47.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.
Labels
enhancement Requests to existing resources that expand the functionality or scope. partition/aws-cn Pertains to the aws-cn partition. partition/aws-iso Pertains to the aws-iso partition. partition/aws-iso-b Pertains to the aws-iso-b partition. service/efs Issues and PRs that pertain to the efs service. size/XS 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
Development

Successfully merging this pull request may close these issues.

3 participants