Skip to content

Commit c77e869

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into yuanhaoz/customize-role-fix
2 parents 2f857db + f656308 commit c77e869

409 files changed

Lines changed: 321813 additions & 1135 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ jobs:
5454
git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
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:
6161
6262
A maintainer must now check the pipeline and add the `pr-linter/cli-integ-tested` label once the pipeline succeeds.
63-
comment_tag: request-cli-integ-test
63+
comment-tag: request-cli-integ-test
6464
mode: recreate
6565
# Post as our automation user
66-
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
66+
github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

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

Lines changed: 8 additions & 2 deletions
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‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.mergify.yml‎

Lines changed: 18 additions & 21 deletions
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‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,46 @@
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+
21+
## [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)
22+
23+
## [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)
24+
25+
26+
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
27+
28+
* **kinesisfirehose-alpha:** replaced `destinations` property with `destination` (singular) and changed the type from array of Destinations to a single Destination. Old behaviour would only allow an array with a single Destination to be passed in anyway.
29+
30+
### Features
31+
32+
* **iot-alpha:** support for account audit configuration ([#31661](https://github.com/aws/aws-cdk/issues/31661)) ([fc19571](https://github.com/aws/aws-cdk/commit/fc19571c6392e905ff03998d0e8bc4e3b01399f4)), closes [#31663](https://github.com/aws/aws-cdk/issues/31663)
33+
* **pipes-targets:** add EventBridge ([#30654](https://github.com/aws/aws-cdk/issues/30654)) ([842f49a](https://github.com/aws/aws-cdk/commit/842f49a224ceadb1ef973dc3048ee3ac52d8f118))
34+
35+
36+
### Bug Fixes
37+
38+
* **cli-lib:** cannot bootstrap specific environment ([#31713](https://github.com/aws/aws-cdk/issues/31713)) ([fec4bb1](https://github.com/aws/aws-cdk/commit/fec4bb1c26db54bbb151bd05239e1fc1be5de657))
39+
40+
41+
### Miscellaneous Chores
42+
43+
* **kinesisfirehose-alpha:** replace`destinations` property with `destination` and change type from array to single IDestination ([#31630](https://github.com/aws/aws-cdk/issues/31630)) ([1e2cff1](https://github.com/aws/aws-cdk/commit/1e2cff19eec234e1d1f7f501230cba01b220a09b))
44+
545
## [2.161.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.161.0-alpha.0...v2.161.1-alpha.0) (2024-10-05)
646

747
## [2.161.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.160.0-alpha.0...v2.161.0-alpha.0) (2024-10-03)

0 commit comments

Comments
 (0)