Skip to content

Commit 1bd23e5

Browse files
authored
Merge branch 'main' into feat/aws-cognito-managed-login-branding
2 parents 61a8bce + 650f30a commit 1bd23e5

File tree

309 files changed

+114665
-1576
lines changed

Some content is hidden

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

309 files changed

+114665
-1576
lines changed

.github/workflows/pr-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: 'Download workflow_run artifact'
3838
if: github.event_name == 'workflow_run'
39-
uses: dawidd6/action-download-artifact@v9
39+
uses: dawidd6/action-download-artifact@v10
4040
with:
4141
run_id: ${{ github.event.workflow_run.id }}
4242
name: pr_info

CHANGELOG.v2.alpha.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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.200.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.200.0-alpha.0...v2.200.1-alpha.0) (2025-06-03)
6+
7+
## [2.200.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.199.0-alpha.0...v2.200.0-alpha.0) (2025-06-02)
8+
9+
### Features
10+
* **msk:** support Kafka 4.0 ([#34501](https://github.com/aws/aws-cdk/issues/34501)) ([aa40e38](https://github.com/aws/aws-cdk/commit/aa40e382ddd585f027febcc994a8e32491bf37c1))
11+
512
## [2.199.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.198.0-alpha.0...v2.199.0-alpha.0) (2025-05-27)
613

714

CHANGELOG.v2.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
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.200.1](https://github.com/aws/aws-cdk/compare/v2.200.0...v2.200.1) (2025-06-03)
6+
7+
8+
### Bug Fixes
9+
10+
* **lambda:** disable aws-lambda:useCdkManagedLogGroup feature flag when not set ([#34613](https://github.com/aws/aws-cdk/issues/34613)) ([b4cab7f](https://github.com/aws/aws-cdk/commit/b4cab7f41b311f48316220aaf9283833cb755ad9)), closes [#34612](https://github.com/aws/aws-cdk/issues/34612) [#34612](https://github.com/aws/aws-cdk/issues/34612)
11+
12+
## [2.200.0](https://github.com/aws/aws-cdk/compare/v2.199.0...v2.200.0) (2025-06-02)
13+
14+
15+
### Features
16+
17+
* update L1 CloudFormation resource definitions ([#34594](https://github.com/aws/aws-cdk/issues/34594)) ([1e37ee7](https://github.com/aws/aws-cdk/commit/1e37ee71971a3cdb619ba40e321def3072112e2b))
18+
* **custom-resources:** throw `ValidationError` instead of untyped Errors ([#33392](https://github.com/aws/aws-cdk/issues/33392)) ([1dacaa3](https://github.com/aws/aws-cdk/commit/1dacaa30fc7311ee1344493715787561118b660d)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
19+
* **ec2:** implement `IPeer` to `PrefixList` to be usable as a connection peer ([#33617](https://github.com/aws/aws-cdk/issues/33617)) ([c277419](https://github.com/aws/aws-cdk/commit/c277419f3931ab50f757844323863b25be875d96)), closes [#33607](https://github.com/aws/aws-cdk/issues/33607)
20+
* **iam:** introduce `OidcProviderNative` construct utilizing the native CloudFormation resource ([#28634](https://github.com/aws/aws-cdk/issues/28634)) ([d8e6c09](https://github.com/aws/aws-cdk/commit/d8e6c09083d4958c1967bc19ff30cf15820580af)), closes [#21197](https://github.com/aws/aws-cdk/issues/21197)
21+
* **iam:** throw `ValidationError`s instead of untyped errors ([#34579](https://github.com/aws/aws-cdk/issues/34579)) ([bd5caba](https://github.com/aws/aws-cdk/commit/bd5caba44ed4485a8a8360f475c76543c2d0c4e4)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
22+
* **lambda:** allow propagating function tags to loggroup ([#34556](https://github.com/aws/aws-cdk/issues/34556)) ([f556fd1](https://github.com/aws/aws-cdk/commit/f556fd18f789a8498f32298c07973e8aae4d3798))
23+
* **lambda:** throw `ValidationError`s instead of untyped errors ([#34577](https://github.com/aws/aws-cdk/issues/34577)) ([6ccdd81](https://github.com/aws/aws-cdk/commit/6ccdd81b2601ea54cf83e6601208bc21c03944e4)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
24+
* **region-info:** throw `ValidationError` instead of untyped Errors ([#33384](https://github.com/aws/aws-cdk/issues/33384)) ([303daf2](https://github.com/aws/aws-cdk/commit/303daf28d893ffa7829431b130299cc8efbd6f49)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
25+
* **s3:** add `grantReplicationPermission` for IAM Role permissions ([#34138](https://github.com/aws/aws-cdk/issues/34138)) ([bfa6490](https://github.com/aws/aws-cdk/commit/bfa649073d6753d36fc46ba66f611308ad2b6029)), closes [#34119](https://github.com/aws/aws-cdk/issues/34119)
26+
* **secretsmanager:** throw `ValidationError`s instead of untyped errors ([#34580](https://github.com/aws/aws-cdk/issues/34580)) ([4d591ef](https://github.com/aws/aws-cdk/commit/4d591efd7c6c14666a351edf5aa784b57140d9dc)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
27+
* **servicecatalog:** throw `ValidationError`s instead of untyped errors ([#34581](https://github.com/aws/aws-cdk/issues/34581)) ([3895d76](https://github.com/aws/aws-cdk/commit/3895d764e790ac7b4f09ccf5051a941d3cd22278)), closes [#32569](https://github.com/aws/aws-cdk/issues/32569)
28+
* **sns-subscriptions:** support Amazon Data Firehose subscription ([#33811](https://github.com/aws/aws-cdk/issues/33811)) ([632179c](https://github.com/aws/aws-cdk/commit/632179c629b0a03fd0a42fda98b8bd04a5a00112)), closes [#14391](https://github.com/aws/aws-cdk/issues/14391)
29+
* **stepfunctions:** add grant API for RedriveExecution ([#34554](https://github.com/aws/aws-cdk/issues/34554)) ([e03939d](https://github.com/aws/aws-cdk/commit/e03939d0091bfb24923619161948aad67524315e)), closes [#33578](https://github.com/aws/aws-cdk/issues/33578)
30+
31+
32+
### Bug Fixes
33+
34+
* **ec2:** validate throughput property on EC2 instance block devices ([#34571](https://github.com/aws/aws-cdk/issues/34571)) ([b31580a](https://github.com/aws/aws-cdk/commit/b31580a202aea30b8657988daaa232283053e856)), closes [#34033](https://github.com/aws/aws-cdk/issues/34033)
35+
* **elasticloadbalancingv2:** fix incorrect max for minimumCapacityUnit ([#34586](https://github.com/aws/aws-cdk/issues/34586)) ([8f19b26](https://github.com/aws/aws-cdk/commit/8f19b2646a4085b436f662a79236a17c41fa1162)), closes [#34582](https://github.com/aws/aws-cdk/issues/34582)
36+
537
## [2.199.0](https://github.com/aws/aws-cdk/compare/v2.198.0...v2.199.0) (2025-05-27)
638

739

CONTRIBUTING.md

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,7 @@ If you would like to test your code changes against a CDK App, create the App an
198198
$ mkdir cdkApp # in parent dir of aws-cdk
199199
$ cd cdkApp
200200
$ npx cdk init app --language typescript
201-
$ npx cdk --version # shows the latest CDK version e.g. 2.155.0 (build 34dcc5a)
202201
$ ../aws-cdk/link-all.sh # link the aws-cdk repo with your cdkApp
203-
$ npx cdk --version # verify linked cdk version 0.0.0
204202
# Define the resource that uses your aws-cdk changes in cdkApp lib folder
205203
$ npx cdk deploy # deploy successfully
206204
```
@@ -1341,6 +1339,28 @@ Adding a new flag looks as follows:
13411339
- Double negatives should be avoided. If you want to add a flag that disables something that was previously
13421340
enabled, set `default.v2` to `true` and the `recommendedValue` to `false`. You will need to update
13431341
a test in `features.test.ts` -- this is okay if you have a good reason.
1342+
- A note on the fields
1343+
- default.v2: This is the boolean value used by the cdk commands at runtime unless its specified in `cdk.json`.
1344+
- recommendedValue: This is the boolean value will be set in `cdk.json` on `cdk init` when you init a new application.
1345+
- As a contributor, if you are advised to introduce a feature flag, consider the following scenarios when determining how your feature should behave for
1346+
- Customers who are creating new app (`cdk init`). `cdk.json` will now contain the new feature flag set to the `recommendedValue`.
1347+
- Customers who have an existing app. `cdk.json` doesnt contain the `new` feature flag. The value of the new feature flag set to the `default.v2` value in context of cdk commands.
1348+
- E.g. in the following case, unless overridden in `cdk.json`
1349+
- New apps will get [USE_CDK_MANAGED_LAMBDA_LOGGROUP]: true
1350+
- Existing apps on cdk v2 will get [USE_CDK_MANAGED_LAMBDA_LOGGROUP]: false
1351+
```typescript
1352+
[USE_CDK_MANAGED_LAMBDA_LOGGROUP]: {
1353+
type: FlagType.ApiDefault,
1354+
summary: 'When enabled, CDK creates and manages loggroup for the lambda function',
1355+
detailsMd: `
1356+
...
1357+
`,
1358+
introducedIn: { v2: 'V2_NEXT' },
1359+
defaults: { v2: false },
1360+
recommendedValue: true,
1361+
compatibilityWithOldBehaviorMd: 'Disable the feature flag to let lambda service create logGroup or specify logGroup or logRetention',
1362+
},
1363+
```
13441364
2. Use `FeatureFlags.of(construct).isEnabled(cxapi.ENABLE_XXX)` to check if this feature is enabled
13451365
in your code. If it is not defined, revert to the legacy behavior.
13461366
3. Add your feature flag to the `FLAGS` map in
@@ -1369,18 +1389,27 @@ Adding a new flag looks as follows:
13691389
See [release.md](./docs/release.md) for details on how CDK versions are maintained and how
13701390
to trigger a new release
13711391

1372-
## Troubleshooting
1392+
## Common Issues
13731393

1374-
Most build issues can be solved by doing a full clean rebuild:
1394+
### Import errors
13751395

1376-
```shell
1377-
$ git clean -fqdx .
1378-
$ yarn install
1379-
$ yarn build
1396+
An error similar to the below can happen while trying to consume the changed library in the example (or production) CDK app:
1397+
1398+
```ts
1399+
node_modules/ts-node/src/index.ts:859
1400+
return new TSError(diagnosticText, diagnosticCodes, diagnostics);
1401+
^
1402+
TSError: ⨯ Unable to compile TypeScript:
1403+
1404+
aws-cdk/packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts:7:27 - error TS2732: Cannot find module '../../custom-resources/lib/helpers-internal/sdk-v3-metadata.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
1405+
1406+
7 import * as metadata from '../../custom-resources/lib/helpers-internal/sdk-v3-metadata.json';
13801407
```
13811408

1382-
However, this will be time consuming. In this section we'll describe some common issues you may encounter and some more
1383-
targeted commands you can run to resolve your issue.
1409+
This is most probably caused by the fact that your CDK app is using `--prefer-ts-exts` option (which is the [default in new CDK TS-based apps]([url](https://github.com/aws/aws-cdk/issues/7475))). To fix this, try one of the following:
1410+
- Don't compile aws-cdk-lib. You can do this by removing `--prefer-ts-exts` from your app command in `cdk.json` - this means you will have to run a build in the lib repo every time you make a change (or use `npm run watch / yarn watch`).
1411+
- Update your `tsconfig.json`. In this case it's going to be adding `"resolveJsonModule": true` as suggested by the error to the `"compilerOptions"` section. If you change the test app, different or more errors might come up that will have a similar resolution.
1412+
13841413

13851414
#### The compiler is throwing errors on files that I renamed/it's running old tests that I meant to remove/code coverage is low and I didn't change anything.
13861415

CONTRIBUTORS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ Shout out to our top contributors!
1616
- [pahud](https://github.com/pahud)
1717
- [badmintoncryer](https://github.com/badmintoncryer)
1818
- [go-to-k](https://github.com/go-to-k)
19-
- [comcalvi](https://github.com/comcalvi)
2019
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
20+
- [comcalvi](https://github.com/comcalvi)
2121
- [madeline-k](https://github.com/madeline-k)
2222
- [NetaNir](https://github.com/NetaNir)
2323
- [robertd](https://github.com/robertd)
2424
- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
2525
- [lpizzinidev](https://github.com/lpizzinidev)
2626
- [peterwoodworth](https://github.com/peterwoodworth)
2727
- [msambol](https://github.com/msambol)
28-
- [colifran](https://github.com/colifran)
2928
- [GavinZZ](https://github.com/GavinZZ)
29+
- [colifran](https://github.com/colifran)
3030

3131

32-
_Last updated: Thu, 01 May 25 00:13:51 +0000_
32+
_Last updated: Sun, 01 Jun 25 00:16:05 +0000_

packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "Apache-2.0",
3131
"devDependencies": {
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
33-
"@aws-cdk/integ-runner": "^2.186.9",
33+
"@aws-cdk/integ-runner": "^2.186.11",
3434
"@aws-cdk/pkglint": "0.0.0",
3535
"@aws-sdk/client-acm": "3.632.0",
3636
"@aws-sdk/client-rds": "3.632.0",
@@ -47,7 +47,7 @@
4747
"@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
4848
"@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
4949
"aws-cdk-lib": "0.0.0",
50-
"cdk8s": "2.69.71",
50+
"cdk8s": "2.69.72",
5151
"cdk8s-plus-27": "2.9.5",
5252
"constructs": "^10.0.0"
5353
},

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration-kms.js.snapshot/appconfigconfigurationkmsDefaultTestDeployAssert53559CF7.assets.json

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

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration-kms.js.snapshot/appconfigconfigurationkmsDefaultTestDeployAssert53559CF7.template.json

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

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration-kms.js.snapshot/aws-appconfig-configuration-kms.assets.json

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"Resources": {
3+
"MyKey6AB29FA6": {
4+
"Type": "AWS::KMS::Key",
5+
"Properties": {
6+
"KeyPolicy": {
7+
"Statement": [
8+
{
9+
"Action": "kms:*",
10+
"Effect": "Allow",
11+
"Principal": {
12+
"AWS": {
13+
"Fn::Join": [
14+
"",
15+
[
16+
"arn:",
17+
{
18+
"Ref": "AWS::Partition"
19+
},
20+
":iam::",
21+
{
22+
"Ref": "AWS::AccountId"
23+
},
24+
":root"
25+
]
26+
]
27+
}
28+
},
29+
"Resource": "*"
30+
}
31+
],
32+
"Version": "2012-10-17"
33+
}
34+
},
35+
"UpdateReplacePolicy": "Delete",
36+
"DeletionPolicy": "Delete"
37+
},
38+
"MyAppConfigB4B63E75": {
39+
"Type": "AWS::AppConfig::Application",
40+
"Properties": {
41+
"Name": "AppForConfigTest"
42+
}
43+
},
44+
"MyHostedConfigFromFileDeploymentStrategyCAF37A7C": {
45+
"Type": "AWS::AppConfig::DeploymentStrategy",
46+
"Properties": {
47+
"DeploymentDurationInMinutes": 20,
48+
"FinalBakeTimeInMinutes": 10,
49+
"GrowthFactor": 10,
50+
"GrowthType": "EXPONENTIAL",
51+
"Name": "awsappconfigconfigurationkmsFromFile-DeploymentStrategy-4BD2B26C",
52+
"ReplicateTo": "NONE"
53+
}
54+
},
55+
"MyHostedConfigFromFileConfigurationProfile32B2D26F": {
56+
"Type": "AWS::AppConfig::ConfigurationProfile",
57+
"Properties": {
58+
"ApplicationId": {
59+
"Ref": "MyAppConfigB4B63E75"
60+
},
61+
"KmsKeyIdentifier": {
62+
"Fn::GetAtt": [
63+
"MyKey6AB29FA6",
64+
"Arn"
65+
]
66+
},
67+
"LocationUri": "hosted",
68+
"Name": "awsappconfigconfigurationkms-MyHostedConfigFromFile-EF9016BD"
69+
}
70+
},
71+
"MyHostedConfigFromFile943CF9F9": {
72+
"Type": "AWS::AppConfig::HostedConfigurationVersion",
73+
"Properties": {
74+
"ApplicationId": {
75+
"Ref": "MyAppConfigB4B63E75"
76+
},
77+
"ConfigurationProfileId": {
78+
"Ref": "MyHostedConfigFromFileConfigurationProfile32B2D26F"
79+
},
80+
"Content": "{\n \"content\": \"This is the configuration content\"\n}",
81+
"ContentType": "application/json"
82+
},
83+
"UpdateReplacePolicy": "Retain",
84+
"DeletionPolicy": "Retain"
85+
}
86+
},
87+
"Parameters": {
88+
"BootstrapVersion": {
89+
"Type": "AWS::SSM::Parameter::Value<String>",
90+
"Default": "/cdk-bootstrap/hnb659fds/version",
91+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
92+
}
93+
},
94+
"Rules": {
95+
"CheckBootstrapVersion": {
96+
"Assertions": [
97+
{
98+
"Assert": {
99+
"Fn::Not": [
100+
{
101+
"Fn::Contains": [
102+
[
103+
"1",
104+
"2",
105+
"3",
106+
"4",
107+
"5"
108+
],
109+
{
110+
"Ref": "BootstrapVersion"
111+
}
112+
]
113+
}
114+
]
115+
},
116+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
117+
}
118+
]
119+
}
120+
}
121+
}

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration-kms.js.snapshot/cdk.out

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

packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.configuration-kms.js.snapshot/integ.json

Lines changed: 12 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)