Skip to content

Commit ee5920c

Browse files
TietewTietew
committed
Merge branch 'main' into s3-deployment-cachecontrol-methods
2 parents 28eb16d + 0f40880 commit ee5920c

2,241 files changed

Lines changed: 47691 additions & 26251 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.

‎.github/ISSUE_TEMPLATE/notice.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: "❗ Notice"
3+
description: Post a notice for a high impact issue
4+
title: "❗ NOTICE (module name): (short notice description)"
5+
labels: [p0, management/tracking]
6+
body:
7+
- type: dropdown
8+
attributes:
9+
label: Status
10+
description: What is the current status of this issue?
11+
options:
12+
- Investigating (Default)
13+
- In-Progress
14+
- Resolved
15+
validations:
16+
required: true
17+
- type: textarea
18+
attributes:
19+
label: What is the issue?
20+
description: A clear and concise description of the issue you want customers to be aware of
21+
validations:
22+
required: true
23+
- type: textarea
24+
attributes:
25+
label: Error message
26+
description: If available, paste the error message users are seeing (no need to backticks)
27+
render: console
28+
- type: textarea
29+
attributes:
30+
label: What is the impact?
31+
description: |
32+
What can occur if this issue isn't addressed?
33+
validations:
34+
required: true
35+
- type: textarea
36+
attributes:
37+
label: Workaround
38+
description: |
39+
Please provide a detailed workaround outlining all steps required for implementation. If none exist yet, leave blank
40+
- type: textarea
41+
attributes:
42+
label: Who is affected?
43+
description: |
44+
What segment of customers are affected? Think about specific construct usage, version, feature toggles, etc...
45+
validations:
46+
required: true
47+
- type: textarea
48+
attributes:
49+
label: How do I resolve this?
50+
description: |
51+
What actions should customers take to resolve the issue. Also elaborate on any code changes the customer may need to do. If unknown yet, say TBD
52+
validations:
53+
required: true
54+
- type: textarea
55+
attributes:
56+
label: Related issues
57+
description: |
58+
List all related issues here. If none related, leave blank

‎.github/workflows/github-merit-badger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[RomainMuller,rix0rrr,MrArnoldPalmer,iliapolo,otaviomacedo,madeline-k,kaizencc,comcalvi,corymhall,peterwoodworth,ryparker,TheRealAmazonKendra,vinayak-kukreja,Naumel,mrgrain,pahud,cgarvis,kellertk,HBobertz,sumupitchayan,pattasai,SankyRed,udaypant,colifran,khushail,aws-cdk-automation,dependabot[bot],mergify[bot]]'

‎.github/workflows/yarn-upgrade.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
(cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
6868
done
6969
# Upgrade dependencies at an aws-eks integ test docker image
70-
cd packages/aws-cdk-lib/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject=',${{ steps.list-packages.outputs.list }}'
70+
cd packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject=',${{ steps.list-packages.outputs.list }}'
7171
7272
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
7373
- name: Run "yarn install"

‎.gitpod.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ github:
33
pullRequestsFromForks: true
44
addComment: true
55

6-
image: jsii/superchain:1-buster-slim-node16
6+
image: public.ecr.aws/jsii/superchain:1-buster-slim-node18
77

88
tasks:
99
- init: |

‎CHANGELOG.v2.alpha.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
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.80.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.79.1-alpha.0...v2.80.0-alpha.0) (2023-05-19)
6+
7+
## [2.79.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.79.0-alpha.0...v2.79.1-alpha.0) (2023-05-11)
8+
9+
## [2.79.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.78.0-alpha.0...v2.79.0-alpha.0) (2023-05-10)
10+
11+
12+
### Bug Fixes
13+
14+
* **servicecatalogappregistry:** Revert deprecated method to keep deprecated method in alpha version ([b20b123](https://github.com/aws/aws-cdk/commit/b20b1f231e12007e7d064cdc4f0c9dc7354827a3))
15+
* **batch:** JobDefinition's ContainerDefinition's Image is synthesized with `[Object object]` ([#25250](https://github.com/aws/aws-cdk/issues/25250)) ([b3d0d57](https://github.com/aws/aws-cdk/commit/b3d0d570fe02e124f4497e35eb87c96c0eb8a1d5))
16+
517
## [2.78.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.77.0-alpha.0...v2.78.0-alpha.0) (2023-05-03)
618

719
## [2.77.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.76.0-alpha.0...v2.77.0-alpha.0) (2023-04-26)

‎CHANGELOG.v2.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,58 @@
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.80.0](https://github.com/aws/aws-cdk/compare/v2.79.1...v2.80.0) (2023-05-19)
6+
7+
8+
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
9+
10+
* **eks:** A masters role is no longer provisioned by default. Use the `mastersRole` property to explicitly pass a role that needs cluster access. In addition, the creation role no longer allows any identity (with the appropriate `sts:AssumeRole` permissions) to assume it.
11+
12+
### Features
13+
14+
* **apigateway:** add grantExecute to API Methods ([#25630](https://github.com/aws/aws-cdk/issues/25630)) ([ecb59fd](https://github.com/aws/aws-cdk/commit/ecb59fda50078e29d579b7b0ee82600f553aec75))
15+
* **appmesh:** access log format support for app mesh ([#25229](https://github.com/aws/aws-cdk/issues/25229)) ([c4b00be](https://github.com/aws/aws-cdk/commit/c4b00bee9a2ada024c8d838ba083549bc69889f8))
16+
* **appsync:** Add Private API support when creating a GraphqlApi ([#25569](https://github.com/aws/aws-cdk/issues/25569)) ([d7e263d](https://github.com/aws/aws-cdk/commit/d7e263d5d175f5f189f3ea3d1a5501b975a26281))
17+
* **cfnspec:** cloudformation spec v122.0.0 ([#25555](https://github.com/aws/aws-cdk/issues/25555)) ([5ccc569](https://github.com/aws/aws-cdk/commit/5ccc56975c323ea19fd0917def51184e13f440d9))
18+
* **cli:** assets can now depend on stacks ([#25536](https://github.com/aws/aws-cdk/issues/25536)) ([25d5d60](https://github.com/aws/aws-cdk/commit/25d5d60fd0ed852b1817d749b65c68d5279b38a3))
19+
* **cli:** logging can be corked ([#25644](https://github.com/aws/aws-cdk/issues/25644)) ([0643020](https://github.com/aws/aws-cdk/commit/064302007e902a1521ccc6948a5691cd777afc15)), closes [#25536](https://github.com/aws/aws-cdk/issues/25536)
20+
* **codepipeline-actions:** add KMSEncryptionKeyARN for S3DeployAction ([#24536](https://github.com/aws/aws-cdk/issues/24536)) ([b60876f](https://github.com/aws/aws-cdk/commit/b60876f7bd973f88e965c7e6204ced11c55c55a3)), closes [#24535](https://github.com/aws/aws-cdk/issues/24535)
21+
* **eks:** alb controller include versions 2.4.2 - 2.5.1 ([#25330](https://github.com/aws/aws-cdk/issues/25330)) ([83c4c36](https://github.com/aws/aws-cdk/commit/83c4c36e56917be248bdee1bc11516982d50b17a)), closes [#25307](https://github.com/aws/aws-cdk/issues/25307)
22+
* **msk:** Kafka version 3.4.0 ([#25557](https://github.com/aws/aws-cdk/issues/25557)) ([6317518](https://github.com/aws/aws-cdk/commit/6317518e5d68e5659237b676668fd69bfbd2f42f)), closes [#25522](https://github.com/aws/aws-cdk/issues/25522)
23+
* **scheduler:** schedule expression construct ([#25422](https://github.com/aws/aws-cdk/issues/25422)) ([97a698e](https://github.com/aws/aws-cdk/commit/97a698ee9e1e47ffb4af5d7d06cd309ddd3a2732))
24+
25+
26+
### Bug Fixes
27+
28+
* **bootstrap:** bootstrap doesn't work in non-aws partitions anymore (revert security hub finding fix) ([#25540](https://github.com/aws/aws-cdk/issues/25540)) ([8854739](https://github.com/aws/aws-cdk/commit/8854739a6b4cdd33dc0da3b76b634b5ab151437b)), closes [/github.com/aws/aws-cdk/issues/19380#issuecomment-1512009270](https://github.com/aws//github.com/aws/aws-cdk/issues/19380/issues/issuecomment-1512009270) [#25272](https://github.com/aws/aws-cdk/issues/25272) [#25273](https://github.com/aws/aws-cdk/issues/25273) [#25507](https://github.com/aws/aws-cdk/issues/25507)
29+
* **eks:** overly permissive trust policies ([#25473](https://github.com/aws/aws-cdk/issues/25473)) ([51f0193](https://github.com/aws/aws-cdk/commit/51f0193bf34cca8254743561a1176e3ca5d83a74)). We would like to thank @twelvemo and @stefreak for reporting this issue.
30+
31+
## [2.79.1](https://github.com/aws/aws-cdk/compare/v2.79.0...v2.79.1) (2023-05-11)
32+
33+
34+
### Bug Fixes
35+
36+
* **bootstrap:** bootstrap doesn't work in non-aws partitions anymore (revert security hub finding fix) ([#25272](https://github.com/aws/aws-cdk/issues/25272)) ([4c4014e](https://github.com/aws/aws-cdk/commit/4c4014e0bd3fa90402cfc22971f1cbe5d372642f))
37+
38+
## [2.79.0](https://github.com/aws/aws-cdk/compare/v2.78.0...v2.79.0) (2023-05-10)
39+
40+
41+
### Features
42+
43+
* **cfnspec:** cloudformation spec v121.0 ([#25499](https://github.com/aws/aws-cdk/issues/25499)) ([c2ef657](https://github.com/aws/aws-cdk/commit/c2ef6571b7971384a60866b14371f204d30756cd))
44+
* **ecr:** grantRead on repositories ([#25445](https://github.com/aws/aws-cdk/issues/25445)) ([ce7bdea](https://github.com/aws/aws-cdk/commit/ce7bdea1d1b79de517b2b7ff6d4d73212f8a84c3))
45+
* **logs:** support DataProtectionPolicy in LogGroup construct ([#23402](https://github.com/aws/aws-cdk/issues/23402)) ([ed3962a](https://github.com/aws/aws-cdk/commit/ed3962af3a7e532d9a4d16fadb5f472dd065b43f)), closes [#23399](https://github.com/aws/aws-cdk/issues/23399)
46+
47+
48+
### Bug Fixes
49+
50+
* **batch:** JobDefinition's ContainerDefinition's Image is synthesized with `[Object object]` ([#25466](https://github.com/aws/aws-cdk/issues/25466)) ([b3d0d57](https://github.com/aws/aws-cdk/commit/b3d0d570fe02e124f4497e35eb87c96c0eb8a1d5)), closes [#25250](https://github.com/aws/aws-cdk/issues/25250)
51+
* **cfn2ts:** doesn't handle property types with the same type as a primitive type ([#25460](https://github.com/aws/aws-cdk/issues/25460)) ([b76c182](https://github.com/aws/aws-cdk/commit/b76c18287ce452f5b5d27af68028e9f6b47d67b5)), closes [aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json#L1437-L1442](https://github.com/aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json/issues/L1437-L1442) [aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json#L1727-L1742](https://github.com/aws-cdk/cfnspec/spec-source/specification/000_cfn/000_official/000_AWS_IoT.json/issues/L1727-L1742) [#22732](https://github.com/aws/aws-cdk/issues/22732)
52+
* **core:** crossRegionReferences don't work across multiple regions ([#25384](https://github.com/aws/aws-cdk/issues/25384)) ([65265e1](https://github.com/aws/aws-cdk/commit/65265e1297f47a5e8e85ade620095c5af1082290)), closes [#25190](https://github.com/aws/aws-cdk/issues/25190) [#25377](https://github.com/aws/aws-cdk/issues/25377)
53+
* **dynamodb:** fix hardcoded partition in replica-provider IAM policy ([#25428](https://github.com/aws/aws-cdk/issues/25428)) ([b5b4f66](https://github.com/aws/aws-cdk/commit/b5b4f66396cdc1fae3887f82509d30c4c4c6f6d4)), closes [#25407](https://github.com/aws/aws-cdk/issues/25407)
54+
* **elasticloadbalancingv2:** ALB auth return internal server error ([#24510](https://github.com/aws/aws-cdk/issues/24510)) ([75212eb](https://github.com/aws/aws-cdk/commit/75212ebc7a30d822097223ea39a0d58da6fe8d43)), closes [#21939](https://github.com/aws/aws-cdk/issues/21939) [#19035](https://github.com/aws/aws-cdk/issues/19035) [#18944](https://github.com/aws/aws-cdk/issues/18944)
55+
* **servicecatalogappregistry:** Revert deprecated method removing PR to keep deprecated method in alpha version ([#25454](https://github.com/aws/aws-cdk/issues/25454)) ([b20b1f2](https://github.com/aws/aws-cdk/commit/b20b1f231e12007e7d064cdc4f0c9dc7354827a3))
56+
557
## [2.78.0](https://github.com/aws/aws-cdk/compare/v2.77.0...v2.78.0) (2023-05-03)
658

759

‎build.sh‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ check_prereqs="true"
88
check_compat="true"
99
ci="false"
1010
scope=""
11+
concurrency=""
1112
while [[ "${1:-}" != "" ]]; do
1213
case $1 in
1314
-h|--help)
@@ -32,6 +33,10 @@ while [[ "${1:-}" != "" ]]; do
3233
--ci)
3334
ci=true
3435
;;
36+
-c|--concurrency)
37+
concurrency="$2"
38+
shift
39+
;;
3540
*)
3641
echo "Unrecognized parameter: $1"
3742
exit 1
@@ -93,8 +98,14 @@ if [ "$run_tests" == "true" ]; then
9398
runtarget="$runtarget,test"
9499
fi
95100

96-
# Limit top-level concurrency to available CPUs - 1 to limit CPU load.
97-
concurrency=$(node -p 'Math.max(1, require("os").cpus().length - 1)')
101+
if [[ "$concurrency" == "" ]]; then
102+
# Auto-limit top-level concurrency to:
103+
# - available CPUs - 1 to limit CPU load
104+
# - total memory / 4GB (N.B: constant here may need to be tweaked, configurable with $CDKBUILD_MEM_PER_PROCESS)
105+
mem_per_process=${CDKBUILD_MEM_PER_PROCESS:-4_000_000_000}
106+
concurrency=$(node -p "Math.max(1, Math.min(require('os').cpus().length - 1, Math.round(require('os').totalmem() / $mem_per_process)))")
107+
echo "Concurrency: $concurrency"
108+
fi
98109

99110
flags=""
100111
if [ "$ci" == "true" ]; then

‎docs/DESIGN_GUIDELINES.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,27 @@ information that can be obtained from the stack trace.
15231523

15241524
* Do not use FnSub
15251525

1526+
### Lazys
1527+
1528+
Do not use a `Lazy` to perform a mutation on the construct tree. For example:
1529+
1530+
```ts
1531+
constructor(scope: Scope, id: string, props: MyConstructProps) {
1532+
this.lazyProperty = Lazy.any({
1533+
produce: () => {
1534+
return props.logging.bind(this, this);
1535+
},
1536+
});
1537+
}
1538+
```
1539+
1540+
`bind()` methods mutate the construct tree, and should not be called from a callback
1541+
in a `Lazy`.
1542+
1543+
* The why:
1544+
- `Lazy`s are called after the construct tree has already been sythesized. Mutating it
1545+
at this point could have not-obvious consequences.
1546+
15261547
## Documentation
15271548

15281549
Documentation style (copy from official AWS docs) No need to Capitalize Resource

‎pack.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,3 @@ if find dist/ | grep -F "${marker}"; then
107107
echo "This is expected for builds in a development environment but should not happen in CI builds!"
108108
exit 1
109109
fi
110-
111-
# for posterity, print all files in dist
112-
echo "=============================================================================================="
113-
echo " dist contents"
114-
echo "=============================================================================================="
115-
find dist/

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18-
"@nrwl/cli": "^15.9.1",
19-
"@nrwl/workspace": "^15.9.1",
18+
"@nrwl/cli": "^15.9.4",
19+
"@nrwl/workspace": "^15.9.4",
2020
"@types/node": "18.11.19",
2121
"@types/prettier": "2.6.0",
2222
"@yarnpkg/lockfile": "^1.1.0",
23-
"cdk-generate-synthetic-examples": "^0.1.173",
23+
"cdk-generate-synthetic-examples": "^0.1.244",
2424
"conventional-changelog-cli": "^2.2.2",
2525
"fs-extra": "^9.1.0",
26-
"graceful-fs": "^4.2.10",
26+
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.78.1",
29-
"jsii-pacmak": "1.78.1",
30-
"jsii-reflect": "1.78.1",
31-
"jsii-rosetta": "~5.0.7",
28+
"jsii-diff": "1.81.0",
29+
"jsii-pacmak": "1.81.0",
30+
"jsii-reflect": "1.81.0",
31+
"jsii-rosetta": "~5.0.8",
3232
"lerna": "^6.6.1",
33-
"nx": "^15.9.1",
33+
"nx": "^15.9.4",
3434
"patch-package": "^6.5.1",
3535
"semver": "^6.3.0",
3636
"standard-version": "^9.5.0",

0 commit comments

Comments
 (0)