Skip to content

Commit 676c7b8

Browse files
corymhallcorymhall
committed
fixing v2 snapshots
1 parent eb28666 commit 676c7b8

File tree

1,045 files changed

+21003
-50066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,045 files changed

+21003
-50066
lines changed

‎packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.assets.json renamed to ‎packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/CICD.assets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "17.0.0",
33
"files": {
4-
"b92001398a72048e88383894de1c7b330a172b541bbbbf24764adf16ec0151d0": {
4+
"df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34": {
55
"source": {
6-
"path": "PipelineStack.template.json",
6+
"path": "CICD.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "b92001398a72048e88383894de1c7b330a172b541bbbbf24764adf16ec0151d0.json",
12+
"objectKey": "df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/CICD.template.json

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@
2929
"Statement": [
3030
{
3131
"Action": [
32-
"s3:GetObject*",
32+
"s3:Abort*",
33+
"s3:DeleteObject*",
3334
"s3:GetBucket*",
35+
"s3:GetObject*",
3436
"s3:List*",
35-
"s3:DeleteObject*",
36-
"s3:PutObject*",
37-
"s3:Abort*"
37+
"s3:PutObject",
38+
"s3:PutObjectLegalHold",
39+
"s3:PutObjectRetention",
40+
"s3:PutObjectTagging",
41+
"s3:PutObjectVersionTagging"
3842
],
3943
"Effect": "Allow",
4044
"Resource": [
@@ -63,22 +67,20 @@
6367
{
6468
"Action": "sts:AssumeRole",
6569
"Effect": "Allow",
66-
"Resource": {
67-
"Fn::GetAtt": [
68-
"CodePipelineDeployExecuteCodePipelineActionRoleAE36AF49",
69-
"Arn"
70-
]
71-
}
72-
},
73-
{
74-
"Action": "sts:AssumeRole",
75-
"Effect": "Allow",
76-
"Resource": {
77-
"Fn::GetAtt": [
78-
"CodePipelineDeployChangeSetCodePipelineActionRoleB3BCDD8A",
79-
"Arn"
80-
]
81-
}
70+
"Resource": [
71+
{
72+
"Fn::GetAtt": [
73+
"CodePipelineDeployChangeSetCodePipelineActionRoleB3BCDD8A",
74+
"Arn"
75+
]
76+
},
77+
{
78+
"Fn::GetAtt": [
79+
"CodePipelineDeployExecuteCodePipelineActionRoleAE36AF49",
80+
"Arn"
81+
]
82+
}
83+
]
8284
}
8385
],
8486
"Version": "2012-10-17"
@@ -330,8 +332,8 @@
330332
},
331333
{
332334
"Action": [
333-
"s3:GetObject*",
334335
"s3:GetBucket*",
336+
"s3:GetObject*",
335337
"s3:List*"
336338
],
337339
"Effect": "Allow",
@@ -427,8 +429,8 @@
427429
"Statement": [
428430
{
429431
"Action": [
430-
"s3:GetObject*",
431432
"s3:GetBucket*",
433+
"s3:GetObject*",
432434
"s3:List*"
433435
],
434436
"Effect": "Allow",

‎packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/manifest.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"type": "cdk:tree",
66
"properties": {
77
"file": "tree.json"
8-
},
9-
"metadata": {}
8+
}
109
},
1110
"CICD": {
1211
"type": "aws:cloudformation:stack",

‎packages/@aws-cdk/app-delivery/test/cicd.integ.snapshot/tree.json

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"id": "Tree",
99
"path": "Tree",
1010
"constructInfo": {
11-
"fqn": "@aws-cdk/core.Construct",
12-
"version": "0.0.0"
11+
"fqn": "constructs.Construct",
12+
"version": "10.0.9"
1313
}
1414
},
1515
"CICD": {
@@ -85,12 +85,16 @@
8585
"Statement": [
8686
{
8787
"Action": [
88-
"s3:GetObject*",
88+
"s3:Abort*",
89+
"s3:DeleteObject*",
8990
"s3:GetBucket*",
91+
"s3:GetObject*",
9092
"s3:List*",
91-
"s3:DeleteObject*",
92-
"s3:PutObject*",
93-
"s3:Abort*"
93+
"s3:PutObject",
94+
"s3:PutObjectLegalHold",
95+
"s3:PutObjectRetention",
96+
"s3:PutObjectTagging",
97+
"s3:PutObjectVersionTagging"
9498
],
9599
"Effect": "Allow",
96100
"Resource": [
@@ -119,22 +123,20 @@
119123
{
120124
"Action": "sts:AssumeRole",
121125
"Effect": "Allow",
122-
"Resource": {
123-
"Fn::GetAtt": [
124-
"CodePipelineDeployExecuteCodePipelineActionRoleAE36AF49",
125-
"Arn"
126-
]
127-
}
128-
},
129-
{
130-
"Action": "sts:AssumeRole",
131-
"Effect": "Allow",
132-
"Resource": {
133-
"Fn::GetAtt": [
134-
"CodePipelineDeployChangeSetCodePipelineActionRoleB3BCDD8A",
135-
"Arn"
136-
]
137-
}
126+
"Resource": [
127+
{
128+
"Fn::GetAtt": [
129+
"CodePipelineDeployChangeSetCodePipelineActionRoleB3BCDD8A",
130+
"Arn"
131+
]
132+
},
133+
{
134+
"Fn::GetAtt": [
135+
"CodePipelineDeployExecuteCodePipelineActionRoleAE36AF49",
136+
"Arn"
137+
]
138+
}
139+
]
138140
}
139141
],
140142
"Version": "2012-10-17"
@@ -285,14 +287,14 @@
285287
"id": "GitHub",
286288
"path": "CICD/CodePipeline/Source/GitHub",
287289
"constructInfo": {
288-
"fqn": "@aws-cdk/core.Construct",
289-
"version": "0.0.0"
290+
"fqn": "constructs.Construct",
291+
"version": "10.0.9"
290292
}
291293
}
292294
},
293295
"constructInfo": {
294-
"fqn": "@aws-cdk/core.Construct",
295-
"version": "0.0.0"
296+
"fqn": "constructs.Construct",
297+
"version": "10.0.9"
296298
}
297299
},
298300
"Deploy": {
@@ -351,8 +353,8 @@
351353
"id": "8389e75f-0810-4838-bf64-d6f85a95cf83",
352354
"path": "CICD/CodePipeline/Deploy/Execute/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
353355
"constructInfo": {
354-
"fqn": "@aws-cdk/core.Construct",
355-
"version": "0.0.0"
356+
"fqn": "constructs.Construct",
357+
"version": "10.0.9"
356358
}
357359
},
358360
"DefaultPolicy": {
@@ -430,8 +432,8 @@
430432
}
431433
},
432434
"constructInfo": {
433-
"fqn": "@aws-cdk/core.Construct",
434-
"version": "0.0.0"
435+
"fqn": "constructs.Construct",
436+
"version": "10.0.9"
435437
}
436438
},
437439
"ChangeSet": {
@@ -486,8 +488,8 @@
486488
"id": "8389e75f-0810-4838-bf64-d6f85a95cf83",
487489
"path": "CICD/CodePipeline/Deploy/ChangeSet/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
488490
"constructInfo": {
489-
"fqn": "@aws-cdk/core.Construct",
490-
"version": "0.0.0"
491+
"fqn": "constructs.Construct",
492+
"version": "10.0.9"
491493
}
492494
},
493495
"DefaultPolicy": {
@@ -514,8 +516,8 @@
514516
},
515517
{
516518
"Action": [
517-
"s3:GetObject*",
518519
"s3:GetBucket*",
520+
"s3:GetObject*",
519521
"s3:List*"
520522
],
521523
"Effect": "Allow",
@@ -647,8 +649,8 @@
647649
"Statement": [
648650
{
649651
"Action": [
650-
"s3:GetObject*",
651652
"s3:GetBucket*",
653+
"s3:GetObject*",
652654
"s3:List*"
653655
],
654656
"Effect": "Allow",
@@ -705,14 +707,14 @@
705707
}
706708
},
707709
"constructInfo": {
708-
"fqn": "@aws-cdk/core.Construct",
709-
"version": "0.0.0"
710+
"fqn": "constructs.Construct",
711+
"version": "10.0.9"
710712
}
711713
}
712714
},
713715
"constructInfo": {
714-
"fqn": "@aws-cdk/core.Construct",
715-
"version": "0.0.0"
716+
"fqn": "constructs.Construct",
717+
"version": "10.0.9"
716718
}
717719
}
718720
},

‎packages/@aws-cdk/aws-apigateway/test/restapi.integ.snapshot/manifest.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"type": "cdk:tree",
66
"properties": {
77
"file": "tree.json"
8-
},
9-
"metadata": {}
8+
}
109
},
1110
"test-apigateway-restapi": {
1211
"type": "aws:cloudformation:stack",
@@ -160,10 +159,10 @@
160159
"data": "myapiUsagePlan56F9C4F2"
161160
}
162161
],
163-
"/test-apigateway-restapi/my-api/UsagePlan/UsagePlanKeyResource": [
162+
"/test-apigateway-restapi/my-api/UsagePlan/UsagePlanKeyResource:testapigatewayrestapimyapiApiKeyC43601CB": [
164163
{
165164
"type": "aws:cdk:logicalId",
166-
"data": "myapiUsagePlanUsagePlanKeyResource050D133F"
165+
"data": "myapiUsagePlanUsagePlanKeyResourcetestapigatewayrestapimyapiApiKeyC43601CB600D112D"
167166
}
168167
],
169168
"/test-apigateway-restapi/MyHandler/ServiceRole/Resource": [
@@ -177,6 +176,15 @@
177176
"type": "aws:cdk:logicalId",
178177
"data": "MyHandler6B74D312"
179178
}
179+
],
180+
"myapiUsagePlanUsagePlanKeyResource050D133F": [
181+
{
182+
"type": "aws:cdk:logicalId",
183+
"data": "myapiUsagePlanUsagePlanKeyResource050D133F",
184+
"trace": [
185+
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
186+
]
187+
}
180188
]
181189
},
182190
"displayName": "test-apigateway-restapi"

‎packages/@aws-cdk/aws-apigateway/test/restapi.integ.snapshot/test-apigateway-restapi.assets.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "17.0.0",
3+
"files": {
4+
"91e92be1c45d9307b8ecc9cc21f05824a2bec4293e94cd55e3603934c966abed": {
5+
"source": {
6+
"path": "test-apigateway-restapi.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "91e92be1c45d9307b8ecc9cc21f05824a2bec4293e94cd55e3603934c966abed.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk/aws-apigateway/test/restapi.integ.snapshot/test-apigateway-restapi.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"UsagePlanName": "Basic"
607607
}
608608
},
609-
"myapiUsagePlanUsagePlanKeyResource050D133F": {
609+
"myapiUsagePlanUsagePlanKeyResourcetestapigatewayrestapimyapiApiKeyC43601CB600D112D": {
610610
"Type": "AWS::ApiGateway::UsagePlanKey",
611611
"Properties": {
612612
"KeyId": {

‎packages/@aws-cdk/aws-apigateway/test/restapi.integ.snapshot/tree.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"id": "Tree",
99
"path": "Tree",
1010
"constructInfo": {
11-
"fqn": "@aws-cdk/core.Construct",
12-
"version": "0.0.0"
11+
"fqn": "constructs.Construct",
12+
"version": "10.0.9"
1313
}
1414
},
1515
"test-apigateway-restapi": {
@@ -952,9 +952,9 @@
952952
"version": "0.0.0"
953953
}
954954
},
955-
"UsagePlanKeyResource": {
956-
"id": "UsagePlanKeyResource",
957-
"path": "test-apigateway-restapi/my-api/UsagePlan/UsagePlanKeyResource",
955+
"UsagePlanKeyResource:testapigatewayrestapimyapiApiKeyC43601CB": {
956+
"id": "UsagePlanKeyResource:testapigatewayrestapimyapiApiKeyC43601CB",
957+
"path": "test-apigateway-restapi/my-api/UsagePlan/UsagePlanKeyResource:testapigatewayrestapimyapiApiKeyC43601CB",
958958
"attributes": {
959959
"aws:cdk:cloudformation:type": "AWS::ApiGateway::UsagePlanKey",
960960
"aws:cdk:cloudformation:props": {

‎packages/@aws-cdk/aws-apigateway/test/usage-plan.multikey.integ.snapshot/manifest.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"type": "cdk:tree",
66
"properties": {
77
"file": "tree.json"
8-
},
9-
"metadata": {}
8+
}
109
},
1110
"test-apigateway-usageplan-multikey": {
1211
"type": "aws:cloudformation:stack",
@@ -22,10 +21,10 @@
2221
"data": "myusageplan4B391740"
2322
}
2423
],
25-
"/test-apigateway-usageplan-multikey/myusageplan/UsagePlanKeyResource": [
24+
"/test-apigateway-usageplan-multikey/myusageplan/UsagePlanKeyResource:testapigatewayusageplanmultikeymyapikey1DDABC389": [
2625
{
2726
"type": "aws:cdk:logicalId",
28-
"data": "myusageplanUsagePlanKeyResource095B4EA9"
27+
"data": "myusageplanUsagePlanKeyResourcetestapigatewayusageplanmultikeymyapikey1DDABC389A2809A73"
2928
}
3029
],
3130
"/test-apigateway-usageplan-multikey/myusageplan/UsagePlanKeyResource:testapigatewayusageplanmultikeymyapikey29D6460C6": [
@@ -45,6 +44,15 @@
4544
"type": "aws:cdk:logicalId",
4645
"data": "myapikey250C8F11B"
4746
}
47+
],
48+
"myusageplanUsagePlanKeyResource095B4EA9": [
49+
{
50+
"type": "aws:cdk:logicalId",
51+
"data": "myusageplanUsagePlanKeyResource095B4EA9",
52+
"trace": [
53+
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
54+
]
55+
}
4856
]
4957
},
5058
"displayName": "test-apigateway-usageplan-multikey"

0 commit comments

Comments
 (0)