Skip to content

Commit b80fcb5

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into conroy/ecr-repos
2 parents 42ff179 + 06b33d5 commit b80fcb5

429 files changed

Lines changed: 113161 additions & 2541 deletions

File tree

Some content is hidden

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

‎lerna.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"tools/@aws-cdk/pkglint",
1919
"tools/@aws-cdk/pkgtools",
2020
"tools/@aws-cdk/prlint",
21+
"tools/@aws-cdk/spec2cdk",
2122
"tools/@aws-cdk/yarn-cling",
2223
"scripts/@aws-cdk/script-tests"
2324
],

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@types/node": "18.11.19",
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
22-
"cdk-generate-synthetic-examples": "^0.1.269",
22+
"cdk-generate-synthetic-examples": "^0.1.287",
2323
"conventional-changelog-cli": "^2.2.2",
2424
"fs-extra": "^9.1.0",
2525
"graceful-fs": "^4.2.11",
@@ -85,6 +85,7 @@
8585
"tools/@aws-cdk/pkglint",
8686
"tools/@aws-cdk/pkgtools",
8787
"tools/@aws-cdk/prlint",
88+
"tools/@aws-cdk/spec2cdk",
8889
"tools/@aws-cdk/yarn-cling",
8990
"scripts/@aws-cdk/script-tests"
9091
],

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-container-ulimits.d.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/ec2/integ.task-definition-container-ulimits.js‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎packages/@aws-cdk-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/Import-SSM-Parameter.assets.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"0c9f637062451a2002409e9c30b657f39990631000a05a12bef7fcdb73ec5332": {
5+
"source": {
6+
"path": "Import-SSM-Parameter.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "0c9f637062451a2002409e9c30b657f39990631000a05a12bef7fcdb73ec5332.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-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/Import-SSM-Parameter.template.json‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"Resources": {
3+
"StringParameter472EED0E": {
4+
"Type": "AWS::SSM::Parameter",
5+
"Properties": {
6+
"Type": "String",
7+
"Value": "Initial parameter value",
8+
"Name": "import-parameter-test"
9+
}
10+
}
11+
},
12+
"Parameters": {
13+
"ImportedWithNameParameter": {
14+
"Type": "AWS::SSM::Parameter::Value<String>",
15+
"Default": "/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-ebs"
16+
},
17+
"BootstrapVersion": {
18+
"Type": "AWS::SSM::Parameter::Value<String>",
19+
"Default": "/cdk-bootstrap/hnb659fds/version",
20+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
21+
}
22+
},
23+
"Outputs": {
24+
"ImportedWithNameOutput": {
25+
"Value": {
26+
"Ref": "ImportedWithNameParameter"
27+
}
28+
},
29+
"ImportedWithIntrinsicOutput": {
30+
"Value": {
31+
"Fn::Join": [
32+
"",
33+
[
34+
"{{resolve:ssm:",
35+
{
36+
"Ref": "StringParameter472EED0E"
37+
},
38+
"}}"
39+
]
40+
]
41+
}
42+
},
43+
"ImportedWithForceFlagOutput": {
44+
"Value": {
45+
"Fn::Join": [
46+
"",
47+
[
48+
"{{resolve:ssm:",
49+
{
50+
"Ref": "StringParameter472EED0E"
51+
},
52+
"}}"
53+
]
54+
]
55+
}
56+
}
57+
},
58+
"Rules": {
59+
"CheckBootstrapVersion": {
60+
"Assertions": [
61+
{
62+
"Assert": {
63+
"Fn::Not": [
64+
{
65+
"Fn::Contains": [
66+
[
67+
"1",
68+
"2",
69+
"3",
70+
"4",
71+
"5"
72+
],
73+
{
74+
"Ref": "BootstrapVersion"
75+
}
76+
]
77+
}
78+
]
79+
},
80+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
81+
}
82+
]
83+
}
84+
}
85+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"32.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/cdkintegimportssmparameterDefaultTestDeployAssert2A3D6843.assets.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "32.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "cdkintegimportssmparameterDefaultTestDeployAssert2A3D6843.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.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-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/cdkintegimportssmparameterDefaultTestDeployAssert2A3D6843.template.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-ssm/test/integ.import-parameter.js.snapshot/integ.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "32.0.0",
3+
"testCases": {
4+
"cdk-integ-import-ssm-parameter/DefaultTest": {
5+
"stacks": [
6+
"Import-SSM-Parameter"
7+
],
8+
"assertionStack": "cdk-integ-import-ssm-parameter/DefaultTest/DeployAssert",
9+
"assertionStackName": "cdkintegimportssmparameterDefaultTestDeployAssert2A3D6843"
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)