Skip to content

Commit a82f457

Browse files
authored
Merge branch 'main' into yuanhaoz/docker-user
2 parents 81299b1 + d16482f commit a82f457

File tree

498 files changed

+140355
-28854
lines changed

Some content is hidden

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

498 files changed

+140355
-28854
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
name: Check Suite Logger
3+
4+
on:
5+
check_suite:
6+
types: [completed]
7+
8+
jobs:
9+
log-check-suite:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Log check suite event details
14+
run: |
15+
echo "Check Suite ID: ${{ github.event.check_suite.id }}"
16+
echo "Status: ${{ github.event.check_suite.status }}"
17+
echo "Conclusion: ${{ github.event.check_suite.conclusion }}"
18+
echo "URL: ${{ github.event.check_suite.url }}"
19+
echo "Head Branch: ${{ github.event.check_suite.head_branch }}"
20+
echo "Head SHA: ${{ github.event.check_suite.head_sha }}"
21+
echo "Repository: ${{ github.event.repository.full_name }}"
22+
echo "Sender: ${{ github.event.sender.login }}"
23+
echo "Created At: ${{ github.event.check_suite.created_at }}"
24+
echo "Updated At: ${{ github.event.check_suite.updated_at }}"
25+
echo "Pull Requests: ${{ toJson(github.event.check_suite.pull_requests) }}"

.github/workflows/pr-linter-trigger.yml renamed to .github/workflows/pr-linter-review-trigger.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# Re-evaluate the PR linter after reviews. This is used to upgrade the label
2+
# of a PR to `needs-maintainer-review` after a trusted community members leaves
3+
# an approving review.
4+
#
5+
# Unprivileged workflow that runs in the context of the PR, when a review is changed.
6+
#
7+
# Save the PR number, and download it again in the PR Linter workflow which
8+
# needs to run in privileged `workflow_run` context (but then must restore the
9+
# PR context).
110
name: PR Linter Trigger
211

312
on:

.github/workflows/pr-linter.yml

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,29 @@ jobs:
2626
# if conditions on all individual steps because subsequent jobs depend on this job
2727
# and we cannot skip it entirely
2828
steps:
29-
- name: 'Download artifact'
29+
- name: 'Download workflow_run artifact'
3030
if: github.event_name == 'workflow_run'
31-
uses: actions/github-script@v7
31+
uses: dawidd6/action-download-artifact@v7
3232
with:
33-
script: |
34-
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
35-
owner: context.repo.owner,
36-
repo: context.repo.repo,
37-
run_id: context.payload.workflow_run.id,
38-
});
39-
let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
40-
return artifact.name == "pr_info"
41-
})[0];
42-
let download = await github.rest.actions.downloadArtifact({
43-
owner: context.repo.owner,
44-
repo: context.repo.repo,
45-
artifact_id: matchArtifact.id,
46-
archive_format: 'zip',
47-
});
48-
let fs = require('fs');
49-
fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr_info.zip`, Buffer.from(download.data));
50-
- name: 'Unzip artifact'
51-
if: github.event_name == 'workflow_run'
52-
run: unzip pr_info.zip
33+
run_id: ${{ github.event.workflow_run.id }}
34+
name: pr_info
35+
path: pr/
36+
search_artifacts: true
5337

54-
- name: 'Make GitHub output'
38+
- name: 'Determine PR info'
39+
# PR info comes from the artifact if downloaded, or GitHub context if not.
5540
if: github.event_name == 'workflow_run'
5641
id: 'pr_output'
5742
run: |
58-
echo "cat pr_number"
59-
echo "pr_number=$(cat pr_number)" >> "$GITHUB_OUTPUT"
60-
echo "cat pr_sha"
61-
echo "pr_sha=$(cat pr_sha)" >> "$GITHUB_OUTPUT"
43+
if [[ ! -f pr/pr_number ]]; then
44+
echo "${{ github.event.pull_request.number }}" > pr/pr_number
45+
fi
46+
if [[ ! -f pr/pr_sha ]]; then
47+
echo "${{ github.event.pull_request.head.sha }}" > pr/pr_sha
48+
fi
49+
cat pr/*
50+
echo "pr_number=$(cat pr/pr_number)" >> "$GITHUB_OUTPUT"
51+
echo "pr_sha=$(cat pr/pr_sha)" >> "$GITHUB_OUTPUT"
6252
6353
validate-pr:
6454
# Necessary to have sufficient permissions to write to the PR
@@ -80,7 +70,7 @@ jobs:
8070
uses: ./tools/@aws-cdk/prlint
8171
env:
8272
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
83-
# PR_NUMBER and PR_SHA is empty if triggered by pull_request_target, since we already have that info
8473
PR_NUMBER: ${{ needs.download-if-workflow-run.outputs.pr_number }}
8574
PR_SHA: ${{ needs.download-if-workflow-run.outputs.pr_sha }}
75+
LINTER_LOGIN: ${{ vars.LINTER_LOGIN }}
8676
REPO_ROOT: ${{ github.workspace }}

.mergify.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ queue_rules:
1212
- -closed
1313
- "#approved-reviews-by>=1"
1414
- -approved-reviews-by~=author
15+
# This is important! It makes the PR Linter work.
1516
- "#changes-requested-reviews-by=0"
1617
- status-success~=AWS CodeBuild us-east-1
1718
- status-success=validate-pr
@@ -30,6 +31,7 @@ queue_rules:
3031
- -closed
3132
- "#approved-reviews-by>=1"
3233
- -approved-reviews-by~=author
34+
# This is important! It makes the PR Linter work.
3335
- "#changes-requested-reviews-by=0"
3436
- status-success~=AWS CodeBuild us-east-1
3537
- status-success=validate-pr
@@ -61,6 +63,7 @@ pull_request_rules:
6163
- author!=dependabot-preview[bot]
6264
- "#approved-reviews-by>=1"
6365
- -approved-reviews-by~=author
66+
# This is important! It makes the PR Linter work.
6467
- "#changes-requested-reviews-by=0"
6568
- status-success~=AWS CodeBuild us-east-1
6669
- status-success=validate-pr
@@ -81,6 +84,7 @@ pull_request_rules:
8184
- author!=dependabot-preview[bot]
8285
- "#approved-reviews-by>=2"
8386
- -approved-reviews-by~=author
87+
# This is important! It makes the PR Linter work.
8488
- "#changes-requested-reviews-by=0"
8589
- status-success~=AWS CodeBuild us-east-1
8690
- status-success=validate-pr
@@ -101,6 +105,7 @@ pull_request_rules:
101105
- author!=dependabot-preview[bot]
102106
- "#approved-reviews-by>=1"
103107
- -approved-reviews-by~=author
108+
# This is important! It makes the PR Linter work.
104109
- "#changes-requested-reviews-by=0"
105110
- status-success~=AWS CodeBuild us-east-1
106111
- status-success=validate-pr
@@ -140,6 +145,7 @@ pull_request_rules:
140145
- -closed
141146
- author~=dependabot
142147
- "#approved-reviews-by>=1"
148+
# This is important! It makes the PR Linter work.
143149
- "#changes-requested-reviews-by=0"
144150
- status-success~=AWS CodeBuild us-east-1
145151
- status-success=validate-pr

CHANGELOG.v2.alpha.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
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.176.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.175.1-alpha.0...v2.176.0-alpha.0) (2025-01-15)
6+
7+
8+
### Features
9+
10+
* **scheduler-targets:** add support for universal target ([#32341](https://github.com/aws/aws-cdk/issues/32341)) ([021e6d6](https://github.com/aws/aws-cdk/commit/021e6d6ca6c01ecece485f7a51620fd42e632f0b)), closes [#32328](https://github.com/aws/aws-cdk/issues/32328)
11+
12+
13+
### Bug Fixes
14+
15+
* **msk:** clusterName validation in Cluster class is incorrect ([#32792](https://github.com/aws/aws-cdk/issues/32792)) ([41ddd46](https://github.com/aws/aws-cdk/commit/41ddd46dc17e0afd551cce2737ecc11ed343de04)), closes [/github.com/aws/aws-cdk/pull/32505#discussion_r1891027876](https://github.com/aws//github.com/aws/aws-cdk/pull/32505/issues/discussion_r1891027876)
16+
517
## [2.175.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.175.0-alpha.0...v2.175.1-alpha.0) (2025-01-10)
618

719
## [2.175.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.174.1-alpha.0...v2.175.0-alpha.0) (2025-01-09)

CHANGELOG.v2.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
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.176.0](https://github.com/aws/aws-cdk/compare/v2.175.1...v2.176.0) (2025-01-15)
6+
7+
8+
### Features
9+
10+
* **apigatewayv2-integrations:** `WebSocketMockIntegration` props ([#30622](https://github.com/aws/aws-cdk/issues/30622)) ([a5a0168](https://github.com/aws/aws-cdk/commit/a5a0168cdf0f6a3429d67cb8d300d3a3f987d0fe)), closes [#29661](https://github.com/aws/aws-cdk/issues/29661)
11+
* **codebuild:** add new BuildImages ([#32525](https://github.com/aws/aws-cdk/issues/32525)) ([a734841](https://github.com/aws/aws-cdk/commit/a73484142ce78dbf0a63ef5bfdb9603062916399))
12+
* **ecs:** enable Enhanced Observability for Container Insights ([#32622](https://github.com/aws/aws-cdk/issues/32622)) ([79ab137](https://github.com/aws/aws-cdk/commit/79ab137aa07337972d1da459db9b1a698a2d4513)), closes [#32618](https://github.com/aws/aws-cdk/issues/32618)
13+
* update L1 CloudFormation resource definitions ([#32847](https://github.com/aws/aws-cdk/issues/32847)) ([9317203](https://github.com/aws/aws-cdk/commit/93172033e4a8346a86ee00017acba57b57f22aab))
14+
* **appconfig:** environment deletion protection ([#32737](https://github.com/aws/aws-cdk/issues/32737)) ([393e5c0](https://github.com/aws/aws-cdk/commit/393e5c0058560ff10acdc2892cc40ad542dc1629))
15+
16+
17+
### Bug Fixes
18+
19+
* **cli:** "no stack found in the main cloud assembly" ([#32839](https://github.com/aws/aws-cdk/issues/32839)) ([3c0acce](https://github.com/aws/aws-cdk/commit/3c0acce39c6179ed18cc14d33622c69a4978ec97)), closes [aws/aws-cdk#32636](https://github.com/aws/aws-cdk/issues/32636) [#32836](https://github.com/aws/aws-cdk/issues/32836) [#32836](https://github.com/aws/aws-cdk/issues/32836)
20+
* **core:** use correct formatting for aggregate errors in `aws-cdk` ([#32817](https://github.com/aws/aws-cdk/issues/32817)) ([97af31b](https://github.com/aws/aws-cdk/commit/97af31b4562506570632c79bde79c0aaee31826a)), closes [#32237](https://github.com/aws/aws-cdk/issues/32237)
21+
* **elasticloadbalancingv2:** open, dual-stack-without-public-ipv4 ALB does not allow IPv6 inbound traffic (under feature flag) ([#32765](https://github.com/aws/aws-cdk/issues/32765)) ([aff160b](https://github.com/aws/aws-cdk/commit/aff160b62a067bcd89feb97e020287e614e39111)), closes [#32197](https://github.com/aws/aws-cdk/issues/32197)
22+
* **rds:** clusterScailabilityType is spelled wrong and should be clusterScalabilityType ([#32825](https://github.com/aws/aws-cdk/issues/32825)) ([d39e835](https://github.com/aws/aws-cdk/commit/d39e8356643ab89fec791df725af4ad8f0bbaecd)), closes [#32415](https://github.com/aws/aws-cdk/issues/32415) [#32415](https://github.com/aws/aws-cdk/issues/32415)
23+
* **rds:** incorrect version definition of MySQL 8.4.3 ([#32934](https://github.com/aws/aws-cdk/issues/32934)) ([3fbc785](https://github.com/aws/aws-cdk/commit/3fbc785522e25deb1a1167f2f655235ae3f2e762)), closes [#32933](https://github.com/aws/aws-cdk/issues/32933)
24+
25+
26+
### Reverts
27+
28+
* **prlint:** fail prlinter on codecov failures, with exemption label ([#32867](https://github.com/aws/aws-cdk/issues/32867)) ([928d3bb](https://github.com/aws/aws-cdk/commit/928d3bb05da1be25159c58cb4f8b13c44a258ba1)), closes [aws/aws-cdk#32674](https://github.com/aws/aws-cdk/issues/32674)
29+
530
## [2.175.1](https://github.com/aws/aws-cdk/compare/v2.175.0...v2.175.1) (2025-01-10)
631

732
### Bug Fixes

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,10 @@ To make this easier we have a `pr/needs-review` label that we can add to each
718718
PR. If you do not see this label on your PR then it means that something needs
719719
to be fixed before it can be reviewed.
720720

721+
> [!NOTE]
722+
> The `aws-cdk` repository is frequently updated, so PR branches may quickly become out-of-date, showing "This branch is out-of-date with the base branch." This is not an issue as long as there are no conflicts with the newly merged commits. Once the PR is approved, our automation will update it with the latest `main` branch and handle the merge. No action is needed on your part.
723+
724+
721725
#### Adding construct runtime dependencies
722726

723727
Any tool that is not part of the CDK, and needs to be used by a construct during

aws-cdk.code-workspace

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"name": "aws-custom-resource-sdk-adapter",
3232
"rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
3333
},
34+
{ "name": "toolkit", "rootPath": "packages/@aws-cdk/toolkit" },
3435
{ "name": "user-input-gen", "rootPath": "tools/@aws-cdk/user-input-gen" }
3536
]
3637
},

0 commit comments

Comments
 (0)