Skip to content

Commit ad5325a

Browse files
authored
2 parents 10aa526 + f03e52f commit ad5325a

File tree

384 files changed

+320454
-926
lines changed

Some content is hidden

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

384 files changed

+320454
-926
lines changed

.github/workflows/request-cli-integ-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
git config --global user.email '[email protected]'
5555
git push --force --atomic https://github.com/${{ github.repository }}.git FETCH_HEAD:test-main-pipeline
5656
- name: Explain next steps
57-
uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6
57+
uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9
5858
with:
5959
message: |
6060
:arrow_right: **PR build request submitted to `test-main-pipeline`** :arrow_left:

.github/workflows/sync-from-upstream.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,21 @@ jobs:
4343
contents: write
4444
needs: [check-secret]
4545
steps:
46-
- name: Checkout using User Token
46+
- name: Checkout using User Token (+ download lfs dependencies)
4747
if: needs.check-secret.outputs.ok == 'true'
4848
uses: actions/checkout@v4
4949
with:
50+
lfs: true
5051
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
5152

52-
- name: Checkout using GitHub Actions permissions
53+
- name: Checkout using GitHub Actions permissions (+ download lfs dependencies)
5354
if: needs.check-secret.outputs.ok == 'false'
5455
uses: actions/checkout@v4
56+
with:
57+
lfs: true
58+
59+
- name: Checkout LFS objects
60+
run: git lfs checkout
5561

5662
- name: Sync from aws/aws-cdk
5763
run: |-

.github/workflows/v2-pull-request.yml

-37
This file was deleted.

.mergify.yml

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
# See https://doc.mergify.io
22
queue_rules:
3-
- name: default
3+
- name: default-merge
44
update_method: merge
5+
merge_method: merge
56
conditions:
67
- status-success~=AWS CodeBuild us-east-1
8+
commit_message_template: |-
9+
{{ title }} (#{{ number }})
10+
{{ body }}
11+
12+
- name: default-squash
13+
update_method: merge
14+
merge_method: squash
15+
conditions:
16+
- status-success~=AWS CodeBuild us-east-1
17+
commit_message_template: |-
18+
{{ title }} (#{{ number }})
19+
{{ body }}
720
821
pull_request_rules:
922
- name: label core
@@ -18,11 +31,7 @@ pull_request_rules:
1831
comment:
1932
message: Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
2033
queue:
21-
name: default
22-
method: squash
23-
commit_message_template: |-
24-
{{ title }} (#{{ number }})
25-
{{ body }}
34+
name: default-squash
2635
conditions:
2736
- base!=release
2837
- -title~=(WIP|wip)
@@ -41,11 +50,7 @@ pull_request_rules:
4150
comment:
4251
message: Thank you for contributing! Your pull request will be automatically updated and merged (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
4352
queue:
44-
name: default
45-
method: squash
46-
commit_message_template: |-
47-
{{ title }} (#{{ number }})
48-
{{ body }}
53+
name: default-squash
4954
conditions:
5055
- base!=release
5156
- -title~=(WIP|wip)
@@ -65,11 +70,7 @@ pull_request_rules:
6570
comment:
6671
message: Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
6772
queue:
68-
name: default
69-
method: merge
70-
commit_message_template: |-
71-
{{ title }} (#{{ number }})
72-
{{ body }}
73+
name: default-merge
7374
conditions:
7475
- -title~=(WIP|wip)
7576
- -label~=(blocked|do-not-merge)
@@ -112,11 +113,7 @@ pull_request_rules:
112113
comment:
113114
message: Thanks Dependabot!
114115
queue:
115-
name: default
116-
method: squash
117-
commit_message_template: |-
118-
{{ title }} (#{{ number }})
119-
{{ body }}
116+
name: default-squash
120117
conditions:
121118
- -title~=(WIP|wip)
122119
- -label~=(blocked|do-not-merge)

CHANGELOG.v2.alpha.md

+16
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
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.163.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.162.1-alpha.0...v2.163.0-alpha.0) (2024-10-21)
6+
7+
8+
### Features
9+
10+
* **ec2:** disable api termination ([#30620](https://github.com/aws/aws-cdk/issues/30620)) ([108737d](https://github.com/aws/aws-cdk/commit/108737d613e2a2da20a53fe92a4dac2b43d21044))
11+
* **kinesisfirehose-alpha:** refactor sourceStream property to support multiple types of sources ([#31723](https://github.com/aws/aws-cdk/issues/31723)) ([0260046](https://github.com/aws/aws-cdk/commit/026004682f25d324b5f82b8d0ed92820c55233c1))
12+
* **pipes-enrichments:** support API destination enrichment ([#31312](https://github.com/aws/aws-cdk/issues/31312)) ([1557793](https://github.com/aws/aws-cdk/commit/1557793f696da77ab592e81165dbbb5c0886e7e2)), closes [#29383](https://github.com/aws/aws-cdk/issues/29383)
13+
* **pipes-targets:** add CloudWatch Logs ([#30665](https://github.com/aws/aws-cdk/issues/30665)) ([893769e](https://github.com/aws/aws-cdk/commit/893769ed22818a6c31ec1bdd58d458f50ba28c48))
14+
15+
16+
### Bug Fixes
17+
18+
* **ec2:** exposed userDataCausesReplacement in BastionHostLinuxProps ([#31416](https://github.com/aws/aws-cdk/issues/31416)) ([029c298](https://github.com/aws/aws-cdk/commit/029c298db9875214eb16b88689b13f5e244b5ea4)), closes [#31348](https://github.com/aws/aws-cdk/issues/31348)
19+
* **scheduler-alpha:** remove `targetOverrides` prop from Schedule ([#31799](https://github.com/aws/aws-cdk/issues/31799)) ([be4154b](https://github.com/aws/aws-cdk/commit/be4154b3a2bba28700b8476dfb26af54da0bdc6f))
20+
521
## [2.162.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.162.0-alpha.0...v2.162.1-alpha.0) (2024-10-11)
622

723
## [2.162.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.161.1-alpha.0...v2.162.0-alpha.0) (2024-10-10)

CHANGELOG.v2.md

+31
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,37 @@
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.163.0](https://github.com/aws/aws-cdk/compare/v2.162.1...v2.163.0) (2024-10-21)
6+
7+
8+
### Features
9+
10+
* **cli:** garbage collect s3 assets (under `--unstable` flag) ([#31611](https://github.com/aws/aws-cdk/issues/31611)) ([0a0e4ad](https://github.com/aws/aws-cdk/commit/0a0e4ad271197ccec2242d247516616f966a959c))
11+
* **cognito:** support `emailVerified` for `AttributeMapping` interface ([#31632](https://github.com/aws/aws-cdk/issues/31632)) ([5de7835](https://github.com/aws/aws-cdk/commit/5de783504111b6a04dc8d1da7c67a30200f3e3e5)), closes [#30467](https://github.com/aws/aws-cdk/issues/30467) [#30467](https://github.com/aws/aws-cdk/issues/30467)
12+
* **dynamodb:** enable contributor insights for global secondary index ([#30560](https://github.com/aws/aws-cdk/issues/30560)) ([799b541](https://github.com/aws/aws-cdk/commit/799b541135d0fb9cea31ddf29a8dacc1a94cb0fc)), closes [#15671](https://github.com/aws/aws-cdk/issues/15671)
13+
* **ecs-patterns:** support NLB with TLS listener and target group ([#30611](https://github.com/aws/aws-cdk/issues/30611)) ([f4f8abc](https://github.com/aws/aws-cdk/commit/f4f8abcb2a6df6a26b289b49b7738efce78b2936)), closes [#8517](https://github.com/aws/aws-cdk/issues/8517)
14+
* **efs:** allow AccessPoint to set client token ([#31184](https://github.com/aws/aws-cdk/issues/31184)) ([8208774](https://github.com/aws/aws-cdk/commit/8208774fb9a5f9d58a5fea24e60aa6862e861aba))
15+
* **events:** dead letter queue for an Event Bus ([#30628](https://github.com/aws/aws-cdk/issues/30628)) ([318eae6](https://github.com/aws/aws-cdk/commit/318eae6c9eca456e0c34ed21855dad9d2bfa2a0f)), closes [#30531](https://github.com/aws/aws-cdk/issues/30531)
16+
* **fsx:** specify file system type version for the Lustre file system ([#31136](https://github.com/aws/aws-cdk/issues/31136)) ([252cca9](https://github.com/aws/aws-cdk/commit/252cca9351be0dc09c242107639dceee74b96898)), closes [#31130](https://github.com/aws/aws-cdk/issues/31130)
17+
* **fsx:** support HDD storage type for a Lustre file systems ([#30207](https://github.com/aws/aws-cdk/issues/30207)) ([2d9aefb](https://github.com/aws/aws-cdk/commit/2d9aefbb6c2c5323d3d2d17e5961fb2300c25fa3)), closes [#30206](https://github.com/aws/aws-cdk/issues/30206)
18+
* **iam:** allow creating service principal using custom name ([#31793](https://github.com/aws/aws-cdk/issues/31793)) ([3d650c3](https://github.com/aws/aws-cdk/commit/3d650c30a2e1a47584b3dacd632269bab2071348)), closes [#31767](https://github.com/aws/aws-cdk/issues/31767)
19+
* **kms:** allow `fromLookup` method to return dummy key if target key was not found ([#31676](https://github.com/aws/aws-cdk/issues/31676)) ([34bdeca](https://github.com/aws/aws-cdk/commit/34bdecad76ac93d7dc4f8321352e851cebc75e17)), closes [#31574](https://github.com/aws/aws-cdk/issues/31574) [/github.com/aws/aws-cdk/blob/v2.161.0/packages/aws-cdk-lib/aws-kms/lib/key.ts#L686](https://github.com/aws//github.com/aws/aws-cdk/blob/v2.161.0/packages/aws-cdk-lib/aws-kms/lib/key.ts/issues/L686) [/github.com/aws/aws-cdk/issues/31574#issuecomment-2399080697](https://github.com/aws//github.com/aws/aws-cdk/issues/31574/issues/issuecomment-2399080697)
20+
* **rds:** support local write forwarding for an aurora PostgreSQL cluster ([#31803](https://github.com/aws/aws-cdk/issues/31803)) ([a32436a](https://github.com/aws/aws-cdk/commit/a32436a5ea834b29faed19f37652fb4dae3fb1d7)), closes [#31802](https://github.com/aws/aws-cdk/issues/31802)
21+
* **s3:** support `transitionDefaultMinimumObjectSize` for life cycle ([#31778](https://github.com/aws/aws-cdk/issues/31778)) ([4aa117b](https://github.com/aws/aws-cdk/commit/4aa117b34c95555ea7d53dfa748a048196bf4044)), closes [#31777](https://github.com/aws/aws-cdk/issues/31777) [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfiguration.html#cfn-s3](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfiguration.html/issues/cfn-s3)
22+
* update L1 CloudFormation resource definitions ([#31752](https://github.com/aws/aws-cdk/issues/31752)) ([8067294](https://github.com/aws/aws-cdk/commit/8067294f6c378795538d7ed2a8e0741310bec0b9))
23+
* update L1 CloudFormation resource definitions ([#31800](https://github.com/aws/aws-cdk/issues/31800)) ([fccb006](https://github.com/aws/aws-cdk/commit/fccb0060759af997db1bf2b69a27d1c0d282e28c))
24+
* **rds:** support performance insights configuration at cluster level ([#31385](https://github.com/aws/aws-cdk/issues/31385)) ([7d6bf77](https://github.com/aws/aws-cdk/commit/7d6bf773d3a8f17d94c4aa5d5aa9025270c254aa)), closes [#31375](https://github.com/aws/aws-cdk/issues/31375)
25+
* disallow cross account asset publishing in some scenarios ([#31623](https://github.com/aws/aws-cdk/issues/31623)) ([edd031d](https://github.com/aws/aws-cdk/commit/edd031d3c76a870991bf8a5f021f8043d6a2b871))
26+
* **step-functions:** add bucketNamePath in item reader ([#31619](https://github.com/aws/aws-cdk/issues/31619)) ([97130d8](https://github.com/aws/aws-cdk/commit/97130d80824cbbef4323ed7ead00fcfdc61fe7fb)), closes [#29409](https://github.com/aws/aws-cdk/issues/29409)
27+
28+
29+
### Bug Fixes
30+
31+
* **cli:** `cdk import` errors with 'S3 error: Access Denied' ([#31727](https://github.com/aws/aws-cdk/issues/31727)) ([cd324d0](https://github.com/aws/aws-cdk/commit/cd324d028e03215e877f13a26992ebd5a2b4db03)), closes [#31597](https://github.com/aws/aws-cdk/issues/31597) [#31716](https://github.com/aws/aws-cdk/issues/31716)
32+
* **lambda:** filterRule.null() returns empty array ([#31701](https://github.com/aws/aws-cdk/issues/31701)) ([5830ee1](https://github.com/aws/aws-cdk/commit/5830ee1eb29fc025c3ebe1451647c79cef155ea1)), closes [#31458](https://github.com/aws/aws-cdk/issues/31458)
33+
* **s3:** add support for uppercase characters in legacy bucket names ([#31813](https://github.com/aws/aws-cdk/issues/31813)) ([7bebf40](https://github.com/aws/aws-cdk/commit/7bebf400a6e271c3f50402a5e72aff1f1b8be109)), closes [#31731](https://github.com/aws/aws-cdk/issues/31731)
34+
* **stepfunctions-tasks:** stateMachine construct doesn't generate a valid policy for default StateMachineRole ([#31801](https://github.com/aws/aws-cdk/issues/31801)) ([efbbddb](https://github.com/aws/aws-cdk/commit/efbbddbee370a9b4dba2fbea4c92b44ad39be973)), closes [#31714](https://github.com/aws/aws-cdk/issues/31714)
35+
536
## [2.162.1](https://github.com/aws/aws-cdk/compare/v2.162.0...v2.162.1) (2024-10-11)
637

738

allowed-breaking-changes.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -932,4 +932,8 @@ removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_SWEDISH_FULL_BASE
932932
removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_TURKISH_FULL_BASE_2023_11_15
933933
removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_TURKISH_FULL_BASE_2023_12_13
934934
removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_TURKISH_FULL_BASE_2024_01_16
935-
removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_TURKISH_FULL_BASE_2024_02_14
935+
removed:aws-cdk-lib.aws_ec2.WindowsVersion.WINDOWS_SERVER_2022_TURKISH_FULL_BASE_2024_02_14
936+
937+
# null() return a [] which is invalid filter rule. It should return [null].
938+
# Hence the return type changes from string[] to any
939+
change-return-type:aws-cdk-lib.aws_lambda.FilterRule.null

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

+45
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,30 @@ export interface CdkModernBootstrapCommandOptions extends CommonCdkBootstrapComm
331331
readonly usePreviousParameters?: boolean;
332332
}
333333

334+
export interface CdkGarbageCollectionCommandOptions {
335+
/**
336+
* The amount of days an asset should stay isolated before deletion, to
337+
* guard against some pipeline rollback scenarios
338+
*
339+
* @default 0
340+
*/
341+
readonly rollbackBufferDays?: number;
342+
343+
/**
344+
* The type of asset that is getting garbage collected.
345+
*
346+
* @default 'all'
347+
*/
348+
readonly type?: 'ecr' | 's3' | 'all';
349+
350+
/**
351+
* The name of the bootstrap stack
352+
*
353+
* @default 'CdkToolkit'
354+
*/
355+
readonly bootstrapStackName?: string;
356+
}
357+
334358
export class TestFixture extends ShellHelper {
335359
public readonly qualifier = this.randomString.slice(0, 10);
336360
private readonly bucketsToDelete = new Array<string>();
@@ -464,6 +488,26 @@ export class TestFixture extends ShellHelper {
464488
});
465489
}
466490

491+
public async cdkGarbageCollect(options: CdkGarbageCollectionCommandOptions): Promise<string> {
492+
const args = [
493+
'gc',
494+
'--unstable=gc', // TODO: remove when stabilizing
495+
'--confirm=false',
496+
'--created-buffer-days=0', // Otherwise all assets created during integ tests are too young
497+
];
498+
if (options.rollbackBufferDays) {
499+
args.push('--rollback-buffer-days', String(options.rollbackBufferDays));
500+
}
501+
if (options.type) {
502+
args.push('--type', options.type);
503+
}
504+
if (options.bootstrapStackName) {
505+
args.push('--bootstrapStackName', options.bootstrapStackName);
506+
}
507+
508+
return this.cdk(args);
509+
}
510+
467511
public async cdkMigrate(language: string, stackName: string, inputPath?: string, options?: CdkCliOptions) {
468512
return this.cdk([
469513
'migrate',
@@ -634,6 +678,7 @@ async function ensureBootstrapped(fixture: TestFixture) {
634678
CDK_NEW_BOOTSTRAP: '1',
635679
},
636680
});
681+
637682
ALREADY_BOOTSTRAPPED_IN_THIS_RUN.add(envSpecifier);
638683
}
639684

0 commit comments

Comments
 (0)