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.

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

fix(sqs): do not emit grants to the AWS-managed encryption key #3169

Merged
merged 8 commits into from
Aug 5, 2019
Merged

fix(sqs): do not emit grants to the AWS-managed encryption key #3169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
348d28f
fix(sqs): Do not emit grants to the AWS-managed encryption key
RomainMuller Jul 2, 2019
26399db
Merge branch 'master' into rmuller/issue2794
RomainMuller Jul 8, 2019
58c040f
remove test that is bound to fail
RomainMuller Jul 8, 2019
ad56d85
Merge branch 'master' into rmuller/issue2794
RomainMuller Jul 8, 2019
aa3b9b7
Merge branch 'master' into rmuller/issue2794
NGL321 Aug 1, 2019
09a29e1
Fixup test outcomes
RomainMuller Aug 5, 2019
9ad1e27
Merge remote-tracking branch 'origin/master' into rmuller/issue2794
RomainMuller Aug 5, 2019
afa8431
fix test expectations
RomainMuller Aug 5, 2019
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
3 changes: 0 additions & 3 deletions packages/@aws-cdk/aws-sqs/lib/queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,7 @@ export class Queue extends QueueBase {
}

if (encryption === QueueEncryption.KMS_MANAGED) {
const masterKey = kms.Key.fromKeyArn(this, 'Key', 'alias/aws/sqs');

return {
encryptionMasterKey: masterKey,
encryptionProps: {
kmsMasterKeyId: 'alias/aws/sqs',
kmsDataKeyReusePeriodSeconds: props.dataKeyReuse && props.dataKeyReuse.toSeconds()
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/aws-sqs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^0.36.1",
"@aws-cdk/aws-kms": "^0.36.1",
"@aws-cdk/aws-s3": "^0.36.1",
"aws-sdk": "^2.438.0",
"cdk-build-tools": "^0.36.1",
Expand Down
175 changes: 174 additions & 1 deletion packages/@aws-cdk/aws-sqs/test/integ.sqs.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Queue4A7E3555": {
"Type": "AWS::SQS::Queue",
"Properties": {
"KmsMasterKeyId": "alias/aws/sqs",
"RedrivePolicy": {
"deadLetterTargetArn": {
"Fn::GetAtt": [
Expand All @@ -17,10 +18,182 @@
}
}
},
"EncryptionKey1B843E66": {
"Type": "AWS::KMS::Key",
"Properties": {
"KeyPolicy": {
"Statement": [
{
"Action": [
"kms:Create*",
"kms:Describe*",
"kms:Enable*",
"kms:List*",
"kms:Put*",
"kms:Update*",
"kms:Revoke*",
"kms:Disable*",
"kms:Get*",
"kms:Delete*",
"kms:ScheduleKeyDeletion",
"kms:CancelKeyDeletion"
],
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::",
{
"Ref": "AWS::AccountId"
},
":root"
]
]
}
},
"Resource": "*"
},
{
"Action": "kms:Decrypt",
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::GetAtt": [
"Role1ABCC5F0",
"Arn"
]
}
},
"Resource": "*"
}
],
"Version": "2012-10-17"
}
},
"DeletionPolicy": "Delete"
},
"FifoQueueE5FF7273": {
"Type": "AWS::SQS::Queue",
"Properties": {
"FifoQueue": true
"FifoQueue": true,
"KmsMasterKeyId": {
"Fn::GetAtt": [
"EncryptionKey1B843E66",
"Arn"
]
}
}
},
"Role1ABCC5F0": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"AWS": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::",
{
"Ref": "AWS::AccountId"
},
":root"
]
]
}
}
}
],
"Version": "2012-10-17"
}
}
},
"RoleDefaultPolicy5FFB7DAB": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"sqs:ReceiveMessage",
"sqs:ChangeMessageVisibility",
"sqs:GetQueueUrl",
"sqs:DeleteMessage",
"sqs:GetQueueAttributes"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"DeadLetterQueue9F481546",
"Arn"
]
}
},
{
"Action": [
"sqs:ReceiveMessage",
"sqs:ChangeMessageVisibility",
"sqs:GetQueueUrl",
"sqs:DeleteMessage",
"sqs:GetQueueAttributes"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"Queue4A7E3555",
"Arn"
]
}
},
{
"Action": [
"sqs:ReceiveMessage",
"sqs:ChangeMessageVisibility",
"sqs:GetQueueUrl",
"sqs:DeleteMessage",
"sqs:GetQueueAttributes"
],
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"FifoQueueE5FF7273",
"Arn"
]
}
},
{
"Action": "kms:Decrypt",
"Effect": "Allow",
"Resource": {
"Fn::GetAtt": [
"EncryptionKey1B843E66",
"Arn"
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "RoleDefaultPolicy5FFB7DAB",
"Roles": [
{
"Ref": "Role1ABCC5F0"
}
]
}
}
},
Expand Down
21 changes: 16 additions & 5 deletions packages/@aws-cdk/aws-sqs/test/integ.sqs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
import { App, CfnOutput, Stack } from '@aws-cdk/core';
import { Queue } from '../lib';
import { AccountRootPrincipal, Role } from '@aws-cdk/aws-iam';
import { Key } from '@aws-cdk/aws-kms';
import { App, CfnOutput, RemovalPolicy, Stack } from '@aws-cdk/core';
import { Queue, QueueEncryption } from '../lib';

const app = new App();

const stack = new Stack(app, 'aws-cdk-sqs');

const dlq = new Queue(stack, 'DeadLetterQueue');
const queue = new Queue(stack, 'Queue', {
deadLetterQueue: { queue: dlq, maxReceiveCount: 5 }
deadLetterQueue: { queue: dlq, maxReceiveCount: 5 },
encryption: QueueEncryption.KMS_MANAGED,
});
const fifo = new Queue(stack, 'FifoQueue', {
fifo: true,
encryptionMasterKey: new Key(stack, 'EncryptionKey', { removalPolicy: RemovalPolicy.DESTROY })
});

new Queue(stack, 'FifoQueue', {
fifo: true
const role = new Role(stack, 'Role', {
assumedBy: new AccountRootPrincipal(),
});

dlq.grantConsumeMessages(role);
queue.grantConsumeMessages(role);
fifo.grantConsumeMessages(role);

new CfnOutput(stack, 'QueueUrl', { value: queue.queueUrl });

app.synth();