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

resource/aws_kms_grant: Retries read until principals return valid ARNs #29245

Merged
merged 7 commits into from
Feb 6, 2023

Conversation

gdavison
Copy link
Contributor

@gdavison gdavison commented Feb 3, 2023

In some cases, there is a race condition with KMS Key Grants where an IAM unique id is returned instead of a valid principal ARN. Retry reading until the principals are valid. Previously, the state would not be updated.

Output from Acceptance Testing

$ make testacc PKG=kms TESTS=TestAccKMSGrant_

--- PASS: TestAccKMSGrant_arn (22.03s)
--- PASS: TestAccKMSGrant_withRetiringPrincipal (22.07s)
--- PASS: TestAccKMSGrant_asymmetricKey (22.14s)
--- PASS: TestAccKMSGrant_basic (22.15s)
--- PASS: TestAccKMSGrant_bare (29.06s)
--- PASS: TestAccKMSGrant_withConstraints (37.19s)
--- PASS: TestAccKMSGrant_disappears (200.27s)

@github-actions
Copy link

github-actions bot commented Feb 3, 2023

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 github_actions Pull requests that update Github_actions code linter Pertains to changes to or issues with the various linters. repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. service/iam Issues and PRs that pertain to the iam service. service/kms Issues and PRs that pertain to the kms service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/M Managed by automation to categorize the size of a PR. and removed tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/iam Issues and PRs that pertain to the iam service. service/kms Issues and PRs that pertain to the kms service. linter Pertains to changes to or issues with the various linters. repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. github_actions Pull requests that update Github_actions code labels Feb 3, 2023
@github-actions github-actions bot added github_actions Pull requests that update Github_actions code linter Pertains to changes to or issues with the various linters. repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. service/iam Issues and PRs that pertain to the iam service. service/kms Issues and PRs that pertain to the kms service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Feb 3, 2023
@github-actions github-actions bot added the service/apigateway Issues and PRs that pertain to the apigateway service. label Feb 3, 2023
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=TestAccKMSGrant_' PKG=kms ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/kms/... -v -count 1 -parallel 3  -run=TestAccKMSGrant_ -timeout 180m
=== RUN   TestAccKMSGrant_basic
=== PAUSE TestAccKMSGrant_basic
=== RUN   TestAccKMSGrant_withConstraints
=== PAUSE TestAccKMSGrant_withConstraints
=== RUN   TestAccKMSGrant_withRetiringPrincipal
=== PAUSE TestAccKMSGrant_withRetiringPrincipal
=== RUN   TestAccKMSGrant_bare
=== PAUSE TestAccKMSGrant_bare
=== RUN   TestAccKMSGrant_arn
=== PAUSE TestAccKMSGrant_arn
=== RUN   TestAccKMSGrant_asymmetricKey
=== PAUSE TestAccKMSGrant_asymmetricKey
=== RUN   TestAccKMSGrant_disappears
=== PAUSE TestAccKMSGrant_disappears
=== CONT  TestAccKMSGrant_basic
=== CONT  TestAccKMSGrant_arn
=== CONT  TestAccKMSGrant_withRetiringPrincipal
--- PASS: TestAccKMSGrant_arn (25.85s)
=== CONT  TestAccKMSGrant_disappears
--- PASS: TestAccKMSGrant_withRetiringPrincipal (35.33s)
=== CONT  TestAccKMSGrant_bare
--- PASS: TestAccKMSGrant_basic (35.36s)
=== CONT  TestAccKMSGrant_withConstraints
--- PASS: TestAccKMSGrant_bare (24.43s)
=== CONT  TestAccKMSGrant_asymmetricKey
--- PASS: TestAccKMSGrant_withConstraints (46.16s)
--- PASS: TestAccKMSGrant_asymmetricKey (25.85s)
--- PASS: TestAccKMSGrant_disappears (210.30s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/kms	241.388s

@gdavison gdavison merged commit 014fa77 into main Feb 6, 2023
@gdavison gdavison deleted the td-iam-unique-id branch February 6, 2023 18:42
@github-actions github-actions bot added this to the v4.54.0 milestone Feb 6, 2023
github-actions bot pushed a commit that referenced this pull request Feb 6, 2023
@github-actions
Copy link

github-actions bot commented Feb 9, 2023

This functionality has been released in v4.54.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 Mar 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
github_actions Pull requests that update Github_actions code linter Pertains to changes to or issues with the various linters. repository Repository modifications; GitHub Actions, developer docs, issue templates, codeowners, changelog. service/apigateway Issues and PRs that pertain to the apigateway service. service/iam Issues and PRs that pertain to the iam service. 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