Skip to content

Commit 4a95875

Browse files
njlynchnjlynch
committed
Updated tests for new actions ordering
1 parent fe524be commit 4a95875

File tree

11 files changed

+58
-58
lines changed

11 files changed

+58
-58
lines changed

‎packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,11 @@ test('if an encryption key is included, decrypt permissions are also added for g
518518
'kms:Disable*',
519519
'kms:Get*',
520520
'kms:Delete*',
521+
'kms:TagResource',
522+
'kms:UntagResource',
521523
'kms:ScheduleKeyDeletion',
522524
'kms:CancelKeyDeletion',
523525
'kms:GenerateDataKey',
524-
'kms:TagResource',
525-
'kms:UntagResource',
526526
],
527527
'Effect': 'Allow',
528528
'Principal': {
@@ -660,11 +660,11 @@ test('if an encryption key is included, encrypt/decrypt permissions are also add
660660
'kms:Disable*',
661661
'kms:Get*',
662662
'kms:Delete*',
663+
'kms:TagResource',
664+
'kms:UntagResource',
663665
'kms:ScheduleKeyDeletion',
664666
'kms:CancelKeyDeletion',
665667
'kms:GenerateDataKey',
666-
'kms:TagResource',
667-
'kms:UntagResource',
668668
],
669669
'Effect': 'Allow',
670670
'Principal': {

‎packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.sse.expected.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"kms:Disable*",
1818
"kms:Get*",
1919
"kms:Delete*",
20+
"kms:TagResource",
21+
"kms:UntagResource",
2022
"kms:ScheduleKeyDeletion",
2123
"kms:CancelKeyDeletion",
22-
"kms:GenerateDataKey",
23-
"kms:TagResource",
24-
"kms:UntagResource"
24+
"kms:GenerateDataKey"
2525
],
2626
"Effect": "Allow",
2727
"Principal": {
@@ -369,11 +369,11 @@
369369
"kms:Disable*",
370370
"kms:Get*",
371371
"kms:Delete*",
372+
"kms:TagResource",
373+
"kms:UntagResource",
372374
"kms:ScheduleKeyDeletion",
373375
"kms:CancelKeyDeletion",
374-
"kms:GenerateDataKey",
375-
"kms:TagResource",
376-
"kms:UntagResource"
376+
"kms:GenerateDataKey"
377377
],
378378
"Effect": "Allow",
379379
"Principal": {
@@ -617,4 +617,4 @@
617617
}
618618
}
619619
}
620-
}
620+
}

‎packages/@aws-cdk/aws-glue/test/table.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,11 @@ test('encrypted table: SSE-KMS (implicitly created key)', () => {
359359
'kms:Disable*',
360360
'kms:Get*',
361361
'kms:Delete*',
362+
'kms:TagResource',
363+
'kms:UntagResource',
362364
'kms:ScheduleKeyDeletion',
363365
'kms:CancelKeyDeletion',
364366
'kms:GenerateDataKey',
365-
'kms:TagResource',
366-
'kms:UntagResource',
367367
],
368368
Effect: 'Allow',
369369
Principal: {
@@ -494,11 +494,11 @@ test('encrypted table: SSE-KMS (explicitly created key)', () => {
494494
'kms:Disable*',
495495
'kms:Get*',
496496
'kms:Delete*',
497+
'kms:TagResource',
498+
'kms:UntagResource',
497499
'kms:ScheduleKeyDeletion',
498500
'kms:CancelKeyDeletion',
499501
'kms:GenerateDataKey',
500-
'kms:TagResource',
501-
'kms:UntagResource',
502502
],
503503
Effect: 'Allow',
504504
Principal: {
@@ -705,11 +705,11 @@ test('encrypted table: CSE-KMS (implicitly created key)', () => {
705705
'kms:Disable*',
706706
'kms:Get*',
707707
'kms:Delete*',
708+
'kms:TagResource',
709+
'kms:UntagResource',
708710
'kms:ScheduleKeyDeletion',
709711
'kms:CancelKeyDeletion',
710712
'kms:GenerateDataKey',
711-
'kms:TagResource',
712-
'kms:UntagResource',
713713
],
714714
Effect: 'Allow',
715715
Principal: {
@@ -821,11 +821,11 @@ test('encrypted table: CSE-KMS (explicitly created key)', () => {
821821
'kms:Disable*',
822822
'kms:Get*',
823823
'kms:Delete*',
824+
'kms:TagResource',
825+
'kms:UntagResource',
824826
'kms:ScheduleKeyDeletion',
825827
'kms:CancelKeyDeletion',
826828
'kms:GenerateDataKey',
827-
'kms:TagResource',
828-
'kms:UntagResource',
829829
],
830830
Effect: 'Allow',
831831
Principal: {
@@ -939,11 +939,11 @@ test('encrypted table: CSE-KMS (explicitly passed bucket and key)', () => {
939939
'kms:Disable*',
940940
'kms:Get*',
941941
'kms:Delete*',
942+
'kms:TagResource',
943+
'kms:UntagResource',
942944
'kms:ScheduleKeyDeletion',
943945
'kms:CancelKeyDeletion',
944946
'kms:GenerateDataKey',
945-
'kms:TagResource',
946-
'kms:UntagResource',
947947
],
948948
Effect: 'Allow',
949949
Principal: {

‎packages/@aws-cdk/aws-kinesis/test/stream.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@ describe('Kinesis data streams', () => {
353353
'kms:Disable*',
354354
'kms:Get*',
355355
'kms:Delete*',
356+
'kms:TagResource',
357+
'kms:UntagResource',
356358
'kms:ScheduleKeyDeletion',
357359
'kms:CancelKeyDeletion',
358360
'kms:GenerateDataKey',
359-
'kms:TagResource',
360-
'kms:UntagResource',
361361
],
362362
Effect: 'Allow',
363363
Principal: {
@@ -436,11 +436,11 @@ describe('Kinesis data streams', () => {
436436
'kms:Disable*',
437437
'kms:Get*',
438438
'kms:Delete*',
439+
'kms:TagResource',
440+
'kms:UntagResource',
439441
'kms:ScheduleKeyDeletion',
440442
'kms:CancelKeyDeletion',
441443
'kms:GenerateDataKey',
442-
'kms:TagResource',
443-
'kms:UntagResource',
444444
],
445445
Effect: 'Allow',
446446
Principal: {
@@ -515,11 +515,11 @@ describe('Kinesis data streams', () => {
515515
'kms:Disable*',
516516
'kms:Get*',
517517
'kms:Delete*',
518+
'kms:TagResource',
519+
'kms:UntagResource',
518520
'kms:ScheduleKeyDeletion',
519521
'kms:CancelKeyDeletion',
520522
'kms:GenerateDataKey',
521-
'kms:TagResource',
522-
'kms:UntagResource',
523523
],
524524
Effect: 'Allow',
525525
Principal: {
@@ -644,11 +644,11 @@ describe('Kinesis data streams', () => {
644644
'kms:Disable*',
645645
'kms:Get*',
646646
'kms:Delete*',
647+
'kms:TagResource',
648+
'kms:UntagResource',
647649
'kms:ScheduleKeyDeletion',
648650
'kms:CancelKeyDeletion',
649651
'kms:GenerateDataKey',
650-
'kms:TagResource',
651-
'kms:UntagResource',
652652
],
653653
Effect: 'Allow',
654654
Principal: {
@@ -768,11 +768,11 @@ describe('Kinesis data streams', () => {
768768
'kms:Disable*',
769769
'kms:Get*',
770770
'kms:Delete*',
771+
'kms:TagResource',
772+
'kms:UntagResource',
771773
'kms:ScheduleKeyDeletion',
772774
'kms:CancelKeyDeletion',
773775
'kms:GenerateDataKey',
774-
'kms:TagResource',
775-
'kms:UntagResource',
776776
],
777777
Effect: 'Allow',
778778
Principal: {

‎packages/@aws-cdk/aws-s3-notifications/test/queue.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ test('if the queue is encrypted with a custom kms key, the key resource policy i
9292
'kms:Disable*',
9393
'kms:Get*',
9494
'kms:Delete*',
95+
'kms:TagResource',
96+
'kms:UntagResource',
9597
'kms:ScheduleKeyDeletion',
9698
'kms:CancelKeyDeletion',
9799
'kms:GenerateDataKey',
98-
'kms:TagResource',
99-
'kms:UntagResource',
100100
],
101101
Effect: 'Allow',
102102
Principal: {

‎packages/@aws-cdk/aws-s3-notifications/test/sqs/integ.bucket-notifications.expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,11 @@
263263
"kms:Disable*",
264264
"kms:Get*",
265265
"kms:Delete*",
266+
"kms:TagResource",
267+
"kms:UntagResource",
266268
"kms:ScheduleKeyDeletion",
267269
"kms:CancelKeyDeletion",
268-
"kms:GenerateDataKey",
269-
"kms:TagResource",
270-
"kms:UntagResource"
270+
"kms:GenerateDataKey"
271271
],
272272
"Effect": "Allow",
273273
"Principal": {
@@ -386,4 +386,4 @@
386386
}
387387
}
388388
}
389-
}
389+
}

‎packages/@aws-cdk/aws-s3/test/bucket.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,11 @@ nodeunitShim({
273273
'kms:Disable*',
274274
'kms:Get*',
275275
'kms:Delete*',
276+
'kms:TagResource',
277+
'kms:UntagResource',
276278
'kms:ScheduleKeyDeletion',
277279
'kms:CancelKeyDeletion',
278280
'kms:GenerateDataKey',
279-
'kms:TagResource',
280-
'kms:UntagResource',
281281
],
282282
'Effect': 'Allow',
283283
'Principal': {
@@ -883,8 +883,8 @@ nodeunitShim({
883883
'Statement': [
884884
{
885885
'Action': ['kms:Create*', 'kms:Describe*', 'kms:Enable*', 'kms:List*', 'kms:Put*', 'kms:Update*',
886-
'kms:Revoke*', 'kms:Disable*', 'kms:Get*', 'kms:Delete*', 'kms:ScheduleKeyDeletion', 'kms:CancelKeyDeletion',
887-
'kms:GenerateDataKey', 'kms:TagResource', 'kms:UntagResource'],
886+
'kms:Revoke*', 'kms:Disable*', 'kms:Get*', 'kms:Delete*', 'kms:TagResource', 'kms:UntagResource',
887+
'kms:ScheduleKeyDeletion', 'kms:CancelKeyDeletion', 'kms:GenerateDataKey'],
888888
'Effect': 'Allow',
889889
'Principal': {
890890
'AWS': {
@@ -937,11 +937,11 @@ nodeunitShim({
937937
'kms:Disable*',
938938
'kms:Get*',
939939
'kms:Delete*',
940+
'kms:TagResource',
941+
'kms:UntagResource',
940942
'kms:ScheduleKeyDeletion',
941943
'kms:CancelKeyDeletion',
942944
'kms:GenerateDataKey',
943-
'kms:TagResource',
944-
'kms:UntagResource',
945945
],
946946
'Effect': 'Allow',
947947
'Principal': {
@@ -1112,11 +1112,11 @@ nodeunitShim({
11121112
'kms:Disable*',
11131113
'kms:Get*',
11141114
'kms:Delete*',
1115+
'kms:TagResource',
1116+
'kms:UntagResource',
11151117
'kms:ScheduleKeyDeletion',
11161118
'kms:CancelKeyDeletion',
11171119
'kms:GenerateDataKey',
1118-
'kms:TagResource',
1119-
'kms:UntagResource',
11201120
],
11211121
'Effect': 'Allow',
11221122
'Principal': {

‎packages/@aws-cdk/aws-s3/test/integ.bucket-grantdelete-kms.expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"kms:Disable*",
1818
"kms:Get*",
1919
"kms:Delete*",
20+
"kms:TagResource",
21+
"kms:UntagResource",
2022
"kms:ScheduleKeyDeletion",
2123
"kms:CancelKeyDeletion",
22-
"kms:GenerateDataKey",
23-
"kms:TagResource",
24-
"kms:UntagResource"
24+
"kms:GenerateDataKey"
2525
],
2626
"Effect": "Allow",
2727
"Principal": {
@@ -112,4 +112,4 @@
112112
"DeletionPolicy": "Retain"
113113
}
114114
}
115-
}
115+
}

‎packages/@aws-cdk/aws-s3/test/integ.bucket.expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"kms:Disable*",
1818
"kms:Get*",
1919
"kms:Delete*",
20+
"kms:TagResource",
21+
"kms:UntagResource",
2022
"kms:ScheduleKeyDeletion",
2123
"kms:CancelKeyDeletion",
22-
"kms:GenerateDataKey",
23-
"kms:TagResource",
24-
"kms:UntagResource"
24+
"kms:GenerateDataKey"
2525
],
2626
"Effect": "Allow",
2727
"Principal": {
@@ -208,4 +208,4 @@
208208
}
209209
}
210210
}
211-
}
211+
}

‎packages/@aws-cdk/aws-ses-actions/test/actions.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ test('add s3 action', () => {
238238
'kms:Disable*',
239239
'kms:Get*',
240240
'kms:Delete*',
241+
'kms:TagResource',
242+
'kms:UntagResource',
241243
'kms:ScheduleKeyDeletion',
242244
'kms:CancelKeyDeletion',
243245
'kms:GenerateDataKey',
244-
'kms:TagResource',
245-
'kms:UntagResource',
246246
],
247247
Effect: 'Allow',
248248
Principal: {

0 commit comments

Comments
 (0)