Skip to content

Technical debt: Replace Plugin SDK retry.RetryContext by tfresource.Retry #44131

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
Merged
merged 60 commits into from
Sep 8, 2025
Merged

Technical debt: Replace Plugin SDK retry.RetryContext by tfresource.Retry #44131

merged 60 commits into from
Sep 8, 2025

Conversation

ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Sep 3, 2025 •
edited
Loading

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Description

Use tfresource.Retry (with the new primitives in internal/retry) instead of Plugin SDK retry.RetryContext.

A final PR in the series will update the Contributor's Guide and semgrep rules.
The bulk updates to the StateChangeConf mechanism required for go-vcr enablement will be tracked via #43717.

Relations

Relates #42554.
Relates #43267.
Relates #43341.
Relates #43412.
Relates #43521.
Relates #43573.
Relates #43668.
Relates #43834.
Relates #43909.
Relates #44030.
Relates #44040.
Relates #44093.

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccDAXCluster_basic' PKG=dax
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.24.6 test ./internal/service/dax/... -v -count 1 -parallel 20  -run=TestAccDAXCluster_basic -timeout 360m -vet=off
2025/09/05 14:51:35 Creating Terraform AWS Provider (SDKv2-style)...
2025/09/05 14:51:35 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccDAXCluster_basic
=== PAUSE TestAccDAXCluster_basic
=== CONT  TestAccDAXCluster_basic
--- PASS: TestAccDAXCluster_basic (821.69s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/dax	827.177s
% make testacc TESTARGS='-run=TestAccDynamoDBTableReplica_pitr\|TestAccDynamoDBTable_Replica_pitrKMS\|TestAccDynamoDBTable_Replica_MRSC_pitrKMS' PKG=dynamodb ACCTEST_PARALLELISM=4
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.24.6 test ./internal/service/dynamodb/... -v -count 1 -parallel 4  -run=TestAccDynamoDBTableReplica_pitr\|TestAccDynamoDBTable_Replica_pitrKMS\|TestAccDynamoDBTable_Replica_MRSC_pitrKMS -timeout 360m -vet=off
2025/09/05 17:17:34 Creating Terraform AWS Provider (SDKv2-style)...
2025/09/05 17:17:34 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccDynamoDBTableReplica_pitr
=== PAUSE TestAccDynamoDBTableReplica_pitr
=== RUN   TestAccDynamoDBTableReplica_pitrKMS
=== PAUSE TestAccDynamoDBTableReplica_pitrKMS
=== RUN   TestAccDynamoDBTableReplica_pitrDefault
=== PAUSE TestAccDynamoDBTableReplica_pitrDefault
=== RUN   TestAccDynamoDBTable_Replica_pitrKMS
=== PAUSE TestAccDynamoDBTable_Replica_pitrKMS
=== RUN   TestAccDynamoDBTable_Replica_MRSC_pitrKMS
=== PAUSE TestAccDynamoDBTable_Replica_MRSC_pitrKMS
=== CONT  TestAccDynamoDBTableReplica_pitr
=== CONT  TestAccDynamoDBTable_Replica_pitrKMS
=== CONT  TestAccDynamoDBTable_Replica_MRSC_pitrKMS
=== CONT  TestAccDynamoDBTableReplica_pitrDefault
--- PASS: TestAccDynamoDBTableReplica_pitr (183.05s)
=== CONT  TestAccDynamoDBTableReplica_pitrKMS
--- PASS: TestAccDynamoDBTable_Replica_MRSC_pitrKMS (283.68s)
--- PASS: TestAccDynamoDBTableReplica_pitrDefault (324.80s)
--- PASS: TestAccDynamoDBTableReplica_pitrKMS (253.82s)
--- PASS: TestAccDynamoDBTable_Replica_pitrKMS (590.05s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/dynamodb	595.677s
% make testacc TESTARGS='-run=TestAccStorageGatewayGateway_GatewayType_cached' PKG=storagegateway
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.24.6 test ./internal/service/storagegateway/... -v -count 1 -parallel 20  -run=TestAccStorageGatewayGateway_GatewayType_cached -timeout 360m -vet=off
2025/09/08 09:45:32 Creating Terraform AWS Provider (SDKv2-style)...
2025/09/08 09:45:32 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccStorageGatewayGateway_GatewayType_cached
=== PAUSE TestAccStorageGatewayGateway_GatewayType_cached
=== CONT  TestAccStorageGatewayGateway_GatewayType_cached
--- PASS: TestAccStorageGatewayGateway_GatewayType_cached (222.30s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/storagegateway	227.775s

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 3, 2025

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

  • Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
  • Please see our prioritization guide for additional information on how the maintainers handle prioritization.
  • Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • 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 prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/storagegateway Issues and PRs that pertain to the storagegateway service. service/sfn Issues and PRs that pertain to the sfn service. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. size/S Managed by automation to categorize the size of a PR. labels Sep 3, 2025
@github-actions github-actions bot added service/dax Issues and PRs that pertain to the dax service. service/dynamodb Issues and PRs that pertain to the dynamodb service. service/datapipeline Issues and PRs that pertain to the datapipeline service. service/datasync Issues and PRs that pertain to the datasync service. size/L Managed by automation to categorize the size of a PR. labels Sep 5, 2025
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - dynamodb.aws_dyn…
974d89f 
…amodb_table, dynamodb.aws_dynamodb_table_replica.
@ewbankkit ewbankkit force-pushed the td-sdkretry.RetryContext-use-internal/retry branch from b58bdd9 to 974d89f Compare September 5, 2025 15:06
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - ecrpublic.aws_ec…
5e2230e 
…rpublic_repository.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - elasticache.
844171a
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_ca…
fbd9998 
…talog_table_optimizer.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_cr…
df43b3c 
…awler.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_de…
dc7e2b7 
…v_endpoint.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_tr…
eae12ec 
…igger.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aw…
1092e1c 
…s_lakeformation_data_lake_settings.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aw…
16ed52a 
…s_lakeformation_opt_in.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aw…
99f57cd 
…s_lakeformation_permissions.
@ewbankkit
Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aw…
c864502 
…s_lakeformation_resource_lf_tag.
@github-actions github-actions bot added service/lambda Issues and PRs that pertain to the lambda service. service/iam Issues and PRs that pertain to the iam service. service/ec2 Issues and PRs that pertain to the ec2 service. service/ecs Issues and PRs that pertain to the ecs service. service/pinpoint Issues and PRs that pertain to the pinpoint service. service/chime Issues and PRs that pertain to the chime service. service/ram Issues and PRs that pertain to the ram service. service/comprehend Issues and PRs that pertain to the comprehend service. sweeper Pertains to changes to or issues with the sweeper. service/opensearch Issues and PRs that pertain to the opensearch service. service/inspector2 Issues and PRs that pertain to the inspector2 service. service/vpc Issues and PRs that pertain to the vpc service. labels Sep 5, 2025
@ewbankkit ewbankkit marked this pull request as ready for review September 8, 2025 13:52
@ewbankkit ewbankkit requested a review from a team as a code owner September 8, 2025 13:52
jar-b
jar-b approved these changes Sep 8, 2025
View reviewed changes
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 5c23582 into main Sep 8, 2025
60 checks passed
@ewbankkit ewbankkit deleted the td-sdkretry.RetryContext-use-internal/retry branch September 8, 2025 18:51
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 8, 2025

Warning

This Issue has been closed, meaning that any additional comments are much easier for the maintainers to miss. Please assume that the maintainers will not see them.

Ongoing conversations amongst community members are welcome, however, the issue will be locked after 30 days. Moving conversations to another venue, such as the AWS Provider forum, is recommended. If you have additional concerns, please open a new issue, referencing this one where needed.

@github-actions github-actions bot added this to the v6.13.0 milestone Sep 8, 2025
terraform-aws-provider bot pushed a commit that referenced this pull request Sep 8, 2025
Update CHANGELOG.md for #44131
35522b7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jar-b jar-b jar-b approved these changes

Assignees
No one assigned
Labels
prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. service/chime Issues and PRs that pertain to the chime service. service/comprehend Issues and PRs that pertain to the comprehend service. service/datapipeline Issues and PRs that pertain to the datapipeline service. service/datasync Issues and PRs that pertain to the datasync service. service/dax Issues and PRs that pertain to the dax service. service/dynamodb Issues and PRs that pertain to the dynamodb service. service/ec2 Issues and PRs that pertain to the ec2 service. service/ecrpublic Issues and PRs that pertain to the ecrpublic service. service/ecs Issues and PRs that pertain to the ecs service. service/elasticache Issues and PRs that pertain to the elasticache service. service/glue Issues and PRs that pertain to the glue service. service/guardduty Issues and PRs that pertain to the guardduty service. service/iam Issues and PRs that pertain to the iam service. service/inspector Issues and PRs that pertain to the inspector service. service/inspector2 Issues and PRs that pertain to the inspector2 service. service/kinesisanalytics Issues and PRs that pertain to the kinesisanalytics service. service/kms Issues and PRs that pertain to the kms service. service/lakeformation Issues and PRs that pertain to the lakeformation service. service/lambda Issues and PRs that pertain to the lambda service. service/lexmodels Issues and PRs that pertain to the lexmodels service. service/macie2 Issues and PRs that pertain to the macie2 service. service/mediapackage Issues and PRs that pertain to the mediapackage service. service/opensearch Issues and PRs that pertain to the opensearch service. service/pinpoint Issues and PRs that pertain to the pinpoint service. service/ram Issues and PRs that pertain to the ram service. service/route53recoveryreadiness Issues and PRs that pertain to the route53recoveryreadiness service. service/s3 Issues and PRs that pertain to the s3 service. service/sagemaker Issues and PRs that pertain to the sagemaker service. service/servicecatalog Issues and PRs that pertain to the servicecatalog service. service/sfn Issues and PRs that pertain to the sfn service. service/storagegateway Issues and PRs that pertain to the storagegateway service. service/vpc Issues and PRs that pertain to the vpc service. size/L Managed by automation to categorize the size of a PR. size/S Managed by automation to categorize the size of a PR. 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
Milestone
v6.13.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ewbankkit @jar-b