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_secretsmanager_secret: Support ForceDeleteWithoutRecovery and recreation after immediate deletion #5583

Merged

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Aug 16, 2018

Closes #5521
Closes #5445
Closes #5127
Closes #4467

Changes proposed in this pull request:

  • When recovery_window_in_days is set to 0, use ForceDeleteWithoutRecovery with DeleteSecret
  • On creation, allow two minutes of retry for InvalidRequestException: You can’t perform this operation on the secret because it was deleted.

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS='-run=TestAccAwsSecretsManagerSecret_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAwsSecretsManagerSecret_ -timeout 120m
=== RUN   TestAccAwsSecretsManagerSecret_Basic
--- PASS: TestAccAwsSecretsManagerSecret_Basic (13.95s)
=== RUN   TestAccAwsSecretsManagerSecret_Description
--- PASS: TestAccAwsSecretsManagerSecret_Description (22.19s)
=== RUN   TestAccAwsSecretsManagerSecret_KmsKeyID
--- PASS: TestAccAwsSecretsManagerSecret_KmsKeyID (53.60s)
=== RUN   TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate
--- PASS: TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate (51.11s)
=== RUN   TestAccAwsSecretsManagerSecret_RotationLambdaARN
--- PASS: TestAccAwsSecretsManagerSecret_RotationLambdaARN (51.04s)
=== RUN   TestAccAwsSecretsManagerSecret_RotationRules
--- PASS: TestAccAwsSecretsManagerSecret_RotationRules (52.66s)
=== RUN   TestAccAwsSecretsManagerSecret_Tags
--- PASS: TestAccAwsSecretsManagerSecret_Tags (40.70s)
=== RUN   TestAccAwsSecretsManagerSecret_policy
--- PASS: TestAccAwsSecretsManagerSecret_policy (11.81s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	297.680s

…y and recreation after immediate deletion

* When `recovery_window_in_days` is set to 0, use `ForceDeleteWithoutRecovery` with `DeleteSecret`
* On creation, allow two minutes of retry for `InvalidRequestException: You can’t perform this operation on the secret because it was deleted.`

make testacc TEST=./aws TESTARGS='-run=TestAccAwsSecretsManagerSecret_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -run=TestAccAwsSecretsManagerSecret_ -timeout 120m
=== RUN   TestAccAwsSecretsManagerSecret_Basic
--- PASS: TestAccAwsSecretsManagerSecret_Basic (13.95s)
=== RUN   TestAccAwsSecretsManagerSecret_Description
--- PASS: TestAccAwsSecretsManagerSecret_Description (22.19s)
=== RUN   TestAccAwsSecretsManagerSecret_KmsKeyID
--- PASS: TestAccAwsSecretsManagerSecret_KmsKeyID (53.60s)
=== RUN   TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate
--- PASS: TestAccAwsSecretsManagerSecret_RecoveryWindowInDays_Recreate (51.11s)
=== RUN   TestAccAwsSecretsManagerSecret_RotationLambdaARN
--- PASS: TestAccAwsSecretsManagerSecret_RotationLambdaARN (51.04s)
=== RUN   TestAccAwsSecretsManagerSecret_RotationRules
--- PASS: TestAccAwsSecretsManagerSecret_RotationRules (52.66s)
=== RUN   TestAccAwsSecretsManagerSecret_Tags
--- PASS: TestAccAwsSecretsManagerSecret_Tags (40.70s)
=== RUN   TestAccAwsSecretsManagerSecret_policy
--- PASS: TestAccAwsSecretsManagerSecret_policy (11.81s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	297.680s
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/secretsmanager Issues and PRs that pertain to the secretsmanager service. labels Aug 16, 2018
@bflad bflad requested a review from a team August 16, 2018 23:58
@ghost ghost added the size/M Managed by automation to categorize the size of a PR. label Aug 16, 2018
Copy link
Member

@mbfrahry mbfrahry left a comment

Choose a reason for hiding this comment

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

LGTM

@bflad bflad added this to the v1.33.0 milestone Aug 22, 2018
@bflad bflad merged commit 8ec1b39 into master Aug 22, 2018
@bflad bflad deleted the f-aws_secretsmanager_secret-ForceDeletionWithoutRecovery branch August 22, 2018 13:12
bflad added a commit that referenced this pull request Aug 22, 2018
@bflad
Copy link
Contributor Author

bflad commented Aug 22, 2018

This has been released in version 1.33.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@ghost
Copy link

ghost commented Apr 3, 2020

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 Apr 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement Requests to existing resources that expand the functionality or scope. service/secretsmanager Issues and PRs that pertain to the secretsmanager service. size/M Managed by automation to categorize the size of a PR.
Projects
None yet
2 participants