Skip to content

chore: prepare tests to expire feature flag 'kms:defaultKeyPolicies' #12922

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 11 commits into from
Feb 10, 2021
Merged

chore: prepare tests to expire feature flag 'kms:defaultKeyPolicies' #12922

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
daf1f41
chore(s3):
Feb 8, 2021
30ae6d9
check key exists
Feb 8, 2021
405a6a3
fix glue unit tests
Feb 8, 2021
81d5ed1
fix kinesis unit test
Feb 8, 2021
47aed20
remove legacy behaviour from s3 bucket unit test
Feb 9, 2021
62ebe1c
Update packages/@aws-cdk/aws-kinesis/test/stream.test.ts
Feb 9, 2021
2dd129d
Merge branch 'master' into nija-at/s3-kmskey
Feb 9, 2021
c81012f
Merge branch 'master' into nija-at/s3-kmskey
Feb 9, 2021
5cc5137
Merge branch 'master' into nija-at/s3-kmskey
mergify[bot] Feb 9, 2021
054c413
Merge branch 'master' into nija-at/s3-kmskey
Feb 10, 2021
8396ee9
Merge branch 'master' into nija-at/s3-kmskey
mergify[bot] Feb 10, 2021
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
238 changes: 13 additions & 225 deletions packages/@aws-cdk/aws-glue/test/table.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,50 +345,6 @@ test('encrypted table: SSE-KMS (implicitly created key)', () => {
equal(table.encryptionKey, table.bucket.encryptionKey);

cdkExpect(stack).to(haveResource('AWS::KMS::Key', {
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',
'kms:GenerateDataKey',
'kms:TagResource',
'kms:UntagResource',
],
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
],
Version: '2012-10-17',
},
Description: 'Created by Default/Table/Bucket',
}));

Expand Down Expand Up @@ -462,7 +418,9 @@ test('encrypted table: SSE-KMS (explicitly created key)', () => {
const database = new glue.Database(stack, 'Database', {
databaseName: 'database',
});
const encryptionKey = new kms.Key(stack, 'MyKey');
const encryptionKey = new kms.Key(stack, 'MyKey', {
description: 'OurKey',
});

const table = new glue.Table(stack, 'Table', {
database,
Expand All @@ -480,50 +438,7 @@ test('encrypted table: SSE-KMS (explicitly created key)', () => {
notEqual(table.encryptionKey, undefined);

cdkExpect(stack).to(haveResource('AWS::KMS::Key', {
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',
'kms:GenerateDataKey',
'kms:TagResource',
'kms:UntagResource',
],
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
],
Version: '2012-10-17',
},
Description: 'OurKey',
}));

cdkExpect(stack).to(haveResource('AWS::S3::Bucket', {
Expand Down Expand Up @@ -690,52 +605,7 @@ test('encrypted table: CSE-KMS (implicitly created key)', () => {
notEqual(table.encryptionKey, undefined);
equal(table.bucket.encryptionKey, undefined);

cdkExpect(stack).to(haveResource('AWS::KMS::Key', {
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',
'kms:GenerateDataKey',
'kms:TagResource',
'kms:UntagResource',
],
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
],
Version: '2012-10-17',
},
}));
cdkExpect(stack).to(haveResource('AWS::KMS::Key'));

cdkExpect(stack).to(haveResource('AWS::Glue::Table', {
CatalogId: {
Expand Down Expand Up @@ -789,7 +659,9 @@ test('encrypted table: CSE-KMS (explicitly created key)', () => {
const database = new glue.Database(stack, 'Database', {
databaseName: 'database',
});
const encryptionKey = new kms.Key(stack, 'MyKey');
const encryptionKey = new kms.Key(stack, 'MyKey', {
description: 'MyKey',
});

const table = new glue.Table(stack, 'Table', {
database,
Expand All @@ -807,50 +679,7 @@ test('encrypted table: CSE-KMS (explicitly created key)', () => {
equal(table.bucket.encryptionKey, undefined);

cdkExpect(stack).to(haveResource('AWS::KMS::Key', {
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',
'kms:GenerateDataKey',
'kms:TagResource',
'kms:UntagResource',
],
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
],
Version: '2012-10-17',
},
Description: 'MyKey',
}));

cdkExpect(stack).to(haveResource('AWS::Glue::Table', {
Expand Down Expand Up @@ -906,7 +735,9 @@ test('encrypted table: CSE-KMS (explicitly passed bucket and key)', () => {
databaseName: 'database',
});
const bucket = new s3.Bucket(stack, 'Bucket');
const encryptionKey = new kms.Key(stack, 'MyKey');
const encryptionKey = new kms.Key(stack, 'MyKey', {
description: 'MyKey',
});

const table = new glue.Table(stack, 'Table', {
database,
Expand All @@ -925,50 +756,7 @@ test('encrypted table: CSE-KMS (explicitly passed bucket and key)', () => {
equal(table.bucket.encryptionKey, undefined);

cdkExpect(stack).to(haveResource('AWS::KMS::Key', {
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',
'kms:GenerateDataKey',
'kms:TagResource',
'kms:UntagResource',
],
Effect: 'Allow',
Principal: {
AWS: {
'Fn::Join': [
'',
[
'arn:',
{
Ref: 'AWS::Partition',
},
':iam::',
{
Ref: 'AWS::AccountId',
},
':root',
],
],
},
},
Resource: '*',
},
],
Version: '2012-10-17',
},
Description: 'MyKey',
}));

cdkExpect(stack).to(haveResource('AWS::Glue::Table', {
Expand Down
Loading