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

Jump to bottom

feat(s3): default to KMS if encryptionKey is specified #2719

Merged
merged 1 commit into from
Jun 3, 2019
Merged

feat(s3): default to KMS if encryptionKey is specified #2719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions packages/@aws-cdk/aws-s3/lib/bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ export interface BucketProps {
* If you choose KMS, you can specify a KMS key via `encryptionKey`. If
* encryption key is not specified, a key will automatically be created.
*
* @default BucketEncryption.Unencrypted
* @default - `Kms` if `encryptionKey` is specified, or `Unencrypted` otherwise.
*/
readonly encryption?: BucketEncryption;

Expand Down Expand Up @@ -934,8 +934,11 @@ export class Bucket extends BucketBase {
encryptionKey?: kms.IKey
} {

// default to unencrypted.
const encryptionType = props.encryption || BucketEncryption.Unencrypted;
// default based on whether encryptionKey is specified
let encryptionType = props.encryption;
if (encryptionType === undefined) {
encryptionType = props.encryptionKey ? BucketEncryption.Kms : BucketEncryption.Unencrypted;
}

// if encryption key is set, encryption must be set to KMS.
if (encryptionType !== BucketEncryption.Kms && props.encryptionKey) {
Expand Down
10 changes: 10 additions & 0 deletions packages/@aws-cdk/aws-s3/test/test.bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,4 +1370,14 @@ export = {
});
test.done();
},

'if a kms key is specified, it implies bucket is encrypted with kms (dah)'(test: Test) {
// GIVEN
const stack = new Stack();
const key = new kms.Key(stack, 'k');

// THEN
new Bucket(stack, 'b', { encryptionKey: key });
test.done();
}
};