[#19212] Fix secretsmanager_secret_version update #19943

syndbg · 2021-06-24T14:47:51Z

Fixes the AWS SecretsManager API call failing when there's a drift
between the Terraform state and SecretsManager "state".

The drift is caused by someone/something updating outside of Terraform the given resource.
E.g AWS SecretsManager CLI or AWS SecretsManager Web UI/Console

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

Closes #19212.

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update -timeout 180m
=== RUN   TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update
=== PAUSE TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update
=== CONT  TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update
--- PASS: TestAccAwsSecretsManagerSecretVersion_VersionStages_external_update (61.19s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       61.246s
...

github-actions

Welcome @syndbg 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTING guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

Fixes the AWS SecretsManager API call failing when there's a drift between the Terraform state and SecretsManager "state". The drift is caused by someone/something updating outside of Terraform the given resource. E.g AWS SecretsManager CLI or AWS SecretsManager Web UI/Console

syndbg · 2021-06-28T12:22:05Z

Any chance you can take a look at this? @ewbankkit @bill-rich 👀

syndbg · 2021-07-22T13:28:11Z

Is there anything missing/done wrong in the PR?

We (https:/sumup) kinda need this fix.

zhelding · 2021-10-19T16:36:31Z

Pull request #21306 has significantly refactored the AWS Provider codebase. As a result, most PRs opened prior to the refactor now have merge conflicts that must be resolved before proceeding.

Specifically, PR #21306 relocated the code for all AWS resources and data sources from a single aws directory to a large number of separate directories in internal/service, each corresponding to a particular AWS service. This separation of code has also allowed for us to simplify the names of underlying functions -- while still avoiding namespace collisions.

We recognize that many pull requests have been open for some time without yet being addressed by our maintainers. Therefore, we want to make it clear that resolving these conflicts in no way affects the prioritization of a particular pull request. Once a pull request has been prioritized for review, the necessary changes will be made by a maintainer -- either directly or in collaboration with the pull request author.

For a more complete description of this refactor, including examples of how old filepaths and function names correspond to their new counterparts: please refer to issue #20000.

For a quick guide on how to amend your pull request to resolve the merge conflicts resulting from this refactor and bring it in line with our new code patterns: please refer to our Service Package Refactor Pull Request Guide.

X-Guardian · 2023-10-05T09:24:20Z

@syndbg, are you able to resolve the conflicts on this PR, as this issue still exists.

This reverts commit 89d24dd.

…f 'AWSPREVIOUS' as deleted.

…SecretVersion_multipleVersions'.

% make testacc TESTARGS='-run=TestAccSecretsManagerSecretVersion_multipleVersions' PKG=secretsmanager ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/secretsmanager/... -v -count 1 -parallel 20 -run=TestAccSecretsManagerSecretVersion_multipleVersions -timeout 360m === RUN TestAccSecretsManagerSecretVersion_multipleVersions === PAUSE TestAccSecretsManagerSecretVersion_multipleVersions === CONT TestAccSecretsManagerSecretVersion_multipleVersions --- PASS: TestAccSecretsManagerSecretVersion_multipleVersions (18.29s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager 24.282s

% make testacc TESTARGS='-run=TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate' PKG=secretsmanager ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/secretsmanager/... -v -count 1 -parallel 20 -run=TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate -timeout 360m === RUN TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate === PAUSE TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate === CONT TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate secret_version_test.go:148: Step 2/2 error: Error running apply: exit status 1 Error: adding Secrets Manager Secret Version (arn:aws:secretsmanager:us-west-2:187416307283:secret:tf-acc-test-6730888995458695428-SDqgH6|terraform-20240117143626546000000002) stage (AWSCURRENT): operation error Secrets Manager: UpdateSecretVersionStage, https response error StatusCode: 400, RequestID: ca7aa42b-4d72-4bf3-80f4-ba679691182e, InvalidParameterException: The parameter RemoveFromVersionId can't be empty. Staging label AWSCURRENT is currently attached to version e307a6be-8c34-400a-9154-c6908e71788b, so you must explicitly reference that version in RemoveFromVersionId. with aws_secretsmanager_secret_version.test, on terraform_plugin_test.tf line 16, in resource "aws_secretsmanager_secret_version" "test": 16: resource "aws_secretsmanager_secret_version" "test" { --- FAIL: TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate (20.48s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager 25.941s FAIL make: *** [testacc] Error 1

…The parameter RemoveFromVersionId can't be empty. Staging label AWSCURRENT is currently attached to version ..., so you must explicitly reference that version in RemoveFromVersionId` errors when a secret is updated outside Terraform.

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccSecretsManagerSecretVersion_' PKG=secretsmanager ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/secretsmanager/... -v -count 1 -parallel 3  -run=TestAccSecretsManagerSecretVersion_ -timeout 360m
=== RUN   TestAccSecretsManagerSecretVersion_basicString
=== PAUSE TestAccSecretsManagerSecretVersion_basicString
=== RUN   TestAccSecretsManagerSecretVersion_base64Binary
=== PAUSE TestAccSecretsManagerSecretVersion_base64Binary
=== RUN   TestAccSecretsManagerSecretVersion_versionStages
=== PAUSE TestAccSecretsManagerSecretVersion_versionStages
=== RUN   TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate
=== PAUSE TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate
=== RUN   TestAccSecretsManagerSecretVersion_disappears
=== PAUSE TestAccSecretsManagerSecretVersion_disappears
=== RUN   TestAccSecretsManagerSecretVersion_Disappears_secret
=== PAUSE TestAccSecretsManagerSecretVersion_Disappears_secret
=== RUN   TestAccSecretsManagerSecretVersion_multipleVersions
=== PAUSE TestAccSecretsManagerSecretVersion_multipleVersions
=== CONT  TestAccSecretsManagerSecretVersion_basicString
=== CONT  TestAccSecretsManagerSecretVersion_disappears
=== CONT  TestAccSecretsManagerSecretVersion_versionStages
--- PASS: TestAccSecretsManagerSecretVersion_disappears (19.03s)
=== CONT  TestAccSecretsManagerSecretVersion_multipleVersions
--- PASS: TestAccSecretsManagerSecretVersion_basicString (22.62s)
=== CONT  TestAccSecretsManagerSecretVersion_base64Binary
--- PASS: TestAccSecretsManagerSecretVersion_multipleVersions (20.49s)
=== CONT  TestAccSecretsManagerSecretVersion_Disappears_secret
--- PASS: TestAccSecretsManagerSecretVersion_base64Binary (21.78s)
=== CONT  TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate
--- PASS: TestAccSecretsManagerSecretVersion_versionStages (49.04s)
--- PASS: TestAccSecretsManagerSecretVersion_Disappears_secret (18.05s)
--- PASS: TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate (27.47s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager	81.236s

ewbankkit · 2024-01-17T16:37:39Z

@syndbg Thanks for the contribution 🎉 👏.

github-actions · 2024-01-18T23:04:31Z

This functionality has been released in v5.33.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 · 2024-02-18T02:03:53Z

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 bot added needs-triage Waiting for first response or review from a maintainer. service/secretsmanager Issues and PRs that pertain to the secretsmanager service. size/S Managed by automation to categorize the size of a PR. labels Jun 24, 2021

syndbg force-pushed the gh-19212-fix-secrets-manager-version-update branch 2 times, most recently from 01fd86a to 6510566 Compare June 24, 2021 14:51

github-actions bot reviewed Jun 24, 2021

View reviewed changes

syndbg changed the title ~~[GH-#19212] Fix secretsmanager_secret_version update~~ [#19212] Fix secretsmanager_secret_version update Jun 25, 2021

syndbg force-pushed the gh-19212-fix-secrets-manager-version-update branch from 6510566 to bb12b21 Compare June 25, 2021 09:40

github-actions bot added 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 size/S Managed by automation to categorize the size of a PR. labels Jun 25, 2021

syndbg marked this pull request as ready for review June 25, 2021 10:30

syndbg force-pushed the gh-19212-fix-secrets-manager-version-update branch from bb12b21 to a66e804 Compare June 25, 2021 10:40

syndbg force-pushed the gh-19212-fix-secrets-manager-version-update branch from a66e804 to 89d24dd Compare June 25, 2021 10:43

plamen-kutinchev approved these changes Jun 25, 2021

View reviewed changes

mtsvyatkovski approved these changes Jun 25, 2021

View reviewed changes

breathingdust added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 3, 2021

ewbankkit added 7 commits January 16, 2024 11:12

Revert "[hashicorp#19212] Fix secretsmanager_secret_version update"

908f523

This reverts commit 89d24dd.

Merge branch 'main' into HEAD

50249d7

r/aws_secretsmanager_secret_version: Treat a single 'version_stage' p…

9522bc4

…f 'AWSPREVIOUS' as deleted.

r/aws_secretsmanager_secret_version: Uncomment 'TestAccSecretsManager…

5a69dd8

…SecretVersion_multipleVersions'.

Add 'TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate'.

cc85277

ewbankkit added 2 commits January 17, 2024 10:22

Add CHANGELOG entry.

9b06808

ewbankkit approved these changes Jan 17, 2024

View reviewed changes

Fix terrafmt errors.

439e979

ewbankkit merged commit 3329431 into hashicorp:main Jan 17, 2024
36 checks passed

github-actions bot added this to the v5.33.0 milestone Jan 17, 2024

github-actions bot locked as resolved and limited conversation to collaborators Feb 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#19212] Fix secretsmanager_secret_version update #19943

[#19212] Fix secretsmanager_secret_version update #19943

syndbg commented Jun 24, 2021 •

edited by ewbankkit

Loading

github-actions bot left a comment

syndbg commented Jun 28, 2021

syndbg commented Jul 22, 2021

zhelding commented Oct 19, 2021

X-Guardian commented Oct 5, 2023

ewbankkit left a comment

ewbankkit commented Jan 17, 2024

github-actions bot commented Jan 18, 2024

github-actions bot commented Feb 18, 2024

[#19212] Fix secretsmanager_secret_version update #19943

[#19212] Fix secretsmanager_secret_version update #19943

Conversation

syndbg commented Jun 24, 2021 • edited by ewbankkit Loading

Community Note

github-actions bot left a comment

Choose a reason for hiding this comment

syndbg commented Jun 28, 2021

syndbg commented Jul 22, 2021

zhelding commented Oct 19, 2021

X-Guardian commented Oct 5, 2023

ewbankkit left a comment

Choose a reason for hiding this comment

ewbankkit commented Jan 17, 2024

github-actions bot commented Jan 18, 2024

github-actions bot commented Feb 18, 2024

syndbg commented Jun 24, 2021 •

edited by ewbankkit

Loading