Skip to content

Commit 6f84d1e

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into synthetics-python-4
2 parents 4be8c36 + 5146fe5 commit 6f84d1e

543 files changed

Lines changed: 93113 additions & 42702 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/workflows/request-cli-integ-test.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,14 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@6b2903bdce6310cfbddd87c418f253cf29b2dec9
22+
uses: tj-actions/changed-files@40853de9f8ce2d6cfdc73c1b96f14e22ba44aec4
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |
2626
cli:
2727
- packages/aws-cdk/bin/**
2828
- packages/aws-cdk/lib/**
2929
- packages/aws-cdk/test/**
30-
- packages/cdk-assets/bin/**
31-
- packages/cdk-assets/lib/**
32-
- packages/cdk-assets/test/**
33-
- packages/aws-cdk-lib/cloud-assembly-schema/lib/**
34-
- packages/aws-cdk-lib/cloud-assembly-schema/schema/**
35-
- packages/aws-cdk-lib/cloud-assembly-schema/scripts/**
36-
- packages/aws-cdk-lib/cloud-assembly-schema/test/**
3730
- packages/@aws-cdk/cloudformation-diff/lib/**
3831
- packages/@aws-cdk/cloudformation-diff/test/**
3932
- packages/@aws-cdk-testing/cli-integ/bin/**

‎.mergify.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pull_request_rules:
1111
label:
1212
add: [ contribution/core ]
1313
conditions:
14-
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere)$
14+
- author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|ashishdhingra|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere)$
1515
- -label~="contribution/core"
1616
- name: automatic merge
1717
actions:

‎CHANGELOG.v2.alpha.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
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.154.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.154.0-alpha.0...v2.154.1-alpha.0) (2024-08-23)
6+
7+
## [2.154.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.153.0-alpha.0...v2.154.0-alpha.0) (2024-08-22)
8+
9+
10+
### Features
11+
12+
* **amplify:** support custom certificate ([#30791](https://github.com/aws/aws-cdk/issues/30791)) ([8d76778](https://github.com/aws/aws-cdk/commit/8d767786fe88d0ed60104ea6f48176e8981dd0fa)), closes [#30594](https://github.com/aws/aws-cdk/issues/30594)
13+
* **ec2:** security group lookup via filters ([#30625](https://github.com/aws/aws-cdk/issues/30625)) ([abc78bf](https://github.com/aws/aws-cdk/commit/abc78bfa613453185e59d5d9a17e5c5cfb5437b3)), closes [#30331](https://github.com/aws/aws-cdk/issues/30331)
14+
* **sagemaker:** network isolation for a model ([#30657](https://github.com/aws/aws-cdk/issues/30657)) ([f1af7fc](https://github.com/aws/aws-cdk/commit/f1af7fc66b5ca5b3a4780ed695045d2da65df3ba))
15+
16+
17+
### Bug Fixes
18+
19+
* **cli-lib-alpha:** bootstrap fails with "bad argument name" error for trust and trustForLookup ([#31159](https://github.com/aws/aws-cdk/issues/31159)) ([b11ca4a](https://github.com/aws/aws-cdk/commit/b11ca4ae27753e33f5c44baedf1529489c4e081a)), closes [#30404](https://github.com/aws/aws-cdk/issues/30404)
20+
* **cognito-identitypool-alpha:** validation error if provided id is a token ([#30882](https://github.com/aws/aws-cdk/issues/30882)) ([ad1b797](https://github.com/aws/aws-cdk/commit/ad1b7977768430da0ce262103e8a91f0e632ffe2)), closes [#29780](https://github.com/aws/aws-cdk/issues/29780) [#28184](https://github.com/aws/aws-cdk/issues/28184)
21+
* **ec2:** prevent deduplication of init command args ([#30821](https://github.com/aws/aws-cdk/issues/30821)) ([1e7c690](https://github.com/aws/aws-cdk/commit/1e7c690f5ec404d7c620dc54692999fee67b3eaf)), closes [#26221](https://github.com/aws/aws-cdk/issues/26221)
22+
23+
## [2.153.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.152.0-alpha.0...v2.153.0-alpha.0) (2024-08-19)
24+
25+
## [2.152.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.151.1-alpha.0...v2.152.0-alpha.0) (2024-08-14)
26+
27+
## [2.151.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.151.0-alpha.0...v2.151.1-alpha.0) (2024-08-14)
28+
529
## [2.151.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.150.0-alpha.0...v2.151.0-alpha.0) (2024-08-01)
630

731

‎CHANGELOG.v2.md‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,77 @@
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.154.1](https://github.com/aws/aws-cdk/compare/v2.154.0...v2.154.1) (2024-08-23)
6+
7+
8+
### Features
9+
10+
* update L1 CloudFormation resource definitions ([#31193](https://github.com/aws/aws-cdk/issues/31193)) ([aa97525](https://github.com/aws/aws-cdk/commit/aa975253fe7f21f20c1d0a92f0b9c4fd28ed3236))
11+
* update L1 CloudFormation resource definitions ([#31194](https://github.com/aws/aws-cdk/issues/31194)) ([2191264](https://github.com/aws/aws-cdk/commit/2191264491dbf373c0678f6984a1beab7d913d5f))
12+
13+
14+
### Bug Fixes
15+
16+
* **cloudfront:** requirement of domainNames prevents moving a domain name between distributions ([#31001](https://github.com/aws/aws-cdk/issues/31001)) ([1255ce3](https://github.com/aws/aws-cdk/commit/1255ce3b68341755f1bd8f44d68d0da8558a1a5e)), closes [#29960](https://github.com/aws/aws-cdk/issues/29960) [#29329](https://github.com/aws/aws-cdk/issues/29329)
17+
18+
## [2.154.0](https://github.com/aws/aws-cdk/compare/v2.153.0...v2.154.0) (2024-08-22)
19+
20+
21+
### Features
22+
23+
* update L1 CloudFormation resource definitions ([#31145](https://github.com/aws/aws-cdk/issues/31145)) ([5387605](https://github.com/aws/aws-cdk/commit/53876051da7fac7398cbfdc87f991f5b009d2e3a))
24+
* **batch:** add ECS_AL2023 ([#30928](https://github.com/aws/aws-cdk/issues/30928)) ([d45bf08](https://github.com/aws/aws-cdk/commit/d45bf08c3fa6d342cf06fe26b748b5e367c3e5e3))
25+
* **CLI:** synth displays "AssertDescription: CDK bootstrap stack version 6 required" ([#31092](https://github.com/aws/aws-cdk/issues/31092)) ([751a922](https://github.com/aws/aws-cdk/commit/751a922de30e88a1faa7a20fb7b29cb43856d522)), closes [#17942](https://github.com/aws/aws-cdk/issues/17942)
26+
* **core:** configure SNS topics to receive stack events on the Stack construct ([#30551](https://github.com/aws/aws-cdk/issues/30551)) ([0cdce20](https://github.com/aws/aws-cdk/commit/0cdce20a8688bb233930542d01358e26e5ba8a61)), closes [#8581](https://github.com/aws/aws-cdk/issues/8581)
27+
* **dynamodb:** adding on-demand-throughput to table ([#30725](https://github.com/aws/aws-cdk/issues/30725)) ([d5a19bb](https://github.com/aws/aws-cdk/commit/d5a19bb3eeda50a7b08e2b814dfcf76e6ac21fdc)), closes [#30091](https://github.com/aws/aws-cdk/issues/30091)
28+
* **elasticloadbalancingv2:** connection logs for ALB ([#30599](https://github.com/aws/aws-cdk/issues/30599)) ([7c4f423](https://github.com/aws/aws-cdk/commit/7c4f423bf14af996203b090429b8c59bd32f50d8))
29+
* **elasticloadbalancingv2:** support Mutual Authentication with TLS for Application Load Balancer ([#30784](https://github.com/aws/aws-cdk/issues/30784)) ([7eae4d1](https://github.com/aws/aws-cdk/commit/7eae4d1358762d72d96b08c6cd020628d3cb77f2)), closes [#28206](https://github.com/aws/aws-cdk/issues/28206)
30+
* **region-info:** update Metadata regions ([#31044](https://github.com/aws/aws-cdk/issues/31044)) ([ae7d181](https://github.com/aws/aws-cdk/commit/ae7d1814900fc10ab489bc7a4cfe8ccd1694e8f8))
31+
* **region-info:** update Metadata regions ([#31046](https://github.com/aws/aws-cdk/issues/31046)) ([6ec69b9](https://github.com/aws/aws-cdk/commit/6ec69b9184417c7fb5d4df808b57ae59c546753c))
32+
* **region-info:** update Metadata regions ([#31047](https://github.com/aws/aws-cdk/issues/31047)) ([9025635](https://github.com/aws/aws-cdk/commit/9025635e7401388a4192d34b9fbe2ae28d849587))
33+
* **s3:** add skip destination validation property ([#30916](https://github.com/aws/aws-cdk/issues/30916)) ([ffc40e5](https://github.com/aws/aws-cdk/commit/ffc40e537d03a6fea4bfb36e3b94c7525629e907)), closes [#30914](https://github.com/aws/aws-cdk/issues/30914) [#30914](https://github.com/aws/aws-cdk/issues/30914)
34+
* **ssm:** support cross-account sharing ([#30646](https://github.com/aws/aws-cdk/issues/30646)) ([1eb1ea6](https://github.com/aws/aws-cdk/commit/1eb1ea6ba64f41ba040d9470156d566c9ce6c3e0)), closes [#29292](https://github.com/aws/aws-cdk/issues/29292)
35+
* set log retention of all CDK-vended custom resources with CustomResourceConfig ([#31041](https://github.com/aws/aws-cdk/issues/31041)) ([f2babd9](https://github.com/aws/aws-cdk/commit/f2babd9373523cc3d5708349db5c3c270e99ae1a))
36+
* update L1 CloudFormation resource definitions ([#31025](https://github.com/aws/aws-cdk/issues/31025)) ([5414932](https://github.com/aws/aws-cdk/commit/541493297dd996725b060c84d23651a69e239750))
37+
* update L1 CloudFormation resource definitions ([#31086](https://github.com/aws/aws-cdk/issues/31086)) ([62a641c](https://github.com/aws/aws-cdk/commit/62a641c1ff77270ead66113716545d415a3b18e1))
38+
* update L1 CloudFormation resource definitions ([#31120](https://github.com/aws/aws-cdk/issues/31120)) ([931ebba](https://github.com/aws/aws-cdk/commit/931ebba02ca43b173cb7770e9cb703f05646683b))
39+
* **vpc:** support custom route and subnet ([#30538](https://github.com/aws/aws-cdk/issues/30538)) ([e17fdd7](https://github.com/aws/aws-cdk/commit/e17fdd76959e8aafd07cfa1db34325f1c24b3acf)), closes [RFC#507](https://github.com/aws/RFC/issues/507)
40+
41+
42+
### Bug Fixes
43+
44+
* **elasticloadbalancingv2-targets:** add AlbListenerTarget for NLBs, deprecate AlbTarget due to ALB listener race conditions ([#17208](https://github.com/aws/aws-cdk/issues/17208)) ([#30396](https://github.com/aws/aws-cdk/issues/30396)) ([1fca1e5](https://github.com/aws/aws-cdk/commit/1fca1e5b92ba760a33652f39c2345f6aa1eaa9f7)), closes [/github.com/aws/aws-cdk/issues/17208#issuecomment-1681475590](https://github.com/aws//github.com/aws/aws-cdk/issues/17208/issues/issuecomment-1681475590)
45+
* **lambda:** validate localMountPath format and length ([#31019](https://github.com/aws/aws-cdk/issues/31019)) ([c159e77](https://github.com/aws/aws-cdk/commit/c159e77ab34701fc6780b9501f1692fbf2366b04))
46+
* **vpc-v2:** fixing default scope id ([#31102](https://github.com/aws/aws-cdk/issues/31102)) ([0007a29](https://github.com/aws/aws-cdk/commit/0007a29714cf04abb307845874dde27c813d45dd))
47+
48+
49+
### Reverts
50+
51+
* feat(core): configure SNS topics to receive stack events on the Stack construct ([#31100](https://github.com/aws/aws-cdk/issues/31100)) ([5f30aa5](https://github.com/aws/aws-cdk/commit/5f30aa5f81ef823422e994563cefc9e8a15e82f8)), closes [aws/aws-cdk#30551](https://github.com/aws/aws-cdk/issues/30551)
52+
* feat(ec2): security group lookup via filters ([#31065](https://github.com/aws/aws-cdk/issues/31065)) ([79b5cd2](https://github.com/aws/aws-cdk/commit/79b5cd2390508e7b5c3d5c93001e30387bf88a4e)), closes [aws/aws-cdk#30625](https://github.com/aws/aws-cdk/issues/30625)
53+
* feat(ecs): add validation checks to memory cpu combinations of FARGATE compatible task definitions ([#31110](https://github.com/aws/aws-cdk/issues/31110)) ([ffba5b1](https://github.com/aws/aws-cdk/commit/ffba5b1d0a8dfece02a9d5ad8a989955a7f4a812))
54+
55+
## [2.153.0](https://github.com/aws/aws-cdk/compare/v2.152.0...v2.153.0) (2024-08-19)
56+
57+
58+
### Features
59+
60+
* **lambda:** support Recursive Loop Protection property ([572fe0a](https://github.com/aws/aws-cdk/commit/572fe0a68f18724f5b43460c1858634b5aff45e5))
61+
62+
## [2.152.0](https://github.com/aws/aws-cdk/compare/v2.151.1...v2.152.0) (2024-08-14)
63+
64+
65+
### Features
66+
67+
* **lambda:** support filter criteria encryption ([6aa72a2](https://github.com/aws/aws-cdk/commit/6aa72a215859ab96e9fd8b4ccee0d40bda753200))
68+
69+
## [2.151.1](https://github.com/aws/aws-cdk/compare/v2.151.0...v2.151.1) (2024-08-14)
70+
71+
72+
### Reverts
73+
74+
* feat(ecs): add validation checks to memory cpu combinations of FARGATE compatible task definitions ([#31110](https://github.com/aws/aws-cdk/issues/31110)) ([8fdf015](https://github.com/aws/aws-cdk/commit/8fdf015fdc310d6d62cec31b6d89e1ff1decb8b6))
75+
576
## [2.151.0](https://github.com/aws/aws-cdk/compare/v2.150.0...v2.151.0) (2024-08-01)
677

778

‎CONTRIBUTORS.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ Shout out to our top contributors!
1212
- [shivlaks](https://github.com/shivlaks)
1313
- [otaviomacedo](https://github.com/otaviomacedo)
1414
- [mrgrain](https://github.com/mrgrain)
15-
- [madeline-k](https://github.com/madeline-k)
1615
- [pahud](https://github.com/pahud)
16+
- [madeline-k](https://github.com/madeline-k)
1717
- [comcalvi](https://github.com/comcalvi)
18-
- [NetaNir](https://github.com/NetaNir)
1918
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
19+
- [NetaNir](https://github.com/NetaNir)
2020
- [robertd](https://github.com/robertd)
2121
- [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
2222
- [go-to-k](https://github.com/go-to-k)
2323
- [lpizzinidev](https://github.com/lpizzinidev)
2424
- [peterwoodworth](https://github.com/peterwoodworth)
2525
- [colifran](https://github.com/colifran)
2626
- [msambol](https://github.com/msambol)
27-
- [nija-at](https://github.com/nija-at)
2827
- [watany-dev](https://github.com/watany-dev)
28+
- [nija-at](https://github.com/nija-at)
2929
- [hoegertn](https://github.com/hoegertn)
3030

3131

32-
_Last updated: Mon, 01 Jul 24 00:11:02 +0000_
32+
_Last updated: Thu, 01 Aug 24 00:10:57 +0000_

‎lerna.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"npmClient": "yarn",
33
"packages": [
44
"packages/aws-cdk-lib",
5-
"packages/cdk-assets",
65
"packages/aws-cdk",
76
"packages/cdk",
87
"packages/@aws-cdk/*",
@@ -25,4 +24,4 @@
2524
"rejectCycles": true,
2625
"version": "0.0.0",
2726
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
28-
}
27+
}

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.101.0",
29-
"jsii-pacmak": "1.101.0",
30-
"jsii-reflect": "1.101.0",
28+
"jsii-diff": "1.102.0",
29+
"jsii-pacmak": "1.102.0",
30+
"jsii-reflect": "1.102.0",
3131
"lerna": "^8.1.5",
3232
"nx": "^19.4.0",
3333
"patch-package": "^6.5.1",
@@ -72,7 +72,6 @@
7272
"packages/aws-cdk-lib",
7373
"packages/aws-cdk",
7474
"packages/cdk",
75-
"packages/cdk-assets",
7675
"packages/@aws-cdk/*",
7776
"packages/awslint",
7877
"packages/@aws-cdk-testing/*",

‎packages/@aws-cdk-testing/cli-integ/lib/package-sources/repo-source.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ const YARN_MONOREPO_CACHE: Record<string, any> = {};
7575
*
7676
* Cached in YARN_MONOREPO_CACHE.
7777
*/
78-
async function findYarnPackages(root: string): Promise<Record<string, string>> {
78+
export async function findYarnPackages(root: string): Promise<Record<string, string>> {
7979
if (!(root in YARN_MONOREPO_CACHE)) {
80-
const output: YarnWorkspacesOutput = JSON.parse(await shell(['yarn', 'workspaces', '--silent', 'info'], {
80+
const outputDataString: string = JSON.parse(await shell(['yarn', 'workspaces', '--json', 'info'], {
8181
captureStderr: false,
8282
cwd: root,
8383
show: 'error',
84-
}));
84+
})).data;
85+
const output: YarnWorkspacesOutput = JSON.parse(outputDataString);
8586

8687
const ret: Record<string, string> = {};
8788
for (const [k, v] of Object.entries(output)) {
@@ -96,7 +97,7 @@ async function findYarnPackages(root: string): Promise<Record<string, string>> {
9697
* Find the root directory of the repo from the current directory
9798
*/
9899
export async function autoFindRoot() {
99-
const found = await findUp('release.json');
100+
const found = findUp('release.json');
100101
if (!found) {
101102
throw new Error(`Could not determine repository root: 'release.json' not found from ${process.cwd()}`);
102103
}

‎packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import * as os from 'os';
44
import * as path from 'path';
55
import { outputFromStack, AwsClients } from './aws';
66
import { TestContext } from './integ-test';
7+
import { findYarnPackages } from './package-sources/repo-source';
78
import { IPackageSource } from './package-sources/source';
89
import { packageSourceInSubprocess } from './package-sources/subprocess';
910
import { RESOURCES_DIR } from './resources';
@@ -612,6 +613,17 @@ function defined<A>(x: A): x is NonNullable<A> {
612613
* for Node's dependency lookup mechanism).
613614
*/
614615
export async function installNpmPackages(fixture: TestFixture, packages: Record<string, string>) {
616+
if (process.env.REPO_ROOT) {
617+
const monoRepo = await findYarnPackages(process.env.REPO_ROOT);
618+
619+
// Replace the install target with the physical location of this package
620+
for (const key of Object.keys(packages)) {
621+
if (key in monoRepo) {
622+
packages[key] = monoRepo[key];
623+
}
624+
}
625+
}
626+
615627
fs.writeFileSync(path.join(fixture.integTestDir, 'package.json'), JSON.stringify({
616628
name: 'cdk-integ-tests',
617629
private: true,

‎packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ integTest('cdk synth', withDefaultFixture(async (fixture) => {
102102
},
103103
}));
104104

105+
expect(await fixture.cdkSynth({
106+
options: [fixture.fullStackName('test-1')],
107+
})).not.toEqual(expect.stringContaining(`
108+
Rules:
109+
CheckBootstrapVersion:`));
110+
105111
await fixture.cdk(['synth', fixture.fullStackName('test-2')], { verbose: false });
106112
expect(fixture.template('test-2')).toEqual(expect.objectContaining({
107113
Resources: {

0 commit comments

Comments
 (0)