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

r/neptune_cluster: fix ignored kms key on snapshot restore #15240. #33413

Merged
merged 4 commits into from
Sep 13, 2023
Merged

r/neptune_cluster: fix ignored kms key on snapshot restore #15240. #33413

merged 4 commits into from
Sep 13, 2023

Conversation

triggan
Copy link
Contributor

@triggan triggan commented Sep 11, 2023

Description

The KMS Key parameter is presently ignored when restoring a snapshot to a new cluster. Users will use this parameter if they want to change the KMS encryption key of the new cluster to be different than that of the key used by the snapshot. It is also used when a user wants to create a new encrypted cluster from an unencrypted snapshot, per Issue #15240 .

This PR also modifies the existing test for restoring from a snapshot to include the KMS key parameter.

Relations

Closes #15240.
Closes #15303.

References

https://docs.aws.amazon.com/neptune/latest/apiref/API_RestoreDBClusterFromSnapshot.html

Output from Acceptance Testing

$ make testacc TESTS=TestAccNeptuneCluster_restoreFromSnapshot PKG=neptune
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/neptune/... -v -count 1 -parallel 20 -run='TestAccNeptuneCluster_restoreFromSnapshot'  -timeout 180m
=== RUN   TestAccNeptuneCluster_restoreFromSnapshot
=== PAUSE TestAccNeptuneCluster_restoreFromSnapshot
=== CONT  TestAccNeptuneCluster_restoreFromSnapshot
--- PASS: TestAccNeptuneCluster_restoreFromSnapshot (437.43s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/neptune    437.541s

…ored when creating a cluster from a snapshot.
@github-actions
Copy link

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 size/S Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/neptune Issues and PRs that pertain to the neptune service. labels Sep 11, 2023
@terraform-aws-provider terraform-aws-provider bot added needs-triage Waiting for first response or review from a maintainer. partner Contribution from a partner. labels Sep 11, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @triggan 👋

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 CONTRIBUTOR 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! 😃

@triggan
Copy link
Contributor Author

triggan commented Sep 11, 2023

Note also that PR #15303 could potentially be closed with this PR, as it was an earlier attempt to fix this issue and now has many merge conflicts.

@justinretzolk justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Sep 11, 2023
@ewbankkit ewbankkit self-assigned this Sep 13, 2023
@terraform-aws-provider terraform-aws-provider bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 13, 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=TestAccNeptuneCluster_restoreFromSnapshot\|TestAccNeptuneCluster_basic' PKG=neptune ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/neptune/... -v -count 1 -parallel 2  -run=TestAccNeptuneCluster_restoreFromSnapshot\|TestAccNeptuneCluster_basic -timeout 180m
=== RUN   TestAccNeptuneCluster_basic
=== PAUSE TestAccNeptuneCluster_basic
=== RUN   TestAccNeptuneCluster_restoreFromSnapshot
=== PAUSE TestAccNeptuneCluster_restoreFromSnapshot
=== CONT  TestAccNeptuneCluster_basic
=== CONT  TestAccNeptuneCluster_restoreFromSnapshot
--- PASS: TestAccNeptuneCluster_basic (223.12s)
--- PASS: TestAccNeptuneCluster_restoreFromSnapshot (474.22s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/neptune	493.385s

@ewbankkit
Copy link
Contributor

@triggan Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 307b46f into hashicorp:main Sep 13, 2023
34 checks passed
@github-actions github-actions bot added this to the v5.17.0 milestone Sep 13, 2023
@github-actions github-actions bot removed the bug Addresses a defect in current functionality. label Sep 14, 2023
@github-actions
Copy link

This functionality has been released in v5.17.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 Oct 15, 2023
@justinretzolk justinretzolk added the bug Addresses a defect in current functionality. label Feb 10, 2024
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. partner Contribution from a partner. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/neptune Issues and PRs that pertain to the neptune service. size/S 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.

Unable to create encrypted Neptune cluster from unencrypted Neptune cluster snapshot
3 participants