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

Add support for KMS key ARN in AMP Workspace resource #35062

Merged
merged 11 commits into from
Jan 2, 2024

Conversation

obounaim
Copy link
Contributor

@obounaim obounaim commented Dec 25, 2023

Description

Implements AWS Key Management Service encryption for Amazon Managed Service for Prometheus Workspace

Relations

Closes #35048

References

Encryption at rest

Output from Acceptance Testing

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

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/XS Managed by automation to categorize the size of a PR. service/amp Issues and PRs that pertain to the amp service. labels Dec 25, 2023
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Dec 25, 2023
@obounaim obounaim changed the title [WIP] Add support for KMS key ARN in AMP Workspace resource Add support for KMS key ARN in AMP Workspace resource Dec 28, 2023
@obounaim obounaim marked this pull request as ready for review December 28, 2023 15:39
@github-actions github-actions bot added size/M Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. and removed size/XS Managed by automation to categorize the size of a PR. labels Dec 28, 2023
@ewbankkit ewbankkit added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 2, 2024
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=TestAccAMPWorkspaceDataSource_\|TestAccAMPWorkspace_' PKG=amp ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/amp/... -v -count 1 -parallel 2  -run=TestAccAMPWorkspaceDataSource_\|TestAccAMPWorkspace_ -timeout 360m
=== RUN   TestAccAMPWorkspaceDataSource_basic
--- PASS: TestAccAMPWorkspaceDataSource_basic (17.29s)
=== RUN   TestAccAMPWorkspace_basic
=== PAUSE TestAccAMPWorkspace_basic
=== RUN   TestAccAMPWorkspace_disappears
=== PAUSE TestAccAMPWorkspace_disappears
=== RUN   TestAccAMPWorkspace_kms
=== PAUSE TestAccAMPWorkspace_kms
=== RUN   TestAccAMPWorkspace_tags
=== PAUSE TestAccAMPWorkspace_tags
=== RUN   TestAccAMPWorkspace_alias
=== PAUSE TestAccAMPWorkspace_alias
=== RUN   TestAccAMPWorkspace_loggingConfiguration
=== PAUSE TestAccAMPWorkspace_loggingConfiguration
=== CONT  TestAccAMPWorkspace_basic
=== CONT  TestAccAMPWorkspace_tags
--- PASS: TestAccAMPWorkspace_basic (21.60s)
=== CONT  TestAccAMPWorkspace_loggingConfiguration
--- PASS: TestAccAMPWorkspace_tags (47.51s)
=== CONT  TestAccAMPWorkspace_kms
--- PASS: TestAccAMPWorkspace_kms (20.71s)
=== CONT  TestAccAMPWorkspace_disappears
--- PASS: TestAccAMPWorkspace_disappears (17.81s)
=== CONT  TestAccAMPWorkspace_alias
--- PASS: TestAccAMPWorkspace_loggingConfiguration (66.63s)
--- PASS: TestAccAMPWorkspace_alias (55.80s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/amp	164.957s

@ewbankkit
Copy link
Contributor

@obounaim Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 343b1cb into hashicorp:main Jan 2, 2024
43 checks passed
@github-actions github-actions bot added this to the v5.32.0 milestone Jan 2, 2024
Copy link

This functionality has been released in v5.32.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!

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 Feb 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/amp Issues and PRs that pertain to the amp 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.

Amazon Managed Service for Prometheus now supports customer managed KMS keys
2 participants