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

r/cloud9_environment_ec2 - validations + refactor to use finder and waiter packages + sweeper #18560

Merged
merged 7 commits into from
Jan 5, 2022

Conversation

DrFaust92
Copy link
Collaborator

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

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAWSCloud9EnvironmentEc2_'
--- PASS: TestAccAWSCloud9EnvironmentEc2_disappears (219.23s)
--- PASS: TestAccAWSCloud9EnvironmentEc2_basic (280.01s)
--- PASS: TestAccAWSCloud9EnvironmentEc2_tags (352.82s)
--- PASS: TestAccAWSCloud9EnvironmentEc2_allFields (383.01s)

@DrFaust92 DrFaust92 requested a review from a team as a code owner April 3, 2021 06:58
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. service/cloud9 Issues and PRs that pertain to the cloud9 service. service/ec2 Issues and PRs that pertain to the ec2 service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Apr 3, 2021
@DrFaust92 DrFaust92 changed the title r/cloud9_environment_ec2 - validations + refactor to use finder and waiter packages r/cloud9_environment_ec2 - validations + refactor to use finder and waiter packages + sweeper Apr 3, 2021
@DrFaust92 DrFaust92 removed the service/ec2 Issues and PRs that pertain to the ec2 service. label Apr 18, 2021
@github-actions github-actions bot added the service/ec2 Issues and PRs that pertain to the ec2 service. label May 25, 2021
@zhelding
Copy link
Contributor

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

@github-actions github-actions bot added sweeper Pertains to changes to or issues with the sweeper. and removed sweeper Pertains to changes to or issues with the sweeper. labels Nov 25, 2021
@github-actions github-actions bot added the sweeper Pertains to changes to or issues with the sweeper. label Nov 25, 2021
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% make testacc TESTS=TestAccCloud9EnvironmentEC2_ PKG=cloud9
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cloud9/... -v -count 1 -parallel 20 -run='TestAccCloud9EnvironmentEC2_' -timeout 180m
=== RUN   TestAccCloud9EnvironmentEC2_basic
=== PAUSE TestAccCloud9EnvironmentEC2_basic
=== RUN   TestAccCloud9EnvironmentEC2_allFields
=== PAUSE TestAccCloud9EnvironmentEC2_allFields
=== RUN   TestAccCloud9EnvironmentEC2_tags
=== PAUSE TestAccCloud9EnvironmentEC2_tags
=== RUN   TestAccCloud9EnvironmentEC2_disappears
=== PAUSE TestAccCloud9EnvironmentEC2_disappears
=== CONT  TestAccCloud9EnvironmentEC2_basic
=== CONT  TestAccCloud9EnvironmentEC2_allFields
=== CONT  TestAccCloud9EnvironmentEC2_disappears
=== CONT  TestAccCloud9EnvironmentEC2_tags
--- PASS: TestAccCloud9EnvironmentEC2_disappears (168.15s)
--- PASS: TestAccCloud9EnvironmentEC2_basic (194.42s)
--- PASS: TestAccCloud9EnvironmentEC2_tags (215.75s)
--- PASS: TestAccCloud9EnvironmentEC2_allFields (308.22s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cloud9	311.574s

@ewbankkit
Copy link
Contributor

@DrFaust92 Thanks for the contribution 🎉 👏.

@DrFaust92
Copy link
Collaborator Author

@ewbankkit i think i messed up the sweeper here, checking quickly.

@ewbankkit
Copy link
Contributor

@DrFaust92 I also fixed it:

% make sweep SWEEPARGS=-sweep-run=aws_cloud9_environment_ec2 SWEEP=us-east-1,us-east-2,us-west-1,us-west-2
# make sweep SWEEPARGS=-sweep-run=aws_example_thing
WARNING: This will destroy infrastructure. Use only in development accounts.
go test ./internal/sweep -v -tags=sweep -sweep=us-east-1,us-east-2,us-west-1,us-west-2 -sweep-run=aws_cloud9_environment_ec2 -timeout 60m
2022/01/05 10:07:11 [DEBUG] Running Sweepers for region (us-east-1):
2022/01/05 10:07:11 [DEBUG] Running Sweeper (aws_cloud9_environment_ec2) in region (us-east-1)
2022/01/05 10:07:11 [INFO] AWS Auth provider used: "EnvProvider"
2022/01/05 10:07:11 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:12 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:14 [DEBUG] Completed Sweeper (aws_cloud9_environment_ec2) in region (us-east-1) in 3.148965918s
2022/01/05 10:07:14 Completed Sweepers for region (us-east-1) in 3.14921326s
2022/01/05 10:07:14 Sweeper Tests for region (us-east-1) ran successfully:
	- aws_cloud9_environment_ec2
2022/01/05 10:07:14 [DEBUG] Running Sweepers for region (us-east-2):
2022/01/05 10:07:14 [DEBUG] Running Sweeper (aws_cloud9_environment_ec2) in region (us-east-2)
2022/01/05 10:07:14 [INFO] AWS Auth provider used: "EnvProvider"
2022/01/05 10:07:14 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:14 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:15 [DEBUG] Completed Sweeper (aws_cloud9_environment_ec2) in region (us-east-2) in 622.911541ms
2022/01/05 10:07:15 Completed Sweepers for region (us-east-2) in 622.953124ms
2022/01/05 10:07:15 Sweeper Tests for region (us-east-2) ran successfully:
	- aws_cloud9_environment_ec2
2022/01/05 10:07:15 [DEBUG] Running Sweepers for region (us-west-1):
2022/01/05 10:07:15 [DEBUG] Running Sweeper (aws_cloud9_environment_ec2) in region (us-west-1)
2022/01/05 10:07:15 [INFO] AWS Auth provider used: "EnvProvider"
2022/01/05 10:07:15 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:15 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:16 [DEBUG] Completed Sweeper (aws_cloud9_environment_ec2) in region (us-west-1) in 977.456993ms
2022/01/05 10:07:16 Completed Sweepers for region (us-west-1) in 977.485434ms
2022/01/05 10:07:16 Sweeper Tests for region (us-west-1) ran successfully:
	- aws_cloud9_environment_ec2
2022/01/05 10:07:16 [DEBUG] Running Sweepers for region (us-west-2):
2022/01/05 10:07:16 [DEBUG] Running Sweeper (aws_cloud9_environment_ec2) in region (us-west-2)
2022/01/05 10:07:16 [INFO] AWS Auth provider used: "EnvProvider"
2022/01/05 10:07:16 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:16 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2022/01/05 10:07:17 [DEBUG] Completed Sweeper (aws_cloud9_environment_ec2) in region (us-west-2) in 1.057558192s
2022/01/05 10:07:17 Completed Sweepers for region (us-west-2) in 1.057577266s
2022/01/05 10:07:17 Sweeper Tests for region (us-west-2) ran successfully:
	- aws_cloud9_environment_ec2
ok  	github.com/hashicorp/terraform-provider-aws/internal/sweep	14.569s

@ewbankkit ewbankkit merged commit 220f03d into hashicorp:main Jan 5, 2022
@github-actions github-actions bot added this to the v3.71.0 milestone Jan 5, 2022
@github-actions
Copy link

github-actions bot commented Jan 6, 2022

This functionality has been released in v3.71.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. Thank you!

@DrFaust92 DrFaust92 deleted the cloud9_refactor_waiters branch February 12, 2022 12:47
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
service/cloud9 Issues and PRs that pertain to the cloud9 service. service/ec2 Issues and PRs that pertain to the ec2 service. size/XL Managed by automation to categorize the size of a PR. sweeper Pertains to changes to or issues with the sweeper. 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.