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

Clean up uses of aws-sdk-go-base/v2/awsv1shim/v2/tfawserr #39147

Merged
merged 5 commits into from
Sep 4, 2024

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Sep 4, 2024

Description

With the near completion of the migration to AWS SDK for Go v2 (#32976), cleanup any errant uses of aws-sdk-go-base/v2/awsv1shim/v2/tfawserr (which checks only AWS SDK for Go v1 errors).

Output from Acceptance Testing

% SWEEPERS=aws_mwaa_environment make sweep
# make sweep SWEEPARGS=-sweep-run=aws_example_thing
# set SWEEPARGS=-sweep-allow-failures to continue after first failure
WARNING: This will destroy infrastructure. Use only in development accounts.
go1.23.0 test ./internal/sweep -v -sweep=us-west-2,us-east-1,us-east-2,us-west-1 -sweep-run='aws_mwaa_environment' -timeout 360m
2024/09/04 15:35:05 [DEBUG] Running Sweepers for region (us-west-2):
2024/09/04 15:35:05 [DEBUG] Running Sweeper (aws_mwaa_environment) in region (us-west-2)
2024/09/04 15:35:05 [DEBUG] sweeper: Configuring Terraform AWS Provider: sweeper_region=us-west-2
2024-09-04T15:35:05.404-0400 [DEBUG] sweeper.aws-base: Resolving credentials provider: sweeper_region=us-west-2
2024-09-04T15:35:05.405-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-west-2
2024-09-04T15:35:05.405-0400 [DEBUG] sweeper.aws-base: Retrieving credentials: sweeper_region=us-west-2
2024-09-04T15:35:05.405-0400 [INFO]  sweeper.aws-base: Retrieved credentials: sweeper_region=us-west-2 tf_aws.credentials_source=EnvConfigCredentials
2024-09-04T15:35:05.405-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-west-2
2024/09/04 15:35:05 [DEBUG] sweeper: Creating AWS SDK v1 session: sweeper_region=us-west-2
2024/09/04 15:35:05 [DEBUG] sweeper: Retrieving AWS account details: sweeper_region=us-west-2
2024-09-04T15:35:05.405-0400 [DEBUG] sweeper.aws-base: Retrieving caller identity from STS: sweeper_region=us-west-2
2024-09-04T15:35:05.799-0400 [INFO]  sweeper.aws-base: Retrieved caller identity from STS: sweeper_region=us-west-2
2024/09/04 15:35:06 [INFO]  sweeper: No resources to sweep: sweeper_region=us-west-2
2024/09/04 15:35:06 [DEBUG] Completed Sweeper (aws_mwaa_environment) in region (us-west-2) in 910.904542ms
2024/09/04 15:35:06 Completed Sweepers for region (us-west-2) in 911.083583ms
2024/09/04 15:35:06 Sweeper Tests for region (us-west-2) ran successfully:
2024/09/04 15:35:06 	- aws_mwaa_environment
2024/09/04 15:35:06 [DEBUG] Running Sweepers for region (us-east-1):
2024/09/04 15:35:06 [DEBUG] Running Sweeper (aws_mwaa_environment) in region (us-east-1)
2024/09/04 15:35:06 [DEBUG] sweeper: Configuring Terraform AWS Provider: sweeper_region=us-east-1
2024-09-04T15:35:06.315-0400 [DEBUG] sweeper.aws-base: Resolving credentials provider: sweeper_region=us-east-1
2024-09-04T15:35:06.315-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-east-1
2024-09-04T15:35:06.315-0400 [DEBUG] sweeper.aws-base: Retrieving credentials: sweeper_region=us-east-1
2024-09-04T15:35:06.316-0400 [INFO]  sweeper.aws-base: Retrieved credentials: sweeper_region=us-east-1 tf_aws.credentials_source=EnvConfigCredentials
2024-09-04T15:35:06.316-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-east-1
2024/09/04 15:35:06 [DEBUG] sweeper: Creating AWS SDK v1 session: sweeper_region=us-east-1
2024/09/04 15:35:06 [DEBUG] sweeper: Retrieving AWS account details: sweeper_region=us-east-1
2024-09-04T15:35:06.316-0400 [DEBUG] sweeper.aws-base: Retrieving caller identity from STS: sweeper_region=us-east-1
2024-09-04T15:35:06.440-0400 [INFO]  sweeper.aws-base: Retrieved caller identity from STS: sweeper_region=us-east-1
2024/09/04 15:35:06 [INFO]  sweeper: No resources to sweep: sweeper_region=us-east-1
2024/09/04 15:35:06 [DEBUG] Completed Sweeper (aws_mwaa_environment) in region (us-east-1) in 277.47925ms
2024/09/04 15:35:06 Completed Sweepers for region (us-east-1) in 277.50975ms
2024/09/04 15:35:06 Sweeper Tests for region (us-east-1) ran successfully:
2024/09/04 15:35:06 	- aws_mwaa_environment
2024/09/04 15:35:06 [DEBUG] Running Sweepers for region (us-east-2):
2024/09/04 15:35:06 [DEBUG] Running Sweeper (aws_mwaa_environment) in region (us-east-2)
2024/09/04 15:35:06 [DEBUG] sweeper: Configuring Terraform AWS Provider: sweeper_region=us-east-2
2024-09-04T15:35:06.593-0400 [DEBUG] sweeper.aws-base: Resolving credentials provider: sweeper_region=us-east-2
2024-09-04T15:35:06.593-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-east-2
2024-09-04T15:35:06.593-0400 [DEBUG] sweeper.aws-base: Retrieving credentials: sweeper_region=us-east-2
2024-09-04T15:35:06.593-0400 [INFO]  sweeper.aws-base: Retrieved credentials: tf_aws.credentials_source=EnvConfigCredentials sweeper_region=us-east-2
2024-09-04T15:35:06.593-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-east-2
2024/09/04 15:35:06 [DEBUG] sweeper: Creating AWS SDK v1 session: sweeper_region=us-east-2
2024/09/04 15:35:06 [DEBUG] sweeper: Retrieving AWS account details: sweeper_region=us-east-2
2024-09-04T15:35:06.594-0400 [DEBUG] sweeper.aws-base: Retrieving caller identity from STS: sweeper_region=us-east-2
2024-09-04T15:35:06.773-0400 [INFO]  sweeper.aws-base: Retrieved caller identity from STS: sweeper_region=us-east-2
2024/09/04 15:35:07 [INFO]  sweeper: No resources to sweep: sweeper_region=us-east-2
2024/09/04 15:35:07 [DEBUG] Completed Sweeper (aws_mwaa_environment) in region (us-east-2) in 557.609834ms
2024/09/04 15:35:07 Completed Sweepers for region (us-east-2) in 557.731375ms
2024/09/04 15:35:07 Sweeper Tests for region (us-east-2) ran successfully:
2024/09/04 15:35:07 	- aws_mwaa_environment
2024/09/04 15:35:07 [DEBUG] Running Sweepers for region (us-west-1):
2024/09/04 15:35:07 [DEBUG] Running Sweeper (aws_mwaa_environment) in region (us-west-1)
2024/09/04 15:35:07 [DEBUG] sweeper: Configuring Terraform AWS Provider: sweeper_region=us-west-1
2024-09-04T15:35:07.151-0400 [DEBUG] sweeper.aws-base: Resolving credentials provider: sweeper_region=us-west-1
2024-09-04T15:35:07.151-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-west-1
2024-09-04T15:35:07.151-0400 [DEBUG] sweeper.aws-base: Retrieving credentials: sweeper_region=us-west-1
2024-09-04T15:35:07.151-0400 [INFO]  sweeper.aws-base: Retrieved credentials: sweeper_region=us-west-1 tf_aws.credentials_source=EnvConfigCredentials
2024-09-04T15:35:07.151-0400 [DEBUG] sweeper.aws-base: Loading configuration: sweeper_region=us-west-1
2024/09/04 15:35:07 [DEBUG] sweeper: Creating AWS SDK v1 session: sweeper_region=us-west-1
2024/09/04 15:35:07 [DEBUG] sweeper: Retrieving AWS account details: sweeper_region=us-west-1
2024-09-04T15:35:07.152-0400 [DEBUG] sweeper.aws-base: Retrieving caller identity from STS: sweeper_region=us-west-1
2024-09-04T15:35:07.528-0400 [INFO]  sweeper.aws-base: Retrieved caller identity from STS: sweeper_region=us-west-1
2024/09/04 15:35:07 [INFO]  sweeper: No resources to sweep: sweeper_region=us-west-1
2024/09/04 15:35:07 [DEBUG] Completed Sweeper (aws_mwaa_environment) in region (us-west-1) in 830.39925ms
2024/09/04 15:35:07 Completed Sweepers for region (us-west-1) in 830.483542ms
2024/09/04 15:35:07 Sweeper Tests for region (us-west-1) ran successfully:
2024/09/04 15:35:07 	- aws_mwaa_environment
ok  	github.com/hashicorp/terraform-provider-aws/internal/sweep	7.583s

@ewbankkit ewbankkit requested a review from a team as a code owner September 4, 2024 19:32
@ewbankkit ewbankkit added the technical-debt Addresses areas of the codebase that need refactoring or redesign. label Sep 4, 2024
Copy link

github-actions bot commented Sep 4, 2024

Community Note

Voting for Prioritization

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

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/dax Issues and PRs that pertain to the dax service. service/mwaa Issues and PRs that pertain to the mwaa service. sweeper Pertains to changes to or issues with the sweeper. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. labels Sep 4, 2024
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.

Looks good! 🚀

@ewbankkit ewbankkit added the aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. label Sep 4, 2024
@github-actions github-actions bot added the generators Relates to code generators. label Sep 4, 2024
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@ewbankkit ewbankkit merged commit cce2d11 into main Sep 4, 2024
46 checks passed
@ewbankkit ewbankkit deleted the td-cleanup-awsv1shim/v2/tfawserr branch September 4, 2024 20:24
@github-actions github-actions bot added this to the v5.66.0 milestone Sep 4, 2024
terraform-aws-provider bot pushed a commit that referenced this pull request Sep 4, 2024
Copy link

github-actions bot commented Sep 5, 2024

This functionality has been released in v5.66.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!

@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 5, 2024
Copy link

github-actions bot commented Oct 7, 2024

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 Oct 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
aws-sdk-go-migration Issues that are related to the providers migration to AWS SDK for Go v2. generators Relates to code generators. service/dax Issues and PRs that pertain to the dax service. service/mwaa Issues and PRs that pertain to the mwaa service. sweeper Pertains to changes to or issues with the sweeper. technical-debt Addresses areas of the codebase that need refactoring or redesign. 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