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

fix(sqs): encryptionType is incorrect when encryptionMasterKey is provided #26886

Merged
merged 6 commits into from
Aug 25, 2023

Conversation

mrgrain
Copy link
Contributor

@mrgrain mrgrain commented Aug 25, 2023

In #19796 we added additional validation to sns subscription.
For that purpose the Queue encryptionType was exposed as a public property.
However the PR forgot to take into account that the provided encryption property is automatically changed when a encryptionMasterKey is provided.

This PR ensures that the public encryptionType has the correct value.

Additionally, adds a warning for an incorrect configuration scenario where encryptionMasterKey is provided together with an encryption other than QueueEncryption.KMS.
This feature was supposed to allow users to simply provide an encryption key and have the encryption type being selected automatically.
However it now unintentionally allows for wrong configurations that are silently fixed, e.g. setting QueueEncryption.UNENCRYPTED and providing an encryption key.
The warning keeps backwards compatibility, but instructs users to fix their configuration.

Closes #26719


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team August 25, 2023 09:26
@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p0 labels Aug 25, 2023
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 25, 2023
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@mrgrain mrgrain added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Aug 25, 2023
@mrgrain
Copy link
Contributor Author

mrgrain commented Aug 25, 2023

pr-linter/exempt-integ-test because this changes in memory properties and validation only.

@aws-cdk-automation aws-cdk-automation dismissed their stale review August 25, 2023 09:33

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@aws-cdk-automation aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Aug 25, 2023
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2023

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Aug 25, 2023
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2023

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 4fe3a5f
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit bf441fa into main Aug 25, 2023
8 checks passed
@mergify mergify bot deleted the mrgrain/fix/sqs-encrypted-with-key-but-wrong-type branch August 25, 2023 12:37
@mergify
Copy link
Contributor

mergify bot commented Aug 25, 2023

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort p0 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sns_subscriptions: Breaking change from issue 19796 where an exception was added for code that works
3 participants