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

aws_kms_key: Increased Timeout on Tag and Description Propagation waiter #23593

Merged
merged 3 commits into from
Mar 10, 2022

Conversation

brittandeyoung
Copy link
Collaborator

@brittandeyoung brittandeyoung commented Mar 9, 2022

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

Our team has noticed that Amazon sometimes takes longer than the current timeout value to update tags or descriptions on a kms key resource.

A re run of terraform apply always shows the value was properly updated.

Increasing the time out value on these two waiters to allow the provider a little more time before timing out.

Closes #23592
Closes #23136

Output from acceptance testing:

$  make testacc TESTARGS='-run=TestAccKMSKey_' PKG_NAME=internal/service/kms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/kms/... -v -count 1 -parallel 20  -run=TestAccKMSKey_ -timeout 180m
=== RUN   TestAccKMSKey_basic
=== PAUSE TestAccKMSKey_basic
=== RUN   TestAccKMSKey_disappears
=== PAUSE TestAccKMSKey_disappears
=== RUN   TestAccKMSKey_multiRegion
=== PAUSE TestAccKMSKey_multiRegion
=== RUN   TestAccKMSKey_asymmetricKey
=== PAUSE TestAccKMSKey_asymmetricKey
=== RUN   TestAccKMSKey_Policy_basic
=== PAUSE TestAccKMSKey_Policy_basic
=== RUN   TestAccKMSKey_Policy_bypass
=== PAUSE TestAccKMSKey_Policy_bypass
=== RUN   TestAccKMSKey_Policy_bypassUpdate
=== PAUSE TestAccKMSKey_Policy_bypassUpdate
=== RUN   TestAccKMSKey_Policy_iamRole
=== PAUSE TestAccKMSKey_Policy_iamRole
=== RUN   TestAccKMSKey_Policy_iamRoleOrder
=== PAUSE TestAccKMSKey_Policy_iamRoleOrder
=== RUN   TestAccKMSKey_Policy_iamServiceLinkedRole
=== PAUSE TestAccKMSKey_Policy_iamServiceLinkedRole
=== RUN   TestAccKMSKey_Policy_booleanCondition
=== PAUSE TestAccKMSKey_Policy_booleanCondition
=== RUN   TestAccKMSKey_isEnabled
=== PAUSE TestAccKMSKey_isEnabled
=== RUN   TestAccKMSKey_tags
=== PAUSE TestAccKMSKey_tags
=== CONT  TestAccKMSKey_basic
=== CONT  TestAccKMSKey_Policy_iamRole
=== CONT  TestAccKMSKey_tags
=== CONT  TestAccKMSKey_isEnabled
=== CONT  TestAccKMSKey_Policy_booleanCondition
=== CONT  TestAccKMSKey_Policy_iamServiceLinkedRole
=== CONT  TestAccKMSKey_Policy_iamRoleOrder
=== CONT  TestAccKMSKey_Policy_bypassUpdate
=== CONT  TestAccKMSKey_multiRegion
=== CONT  TestAccKMSKey_asymmetricKey
=== CONT  TestAccKMSKey_Policy_basic
=== CONT  TestAccKMSKey_Policy_bypass
=== CONT  TestAccKMSKey_disappears
--- PASS: TestAccKMSKey_asymmetricKey (57.97s)
--- PASS: TestAccKMSKey_disappears (72.10s)
--- PASS: TestAccKMSKey_multiRegion (75.10s)
--- PASS: TestAccKMSKey_basic (82.69s)
--- PASS: TestAccKMSKey_Policy_iamRole (86.24s)
--- PASS: TestAccKMSKey_Policy_booleanCondition (88.47s)
--- PASS: TestAccKMSKey_Policy_bypassUpdate (94.98s)
--- PASS: TestAccKMSKey_Policy_basic (103.03s)
--- PASS: TestAccKMSKey_Policy_iamServiceLinkedRole (105.78s)
--- PASS: TestAccKMSKey_Policy_iamRoleOrder (125.06s)
--- PASS: TestAccKMSKey_tags (130.92s)
--- PASS: TestAccKMSKey_Policy_bypass (181.69s)
--- PASS: TestAccKMSKey_isEnabled (191.26s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/kms        198.001s

...

Changelog

resource/aws_kms_key: Increased Timeout on Tag and Description Propagation waiter

Our team has noticed that Amazon sometimes takes longer than the current timeout value to update tags or descriptions on a kms key resource.

A re run of terraform apply always shows the value was properly updated.

Increasing the time out value to allow the provider a little more time before timing out.
@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. service/kms Issues and PRs that pertain to the kms service. size/XS Managed by automation to categorize the size of a PR. and removed service/kms Issues and PRs that pertain to the kms service. labels Mar 9, 2022
@justinretzolk justinretzolk added bug Addresses a defect in current functionality. service/kms Issues and PRs that pertain to the kms service. timeouts Pertains to timeout increases. and removed needs-triage Waiting for first response or review from a maintainer. labels Mar 9, 2022
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 TESTARGS='-run=TestAccKMSKey_tags\|TestAccKMSExternalKey_tags\|TestAccKMSReplicaExternalKey_tags\|TestAccKMSReplicaKey_tags' PKG=kms
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/kms/... -v -count 1 -parallel 20  -run=TestAccKMSKey_tags\|TestAccKMSExternalKey_tags\|TestAccKMSReplicaExternalKey_tags\|TestAccKMSReplicaKey_tags -timeout 180m
=== RUN   TestAccKMSExternalKey_tags
=== PAUSE TestAccKMSExternalKey_tags
=== RUN   TestAccKMSKey_tags
=== PAUSE TestAccKMSKey_tags
=== RUN   TestAccKMSReplicaExternalKey_tags
=== PAUSE TestAccKMSReplicaExternalKey_tags
=== RUN   TestAccKMSReplicaKey_tags
=== PAUSE TestAccKMSReplicaKey_tags
=== CONT  TestAccKMSExternalKey_tags
=== CONT  TestAccKMSReplicaExternalKey_tags
=== CONT  TestAccKMSReplicaKey_tags
=== CONT  TestAccKMSKey_tags
--- PASS: TestAccKMSExternalKey_tags (71.93s)
--- PASS: TestAccKMSKey_tags (72.21s)
--- PASS: TestAccKMSReplicaKey_tags (104.81s)
--- PASS: TestAccKMSReplicaExternalKey_tags (128.89s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/kms	136.644s

@ewbankkit
Copy link
Contributor

@brittandeyoung Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit e31f6ae into hashicorp:main Mar 10, 2022
@github-actions github-actions bot added this to the v4.5.0 milestone Mar 10, 2022
@github-actions
Copy link

This functionality has been released in v4.5.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
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 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/kms Issues and PRs that pertain to the kms service. size/XS Managed by automation to categorize the size of a PR. timeouts Pertains to timeout increases.
Projects
None yet
3 participants