Skip to content

Commit 912e2b8

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.40.0
2 parents 56ba2ab + f593a8e commit 912e2b8

File tree

2,763 files changed

+69261
-66929
lines changed

Some content is hidden

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

2,763 files changed

+69261
-66929
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "17.0.0",
2+
"version": "20.0.0",
33
"files": {
4-
"df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34": {
4+
"4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7": {
55
"source": {
66
"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": "df2531bee6d1a5c15a480c358ebc18e306c13a2c9e3ee55d1116b6ef3c327f34.json",
12+
"objectKey": "4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7.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

+34
Original file line numberDiff line numberDiff line change
@@ -468,5 +468,39 @@
468468
]
469469
}
470470
}
471+
},
472+
"Parameters": {
473+
"BootstrapVersion": {
474+
"Type": "AWS::SSM::Parameter::Value<String>",
475+
"Default": "/cdk-bootstrap/hnb659fds/version",
476+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
477+
}
478+
},
479+
"Rules": {
480+
"CheckBootstrapVersion": {
481+
"Assertions": [
482+
{
483+
"Assert": {
484+
"Fn::Not": [
485+
{
486+
"Fn::Contains": [
487+
[
488+
"1",
489+
"2",
490+
"3",
491+
"4",
492+
"5"
493+
],
494+
{
495+
"Ref": "BootstrapVersion"
496+
}
497+
]
498+
}
499+
]
500+
},
501+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
502+
}
503+
]
504+
}
471505
}
472506
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"17.0.0"}
1+
{"version":"20.0.0"}

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

+38-2
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,43 @@
11
{
2-
"version": "17.0.0",
2+
"version": "20.0.0",
33
"artifacts": {
44
"Tree": {
55
"type": "cdk:tree",
66
"properties": {
77
"file": "tree.json"
88
}
99
},
10+
"CICD.assets": {
11+
"type": "cdk:asset-manifest",
12+
"properties": {
13+
"file": "CICD.assets.json",
14+
"requiresBootstrapStackVersion": 6,
15+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
16+
}
17+
},
1018
"CICD": {
1119
"type": "aws:cloudformation:stack",
1220
"environment": "aws://unknown-account/unknown-region",
1321
"properties": {
1422
"templateFile": "CICD.template.json",
15-
"validateOnSynth": false
23+
"validateOnSynth": false,
24+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
25+
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
26+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4844d07f1e19de1a0f6926b94b9bc19bf4e39bbb14b8511dee5d345f776182c7.json",
27+
"requiresBootstrapStackVersion": 6,
28+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
29+
"additionalDependencies": [
30+
"CICD.assets"
31+
],
32+
"lookupRole": {
33+
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
34+
"requiresBootstrapStackVersion": 8,
35+
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
36+
}
1637
},
38+
"dependencies": [
39+
"CICD.assets"
40+
],
1741
"metadata": {
1842
"/CICD/ArtifactBucket/Resource": [
1943
{
@@ -74,6 +98,18 @@
7498
"type": "aws:cdk:logicalId",
7599
"data": "CodePipelineDeployChangeSetRoleDefaultPolicy289820BE"
76100
}
101+
],
102+
"/CICD/BootstrapVersion": [
103+
{
104+
"type": "aws:cdk:logicalId",
105+
"data": "BootstrapVersion"
106+
}
107+
],
108+
"/CICD/CheckBootstrapVersion": [
109+
{
110+
"type": "aws:cdk:logicalId",
111+
"data": "CheckBootstrapVersion"
112+
}
77113
]
78114
},
79115
"displayName": "CICD"

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"path": "Tree",
1010
"constructInfo": {
1111
"fqn": "constructs.Construct",
12-
"version": "10.0.9"
12+
"version": "10.1.85"
1313
}
1414
},
1515
"CICD": {
@@ -288,13 +288,13 @@
288288
"path": "CICD/CodePipeline/Source/GitHub",
289289
"constructInfo": {
290290
"fqn": "constructs.Construct",
291-
"version": "10.0.9"
291+
"version": "10.1.85"
292292
}
293293
}
294294
},
295295
"constructInfo": {
296296
"fqn": "constructs.Construct",
297-
"version": "10.0.9"
297+
"version": "10.1.85"
298298
}
299299
},
300300
"Deploy": {
@@ -354,7 +354,7 @@
354354
"path": "CICD/CodePipeline/Deploy/Execute/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
355355
"constructInfo": {
356356
"fqn": "constructs.Construct",
357-
"version": "10.0.9"
357+
"version": "10.1.85"
358358
}
359359
},
360360
"DefaultPolicy": {
@@ -433,7 +433,7 @@
433433
},
434434
"constructInfo": {
435435
"fqn": "constructs.Construct",
436-
"version": "10.0.9"
436+
"version": "10.1.85"
437437
}
438438
},
439439
"ChangeSet": {
@@ -489,7 +489,7 @@
489489
"path": "CICD/CodePipeline/Deploy/ChangeSet/CodePipelineActionRole/8389e75f-0810-4838-bf64-d6f85a95cf83",
490490
"constructInfo": {
491491
"fqn": "constructs.Construct",
492-
"version": "10.0.9"
492+
"version": "10.1.85"
493493
}
494494
},
495495
"DefaultPolicy": {
@@ -708,13 +708,13 @@
708708
},
709709
"constructInfo": {
710710
"fqn": "constructs.Construct",
711-
"version": "10.0.9"
711+
"version": "10.1.85"
712712
}
713713
}
714714
},
715715
"constructInfo": {
716716
"fqn": "constructs.Construct",
717-
"version": "10.0.9"
717+
"version": "10.1.85"
718718
}
719719
}
720720
},
@@ -725,14 +725,14 @@
725725
}
726726
},
727727
"constructInfo": {
728-
"fqn": "@aws-cdk/core.Stack",
729-
"version": "0.0.0"
728+
"fqn": "constructs.Construct",
729+
"version": "10.1.85"
730730
}
731731
}
732732
},
733733
"constructInfo": {
734-
"fqn": "@aws-cdk/core.App",
735-
"version": "0.0.0"
734+
"fqn": "constructs.Construct",
735+
"version": "10.1.85"
736736
}
737737
}
738738
}

‎packages/@aws-cdk/aws-amplify/test/app-asset-deployment.integ.snapshot/asset.8c89eadc6be22019c81ed6b9c7d9929ae10de55679fd8e0e9fd4c00f8edc1cda/index.html

-1
This file was deleted.

‎packages/@aws-cdk/aws-amplify/test/app-asset-deployment.integ.snapshot/asset.8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9/framework.js

-164
This file was deleted.

0 commit comments

Comments
 (0)