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

Retries after timeouts for KMS keys and grants. #9415

Merged
merged 2 commits into from
Jul 24, 2019
Merged

Conversation

ryndaniels
Copy link
Contributor

Also updating the KMS grant tests to have randomized IAM role names.

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates #7873

Release note for CHANGELOG:

BUG FIXES:
* aws/kms_grant: Final retries after timeouts when creating, finding, and revoking grants
* aws/kms_key: Final retries after timeouts when creating keys and updating key rotation status

Output from acceptance testing:

$ make testacc TESTARGS="-run=TestAccAWSKmsGrant"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSKmsGrant -timeout 120m
?       github.com/terraform-providers/terraform-provider-aws   [no test files]
=== RUN   TestAccAWSKmsGrant_Basic
=== PAUSE TestAccAWSKmsGrant_Basic
=== RUN   TestAccAWSKmsGrant_withConstraints
=== PAUSE TestAccAWSKmsGrant_withConstraints
=== RUN   TestAccAWSKmsGrant_withRetiringPrincipal
=== PAUSE TestAccAWSKmsGrant_withRetiringPrincipal
=== RUN   TestAccAWSKmsGrant_bare
=== PAUSE TestAccAWSKmsGrant_bare
=== RUN   TestAccAWSKmsGrant_ARN
=== PAUSE TestAccAWSKmsGrant_ARN
=== CONT  TestAccAWSKmsGrant_Basic
=== CONT  TestAccAWSKmsGrant_bare
=== CONT  TestAccAWSKmsGrant_withConstraints
=== CONT  TestAccAWSKmsGrant_ARN
=== CONT  TestAccAWSKmsGrant_withRetiringPrincipal
--- PASS: TestAccAWSKmsGrant_bare (74.60s)
--- PASS: TestAccAWSKmsGrant_Basic (74.78s)
--- PASS: TestAccAWSKmsGrant_ARN (74.94s)
--- PASS: TestAccAWSKmsGrant_withRetiringPrincipal (75.04s)
--- PASS: TestAccAWSKmsGrant_withConstraints (118.40s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       120.493s

make testacc TESTARGS="-run=TestAccAWSKmsKey"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSKmsKey -timeout 120m
?       github.com/terraform-providers/terraform-provider-aws   [no test files]
=== RUN   TestAccAWSKmsKey_importBasic
=== PAUSE TestAccAWSKmsKey_importBasic
=== RUN   TestAccAWSKmsKey_basic
=== PAUSE TestAccAWSKmsKey_basic
=== RUN   TestAccAWSKmsKey_disappears
=== PAUSE TestAccAWSKmsKey_disappears
=== RUN   TestAccAWSKmsKey_policy
=== PAUSE TestAccAWSKmsKey_policy
=== RUN   TestAccAWSKmsKey_isEnabled
=== PAUSE TestAccAWSKmsKey_isEnabled
=== RUN   TestAccAWSKmsKey_tags
=== PAUSE TestAccAWSKmsKey_tags
=== CONT  TestAccAWSKmsKey_importBasic
=== CONT  TestAccAWSKmsKey_tags
=== CONT  TestAccAWSKmsKey_disappears
=== CONT  TestAccAWSKmsKey_policy
=== CONT  TestAccAWSKmsKey_isEnabled
=== CONT  TestAccAWSKmsKey_basic
--- PASS: TestAccAWSKmsKey_disappears (33.33s)
--- PASS: TestAccAWSKmsKey_policy (60.97s)
--- PASS: TestAccAWSKmsKey_tags (61.04s)
--- PASS: TestAccAWSKmsKey_importBasic (66.31s)
--- PASS: TestAccAWSKmsKey_basic (81.36s)
--- PASS: TestAccAWSKmsKey_isEnabled (292.76s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       293.826s

@ryndaniels ryndaniels requested a review from a team July 19, 2019 08:34
@ghost ghost added size/M Managed by automation to categorize the size of a PR. service/kms Issues and PRs that pertain to the kms service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jul 19, 2019
@bflad bflad added the bug Addresses a defect in current functionality. label Jul 23, 2019
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.

LGTM 🚀

--- PASS: TestAccAWSKmsKey_disappears (13.69s)
--- PASS: TestAccAWSKmsKey_policy (28.58s)
--- PASS: TestAccAWSKmsKey_tags (28.69s)
--- PASS: TestAccAWSKmsKey_importBasic (29.28s)
--- PASS: TestAccAWSKmsKey_basic (33.26s)
--- PASS: TestAccAWSKmsGrant_bare (45.81s)
--- PASS: TestAccAWSKmsGrant_Basic (46.10s)
--- PASS: TestAccAWSKmsGrant_ARN (46.45s)
--- PASS: TestAccAWSKmsGrant_withRetiringPrincipal (46.62s)
--- PASS: TestAccAWSKmsGrant_withConstraints (68.79s)
--- PASS: TestAccAWSKmsKey_isEnabled (280.10s)

@bflad bflad added this to the v2.21.0 milestone Jul 23, 2019
@ryndaniels ryndaniels merged commit 3077dfb into master Jul 24, 2019
@ryndaniels ryndaniels deleted the rfd-retry-kms branch July 24, 2019 09:50
@bflad
Copy link
Contributor

bflad commented Jul 26, 2019

This has been released in version 2.21.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, documentation updates, or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Nov 2, 2019

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 Nov 2, 2019
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/M 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.

2 participants