Skip to content

Commit 9f6b949

Browse files
Merge branch 'main' into alb
2 parents 89131d7 + c326388 commit 9f6b949

File tree

138 files changed

+169461
-875
lines changed

Some content is hidden

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

138 files changed

+169461
-875
lines changed

.github/workflows/yarn-upgrade.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ jobs:
5959
# Upgrade all the packages
6060
lerna exec --parallel ncu -- --upgrade --filter=jsii,jsii-rosetta,typescript --target=patch
6161
lerna exec --parallel ncu -- --upgrade --reject='@aws-cdk/asset-awscli-v1,@types/conventional-commits-parser,@types/node,@types/prettier,constructs,jsii,jsii-rosetta,typescript,aws-sdk-mock,@aws-sdk/*,@aws-cdk/aws-service-spec,@aws-cdk/service-spec-types,${{ steps.list-packages.outputs.list }}' --target=minor
62-
# Upgrade package.json files in init templates
63-
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
64-
(cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
65-
done
6662
# Upgrade dependencies at an aws-eks integ test docker image
6763
cd packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='@aws-sdk/*,${{ steps.list-packages.outputs.list }}'
6864
@@ -103,7 +99,8 @@ jobs:
10399
path: ${{ runner.temp }}
104100

105101
- name: Apply patch
106-
run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp
102+
run:
103+
'[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp
107104
}}/upgrade.patch || echo "Empty patch. Skipping."'
108105

109106
- name: Make Pull Request
@@ -116,7 +113,7 @@ jobs:
116113
chore: npm-check-updates && yarn upgrade
117114
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
118115
# Pull Request details
119-
title: 'chore: npm-check-updates && yarn upgrade'
116+
title: "chore: npm-check-updates && yarn upgrade"
120117
body: |-
121118
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
122119
labels: contribution/core,dependencies,auto-approve

CHANGELOG.v2.alpha.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
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.231.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.230.0-alpha.0...v2.231.0-alpha.0) (2025-12-01)
6+
7+
8+
### Features
9+
10+
* **glue-alpha:** support Glue Version 5.1 ([#36223](https://github.com/aws/aws-cdk/issues/36223)) ([b956492](https://github.com/aws/aws-cdk/commit/b9564923ee1136e7b680115a2983ad317b0c30fb))
11+
* **imagebuilder-alpha:** add support for Image Construct ([#36154](https://github.com/aws/aws-cdk/issues/36154)) ([eee3ae6](https://github.com/aws/aws-cdk/commit/eee3ae6a55ff632012c19c384bb11e91b820bcc3)), closes [aws/aws-cdk-rfcs#789](https://github.com/aws/aws-cdk-rfcs/issues/789) [aws/aws-cdk-rfcs#789](https://github.com/aws/aws-cdk-rfcs/issues/789)
12+
513
## [2.230.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.229.1-alpha.0...v2.230.0-alpha.0) (2025-11-26)
614

715

CHANGELOG.v2.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
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.231.0](https://github.com/aws/aws-cdk/compare/v2.230.0...v2.231.0) (2025-12-01)
6+
7+
8+
### Features
9+
10+
* **lambda:** support for capacity providers ([#36255](https://github.com/aws/aws-cdk/issues/36255)) ([2e4c1cf](https://github.com/aws/aws-cdk/commit/2e4c1cfd461de82e837238ab80eb0be22e9ec4b6))
11+
* update L1 CloudFormation resource definitions ([#36253](https://github.com/aws/aws-cdk/issues/36253)) ([8410b13](https://github.com/aws/aws-cdk/commit/8410b1392b9e634282dd56e47b4778304c1afa32))
12+
* **aws-cdk-lib:** add `arnFor<ResourceName>` for 47 more resources ([#36231](https://github.com/aws/aws-cdk/issues/36231)) ([5a8be4f](https://github.com/aws/aws-cdk/commit/5a8be4f22b24b0c0ae72a0cf4f5152c678a19029))
13+
* **aws-cdk-lib:** all L1s now have a `isCfn<ResourceName>` static helper to check if a value is this L1 resource ([#36243](https://github.com/aws/aws-cdk/issues/36243)) ([dc9db9b](https://github.com/aws/aws-cdk/commit/dc9db9b83d9ff629e4b047da90fbb15935a623ca))
14+
* **ec2:** expose EC2 instance MetadataOptions ([#35369](https://github.com/aws/aws-cdk/issues/35369)) ([4056e14](https://github.com/aws/aws-cdk/commit/4056e14105f88c27799b00f0eea1f1b671c5b8c8)), closes [#35357](https://github.com/aws/aws-cdk/issues/35357)
15+
16+
17+
### Bug Fixes
18+
19+
* **dynamodb:** unsupported actions added to table resource policy ([#36228](https://github.com/aws/aws-cdk/issues/36228)) ([10de047](https://github.com/aws/aws-cdk/commit/10de0470215a6d211983b1457218914bb3c3c388)), closes [#32230](https://github.com/aws/aws-cdk/issues/32230)
20+
21+
522
## [2.230.0](https://github.com/aws/aws-cdk/compare/v2.229.1...v2.230.0) (2025-11-26)
623

724

CONTRIBUTORS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Shout out to our top contributors!
88
- [njlynch](https://github.com/njlynch)
99
- [jogold](https://github.com/jogold)
1010
- [iliapolo](https://github.com/iliapolo)
11-
- [corymhall](https://github.com/corymhall)
1211
- [mrgrain](https://github.com/mrgrain)
12+
- [corymhall](https://github.com/corymhall)
1313
- [shivlaks](https://github.com/shivlaks)
1414
- [otaviomacedo](https://github.com/otaviomacedo)
1515
- [mazyu36](https://github.com/mazyu36)
@@ -25,8 +25,8 @@ Shout out to our top contributors!
2525
- [lpizzinidev](https://github.com/lpizzinidev)
2626
- [msambol](https://github.com/msambol)
2727
- [peterwoodworth](https://github.com/peterwoodworth)
28+
- [phuhung273](https://github.com/phuhung273)
2829
- [GavinZZ](https://github.com/GavinZZ)
29-
- [colifran](https://github.com/colifran)
3030

3131

32-
_Last updated: Sat, 01 Nov 25 00:14:31 +0000_
32+
_Last updated: Mon, 01 Dec 25 00:16:16 +0000_

aws-cdk.code-workspace

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,14 @@
77
"type": "on-demand"
88
},
99
"jest.virtualFolders": [
10-
{
11-
"name": "aws-cdk",
12-
"rootPath": "packages/aws-cdk"
13-
},
1410
{
1511
"name": "aws-cdk-lib",
1612
"rootPath": "packages/aws-cdk-lib"
1713
},
18-
{
19-
"name": "cli-lib-alpha",
20-
"rootPath": "packages/@aws-cdk/cli-lib-alpha"
21-
},
22-
{
23-
"name": "cloudformation-diff",
24-
"rootPath": "packages/@aws-cdk/cloudformation-diff"
25-
},
2614
{
2715
"name": "custom-resource-handlers",
2816
"rootPath": "packages/@aws-cdk/custom-resource-handlers"
2917
},
30-
{
31-
"name": "integ-runner",
32-
"rootPath": "packages/@aws-cdk/integ-runner"
33-
},
3418
{
3519
"name": "integ-tests-alpha",
3620
"rootPath": "packages/@aws-cdk/integ-tests-alpha"
@@ -39,17 +23,13 @@
3923
"name": "aws-custom-resource-sdk-adapter",
4024
"rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
4125
},
42-
{
43-
"name": "toolkit",
44-
"rootPath": "packages/@aws-cdk/toolkit"
45-
},
46-
{
47-
"name": "user-input-gen",
48-
"rootPath": "tools/@aws-cdk/user-input-gen"
49-
},
5026
{
5127
"name": "mixins",
5228
"rootPath": "packages/@aws-cdk/mixins-preview"
29+
},
30+
{
31+
"name": "spec2cdk",
32+
"rootPath": "tools/@aws-cdk/spec2cdk"
5333
}
5434
]
5535
},

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ fi
100100
if [[ "$concurrency" == "" ]]; then
101101
# Auto-limit top-level concurrency to:
102102
# - available CPUs - 1 to limit CPU load
103-
# - total memory / 4GB (N.B: constant here may need to be tweaked, configurable with $CDKBUILD_MEM_PER_PROCESS)
104-
mem_per_process=${CDKBUILD_MEM_PER_PROCESS:-4_000_000_000}
103+
# - total memory / 6GB (N.B: constant here may need to be tweaked, configurable with $CDKBUILD_MEM_PER_PROCESS)
104+
mem_per_process=${CDKBUILD_MEM_PER_PROCESS:-6_000_000_000}
105105
concurrency=$(node -p "Math.max(1, Math.min(require('os').cpus().length - 1, Math.round(require('os').totalmem() / $mem_per_process)))")
106106
echo "Concurrency: $concurrency"
107107
fi

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
"compat": "./scripts/check-api-compatibility.sh",
1414
"bump": "./bump.sh",
1515
"build-all": "tsc -b",
16-
"atmosphere-integ-test": "lerna run build --scope @aws-cdk/integration-test-deployment && node tools/@aws-cdk/integration-test-deployment/bin/index.js"
16+
"atmosphere-integ-test": "lerna run build --scope @aws-cdk/integration-test-deployment && node tools/@aws-cdk/integration-test-deployment/bin/index.js",
17+
"rosetta": "jsii-rosetta",
18+
"synthetic-examples": "cdk-generate-synthetic-examples"
1719
},
1820
"devDependencies": {
1921
"@nx/workspace": "^20",
2022
"@types/node": "18.19.129",
2123
"@types/prettier": "2.6.0",
2224
"@yarnpkg/lockfile": "^1.1.0",
2325
"aws-sdk-js-codemod": "^2.4.5",
24-
"cdk-generate-synthetic-examples": "^0.2.32",
26+
"cdk-generate-synthetic-examples": "^0.2.37",
2527
"conventional-changelog-cli": "^2.2.2",
2628
"fs-extra": "^9.1.0",
2729
"graceful-fs": "^4.2.11",

packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.capacity-provider-all-fields.js.snapshot/CapacityProviderAllFieldsStack.assets.json

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)