Skip to content

fix(sqs): kms:Decrypt permission to grantSendMessages #7522

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.

Sign up for GitHub

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

Merged
mergify merged 8 commits into from
May 4, 2020
Merged

fix(sqs): kms:Decrypt permission to grantSendMessages #7522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9d4c779
Add kms:Decrypt for grantSendMessages
shreyasdamle Apr 22, 2020
5628f0e
Merge branch 'master' into sdamle-sqs
shreyasdamle Apr 22, 2020
3107198
Fix linter errors
shreyasdamle Apr 26, 2020
7090f76
Fix kms action error in sqs test for aws-s3-notofications
shreyasdamle Apr 26, 2020
aad1527
Fix integ test errors in s3-notofications
shreyasdamle Apr 26, 2020
1c1cbef
Address comments from CR
shreyasdamle May 4, 2020
b35bcbc
Fix kms action ordering in sqs test for aws-s3-notofications
shreyasdamle May 4, 2020
d9f2196
Merge branch 'master' into sdamle-sqs
shreyasdamle May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ test('if the queue is encrypted with a custom kms key, the key resource policy i
},
{
Action: [
'kms:Decrypt',
'kms:Encrypt',
'kms:ReEncrypt*',
'kms:GenerateDataKey*',
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
},
{
"Action": [
"kms:Decrypt",
"kms:Encrypt",
"kms:ReEncrypt*",
"kms:GenerateDataKey*"
Expand Down
5 changes: 2 additions & 3 deletions packages/@aws-cdk/aws-sqs/lib/queue-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ export abstract class QueueBase extends Resource implements IQueue {
'sqs:GetQueueUrl');

if (this.encryptionMasterKey) {
this.encryptionMasterKey.grantEncrypt(grantee);
// kms:Decrypt necessary to execute grantsendMessages to an SSE enabled SQS queue
this.encryptionMasterKey.grantEncryptDecrypt(grantee);
}

return ret;
}

Expand Down Expand Up @@ -234,7 +234,6 @@ export abstract class QueueBase extends Resource implements IQueue {
});
}
}

/**
* Reference to a queue
*/
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-sqs/test/test.sqs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ export = {
},
{
'Action': [
'kms:Decrypt',
'kms:Encrypt',
'kms:ReEncrypt*',
'kms:GenerateDataKey*',
Expand Down