Skip to content

Commit 4e0d726

Browse files
authored
2 parents f7c792f + 222d5f8 commit 4e0d726

File tree

1,142 files changed

+30222
-15966
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,142 files changed

+30222
-15966
lines changed

.github/workflows/cr-checklist.yml

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

.github/workflows/cr-mapping.json

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

.github/workflows/issue-label-assign.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,5 +281,6 @@ env:
281281
{"area":"@aws-cdk/aws-aps","keywords":["aps","aws-aps","prometheus"],"labels":["@aws-cdk/aws-aps"]},
282282
{"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"]},
283283
{"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"]},
284-
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]}
284+
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
285+
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]}
285286
]

CHANGELOG.v2.alpha.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.85.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.84.0-alpha.0...v2.85.0-alpha.0) (2023-06-21)
6+
7+
8+
### Features
9+
10+
* **app-staging-synthesizer:** clean up staging resources on deletion ([#25906](https://github.com/aws/aws-cdk/issues/25906)) ([3b14213](https://github.com/aws/aws-cdk/commit/3b142136524db7c1e9bff1a082b87219ea9ee1ff)), closes [#25722](https://github.com/aws/aws-cdk/issues/25722)
11+
* **batch:** `ephemeralStorage` property on job definitions ([#25399](https://github.com/aws/aws-cdk/issues/25399)) ([a8768f4](https://github.com/aws/aws-cdk/commit/a8768f4da1bebbc4fd45b40e92ed82e868bb2a1b)), closes [#25393](https://github.com/aws/aws-cdk/issues/25393)
12+
13+
14+
### Bug Fixes
15+
16+
* **apprunner:** incorrect serviceName ([#26015](https://github.com/aws/aws-cdk/issues/26015)) ([ad89f01](https://github.com/aws/aws-cdk/commit/ad89f0182e218eee01b0aef84b055a96556dda59)), closes [#26002](https://github.com/aws/aws-cdk/issues/26002)
17+
518
## [2.84.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.83.1-alpha.0...v2.84.0-alpha.0) (2023-06-13)
619

720

CHANGELOG.v2.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.85.0](https://github.com/aws/aws-cdk/compare/v2.84.0...v2.85.0) (2023-06-21)
6+
7+
8+
### Features
9+
10+
* **cfnspec:** cloudformation spec v126.0.0 ([#25918](https://github.com/aws/aws-cdk/issues/25918)) ([757fba9](https://github.com/aws/aws-cdk/commit/757fba9b7c71ee500446ab118cabc37037613333))
11+
* **cfnspec:** cloudformation spec v127.0.0 ([#26009](https://github.com/aws/aws-cdk/issues/26009)) ([4e57a8c](https://github.com/aws/aws-cdk/commit/4e57a8cbaa0bcd160976c4fa7d35485154109a7e))
12+
* **core:** add option to suppress indentation in templates ([#25892](https://github.com/aws/aws-cdk/issues/25892)) ([b705956](https://github.com/aws/aws-cdk/commit/b70595686e0742691bf64ce80bd18ea26694400d)), closes [#18694](https://github.com/aws/aws-cdk/issues/18694) [#8712](https://github.com/aws/aws-cdk/issues/8712) [#19656](https://github.com/aws/aws-cdk/issues/19656)
13+
* **ec2:** add addSecurityGroup method to launth template ([#25697](https://github.com/aws/aws-cdk/issues/25697)) ([28df618](https://github.com/aws/aws-cdk/commit/28df61866096829d2dd87e9174724764649f2524)), closes [/github.com/aws/aws-cdk/issues/18712#issuecomment-1026975615](https://github.com/aws//github.com/aws/aws-cdk/issues/18712/issues/issuecomment-1026975615) [#18712](https://github.com/aws/aws-cdk/issues/18712)
14+
* **s3-deployment:** create `DeployTimeSubstitutedFile` to allow substitutions in file ([#25876](https://github.com/aws/aws-cdk/issues/25876)) ([ca2e6a2](https://github.com/aws/aws-cdk/commit/ca2e6a255b20a54f93babc218abdc5102e95080a)), closes [#1461](https://github.com/aws/aws-cdk/issues/1461)
15+
* **stepfunctions:** support string and file definitions ([#25932](https://github.com/aws/aws-cdk/issues/25932)) ([1cb9351](https://github.com/aws/aws-cdk/commit/1cb935172a2a373992167aebf0aaa72f02405d86))
16+
17+
18+
### Bug Fixes
19+
20+
* **cli:** deployment continues if ECR asset fails to build or publish ([#26060](https://github.com/aws/aws-cdk/issues/26060)) ([37caaab](https://github.com/aws/aws-cdk/commit/37caaabd9d28dd7bb7d0499cc8606e1a382b32fa)), closes [#26048](https://github.com/aws/aws-cdk/issues/26048) [#25827](https://github.com/aws/aws-cdk/issues/25827)
21+
* remaining usage of node 14 ([#25995](https://github.com/aws/aws-cdk/issues/25995)) ([67975ed](https://github.com/aws/aws-cdk/commit/67975edca519ead274a4fdd69d6b8c4e1e322dae)), closes [#25940](https://github.com/aws/aws-cdk/issues/25940)
22+
* **app-mesh:** Missing port property in gRPC routers matchers ([#25868](https://github.com/aws/aws-cdk/issues/25868)) ([8ab920b](https://github.com/aws/aws-cdk/commit/8ab920b03da870741991a57754262b2285a55da7)), closes [#25810](https://github.com/aws/aws-cdk/issues/25810)
23+
* **cloudfront:** avoid to sort TTLs when using Tokens in CachePolicy ([#25920](https://github.com/aws/aws-cdk/issues/25920)) ([bc80331](https://github.com/aws/aws-cdk/commit/bc803317468b0f414a397148baa9540c9aab35d5)), closes [#25795](https://github.com/aws/aws-cdk/issues/25795)
24+
* **core:** prevent the error when the condition is split into groups of 10 and 1 in `Fn.conditionOr()` ([#25708](https://github.com/aws/aws-cdk/issues/25708)) ([c135656](https://github.com/aws/aws-cdk/commit/c135656bb0b6de9cce639218a83acf958f9bca4e)), closes [#25696](https://github.com/aws/aws-cdk/issues/25696) [/github.com/aws/aws-cdk/issues/25696#issuecomment-1560136915](https://github.com/aws//github.com/aws/aws-cdk/issues/25696/issues/issuecomment-1560136915) [/github.com/aws/aws-cdk/issues/25696#issuecomment-1559887661](https://github.com/aws//github.com/aws/aws-cdk/issues/25696/issues/issuecomment-1559887661)
25+
* **ec2:** securityGroups is mandatory in fromClusterAttributes ([#25976](https://github.com/aws/aws-cdk/issues/25976)) ([d8f5e2d](https://github.com/aws/aws-cdk/commit/d8f5e2ddce00a3a53d0ddabb7085c51638480b5e)), closes [#11146](https://github.com/aws/aws-cdk/issues/11146)
26+
* **ecr:** autoDeleteImages fails on multiple repositories ([#25964](https://github.com/aws/aws-cdk/issues/25964)) ([c121180](https://github.com/aws/aws-cdk/commit/c1211805b918f1b37168f88280d37190c4eb0f1d))
27+
* **lambda:** corrected environment variable naming for params and secrets extension ([#26016](https://github.com/aws/aws-cdk/issues/26016)) ([30596fe](https://github.com/aws/aws-cdk/commit/30596fe96bfba240a70e53ab64a9acbf39e92f77)), closes [#26011](https://github.com/aws/aws-cdk/issues/26011)
28+
* **s3:** fail fast for s3 lifecycle configuration when ExpiredObjectDeleteMarker specified with ExpirationInDays, ExpirationDate, or TagFilters. ([#25841](https://github.com/aws/aws-cdk/issues/25841)) ([1a82d85](https://github.com/aws/aws-cdk/commit/1a82d858a7944f7df6f2eb575f17fa4be4ece4f6)), closes [#25824](https://github.com/aws/aws-cdk/issues/25824)
29+
* **vpc:** detect subnet with TGW route as PRIVATE_WITH_EGRESS ([#25958](https://github.com/aws/aws-cdk/issues/25958)) ([49643d6](https://github.com/aws/aws-cdk/commit/49643d6c13b601627fd72ba38d25eb4ee81ffa73)), closes [#25626](https://github.com/aws/aws-cdk/issues/25626)
530

631
## [2.84.0](https://github.com/aws/aws-cdk/compare/v2.83.1...v2.84.0) (2023-06-13)
732

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ automatically, and we have to use a feature flag:
10951095
Adding a new flag looks as follows:
10961096

10971097
1. Define a new const under
1098-
[cx-api/lib/features.ts](https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/cx-api/lib/features.ts)
1098+
[cx-api/lib/features.ts](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/cx-api/lib/features.ts)
10991099
with the name of the context key that enables this new feature (for
11001100
example, `ENABLE_STACK_NAME_DUPLICATES`). The context key should be in the
11011101
form `module.Type:feature` (e.g. `@aws-cdk/core:enableStackNameDuplicates`).
@@ -1106,12 +1106,12 @@ Adding a new flag looks as follows:
11061106
2. Use `FeatureFlags.of(construct).isEnabled(cxapi.ENABLE_XXX)` to check if this feature is enabled
11071107
in your code. If it is not defined, revert to the legacy behavior.
11081108
3. Add your feature flag to the `FLAGS` map in
1109-
[cx-api/lib/features.ts](https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/cx-api/lib/features.ts). In
1109+
[cx-api/lib/features.ts](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/cx-api/lib/features.ts). In
11101110
your description, be sure to cover the following:
11111111
- Consciously pick the type of feature flag. Can the flag be removed in a future major version, or not?
11121112
- Motivate why the feature flag exists. What is the change to existing infrastructure and why is it not safe?
11131113
- In case of a "default change flag", describe what the user needs to do to restore the old behavior.
1114-
4. Add an entry for your feature flag in the [README](https://github.com/aws/aws-cdk/blob/main/packages/%40aws-cdk/cx-api/README.md) file.
1114+
4. Add an entry for your feature flag in the [README](https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/cx-api/README.md) file.
11151115
5. In your tests, ensure that you test your feature with and without the feature flag enabled. You can do this by passing the feature flag to the `context` property when instantiating an `App`.
11161116
```ts
11171117
const myFeatureFlag = { [cxapi.MY_FEATURE_FLAG]: true };
@@ -1124,7 +1124,7 @@ Adding a new flag looks as follows:
11241124

11251125
`fix(core): impossible to use the same physical stack name for two stacks (under feature flag)`
11261126

1127-
[jest helper methods]: https://github.com/aws/aws-cdk/blob/main/tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts
1127+
[jest helper methods]: https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/core/lib/feature-flags.ts
11281128

11291129
## Versioning and Release
11301130

lerna.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"npmClient": "yarn",
3-
"useWorkspaces": true,
43
"packages": [
54
"packages/aws-cdk-lib",
65
"packages/cdk-assets",
@@ -22,7 +21,7 @@
2221
"tools/@aws-cdk/yarn-cling",
2322
"scripts/@aws-cdk/script-tests"
2423
],
25-
"rejectCycles": "true",
24+
"rejectCycles": true,
2625
"version": "0.0.0",
2726
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
2827
}

nx.json

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
{
2-
"extends": "@nrwl/workspace/presets/npm.json",
3-
"workspaceLayout": { },
4-
"tasksRunnerOptions": {
5-
"default": {
6-
"runner": "@nrwl/workspace/tasks-runners/default",
7-
"options": {
8-
"cacheableOperations": [
9-
"build",
10-
"test",
11-
"lint",
12-
"package",
13-
"prepare"
14-
]
15-
}
16-
}
17-
},
182
"targetDefaults": {
193
"build": {
20-
"implicitDependencies": ["aws-cdk-lib"],
21-
"dependsOn": ["^build"],
4+
"dependsOn": [
5+
"^build"
6+
],
227
"inputs": [
238
"{projectRoot}/**/lib/!(*.d|*.generated).ts",
249
"{projectRoot}/**/test/!(*.d).ts",
@@ -28,7 +13,7 @@
2813
"!{workspaceRoot}/**/tsconfig.tsbuildinfo"
2914
],
3015
"outputs": [
31-
"!{projectRoot}/**/*.integ.*.js.snapshot/*",
16+
"{projectRoot}/**/*.integ.*.js.snapshot/*",
3217
"{projectRoot}/tsconfig.json",
3318
"{projectRoot}/**/lib/aws-custom-resource/sdk-api-metadata.json",
3419
"{projectRoot}/**/build-info.json",
@@ -46,7 +31,25 @@
4631
]
4732
},
4833
"test": {
49-
"dependsOn": ["build"]
34+
"dependsOn": [
35+
"build"
36+
]
37+
}
38+
},
39+
"extends": "@nrwl/workspace/presets/npm.json",
40+
"workspaceLayout": {},
41+
"tasksRunnerOptions": {
42+
"default": {
43+
"runner": "@nx/workspace/tasks-runners/default",
44+
"options": {
45+
"cacheableOperations": [
46+
"build",
47+
"test",
48+
"lint",
49+
"package",
50+
"prepare"
51+
]
52+
}
5053
}
5154
},
5255
"affected": {
@@ -56,5 +59,16 @@
5659
"@nrwl/js": {
5760
"analyzeSourceFiles": false
5861
}
62+
},
63+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
64+
"namedInputs": {
65+
"default": [
66+
"{projectRoot}/**/*",
67+
"sharedGlobals"
68+
],
69+
"sharedGlobals": [],
70+
"production": [
71+
"default"
72+
]
5973
}
6074
}

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18-
"@nrwl/cli": "^15.9.4",
19-
"@nrwl/workspace": "^15.9.4",
18+
"@nx/workspace": "^16.3.2",
2019
"@types/node": "18.11.19",
2120
"@types/prettier": "2.6.0",
2221
"@yarnpkg/lockfile": "^1.1.0",
23-
"cdk-generate-synthetic-examples": "^0.1.260",
22+
"cdk-generate-synthetic-examples": "^0.1.269",
2423
"conventional-changelog-cli": "^2.2.2",
2524
"fs-extra": "^9.1.0",
2625
"graceful-fs": "^4.2.11",
@@ -29,8 +28,8 @@
2928
"jsii-pacmak": "1.82.0",
3029
"jsii-reflect": "1.82.0",
3130
"jsii-rosetta": "~5.0.8",
32-
"lerna": "^6.6.1",
33-
"nx": "^15.9.4",
31+
"lerna": "^7.0.1",
32+
"nx": "^16.3.2",
3433
"patch-package": "^6.5.1",
3534
"semver": "^6.3.0",
3635
"standard-version": "^9.5.0",
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": "appmeshroutesportmatchersDefaultTestDeployAssert40D7C50D.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+
}
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+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"32.0.0"}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "32.0.0",
3+
"testCases": {
4+
"appmesh-routes-port-matchers/DefaultTest": {
5+
"stacks": [
6+
"mesh-stack"
7+
],
8+
"assertionStack": "appmesh-routes-port-matchers/DefaultTest/DeployAssert",
9+
"assertionStackName": "appmeshroutesportmatchersDefaultTestDeployAssert40D7C50D"
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)