Skip to content

Commit f19e8c9

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into fix/vpc-flow-logs-name
2 parents 5f0e1e0 + c84666c commit f19e8c9

314 files changed

Lines changed: 61420 additions & 17945 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/README.md‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,96 @@ These workflows and actions are configured in the AWS CDK GitHub repository.
55
## Pull Request Triggered
66

77
### Auto Approve
8+
89
[auto-approve.yml](auto-approve.yml): Approves merging PRs with the
910
`auto-approve` label.
1011
Owner: Core CDK team
1112

13+
### PR Linter Trigger
14+
15+
[pr-linter-trigger.yml](pr-linter-trigger.yml): A workflow triggered by `pull_request_review`
16+
that uploads necessary information about the pull request and then triggers the
17+
[pr-linter](pr-linter.yml). Necessary because the `pull_request_review` trigger runs actions
18+
on the merge branch not the base branch (with its secrets).
19+
Owner: Core CDK team
20+
1221
### PR Linter
22+
1323
[pr-linter.yml](pr-linter.yml): Runs `tools/@aws-cdk-prlint` on each PR to
1424
check for correctness.
1525
Owner: Core CDK team
1626

1727
### v2-main PR automation
28+
1829
[v2-pull-request.yml](v2-pull-request.yml): Runs `pkglint` on merge forward PRs
1930
and commits the results.
2031
Owner: Core CDK team
2132

2233
### Label Assigner
34+
2335
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
2436
Owner: CDK support team
2537

2638
### PR Labeler
27-
[pr-labeler.yml](pr-labeler.yml): GitHub action for automatically porting triage labels from issues
39+
40+
[pr-labeler.yml](pr-labeler.yml): GitHub action for automatically porting triage labels from issues
2841
linked in the PR description to the PR.
2942
Owner: Core CDK team
3043

3144
### GitHub Merit Badger
45+
3246
[github-merit-badger.yml](github-merit-badger.yml): GitHub action that adds 'merit badges' to pull
3347
requests based on the users prior contributions to the CDK.
3448
Owner: Core CDK team
3549

50+
### Request CLI Integ Test
51+
52+
[request-cli-integ-test.yml](request-cli-integ-test.yml):
53+
Checks for relevant changes to the CLI code and requests a deployment to the `test-pipeline` environment.
54+
When approved this pushes the PR to the testing pipeline,
55+
thus starting the cli integ test build.
56+
Owner: Core CDK team
57+
3658
## Issue Triggered
3759

3860
### Closed Issue Message
61+
3962
[closed-issue-message.yml](closed-issue-message.yml): Adds a reminder message
4063
to issues that are closed.
4164
Owner: CDK support team
4265

4366
### Label Assigner
67+
4468
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
4569
Owner: CDK support team
4670

4771
## Scheduled Actions
4872

4973
### Issue Lifecycle Handling
74+
5075
[close-stale-issues.yml](close-stale-issues.yml): Handles labeling issues and
5176
PRs with `closing-soon`, `response-requested`, etc.
5277
Owner: CDK support team
5378

5479
### Yarn Upgrader
80+
5581
[yarn-upgrade.yml](yarn-upgrade.yml): Upgrades yarn dependencies and creates a
5682
patch file for downloading.
5783
Owner: Core CDK team
5884

85+
### AWS Service Spec Update
86+
87+
[spec-update.yml](spec-update.yml): Updates AWS Service Spec and related packages to their latest versions
88+
and submits an auto-approve PR for it.
89+
Owner: Core CDK team
90+
5991
### Issue Reprioritizer
92+
6093
[issue-reprioritization.yml](issue-reprioritization.yml): GitHub action that labels `p2`
6194
issues as `p1` if a certain level of community engagement is met.
62-
Owner: Core CDK team
95+
Owner: Core CDK team
96+
97+
### Issue Metrics
98+
99+
[repo-metrics.yml](repo-metrics.yml): GitHub action that runs monthly to report on metrics for issues and PRs created last month.
100+
Owner: Core CDK team

‎.github/workflows/close-stale-issues.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
jobs:
1010
cleanup:
11+
# this workflow will always fail in forks; bail if this isn't running in the upstream
12+
if: github.repository == 'aws/aws-cdk'
1113
permissions:
1214
issues: write
1315
contents: read

‎.github/workflows/close-stale-prs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
workflow_dispatch:
66
jobs:
77
close-stale-prs:
8+
# this workflow will always fail in forks; bail if this isn't running in the upstream
9+
if: github.repository == 'aws/aws-cdk'
810
permissions:
911
pull-requests: write
1012
runs-on: ubuntu-latest

‎.github/workflows/handle-stale-discussions.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77

88
jobs:
99
handle-stale-discussions:
10+
# this workflow will always fail in forks; bail if this isn't running in the upstream
11+
if: github.repository == 'aws/aws-cdk'
1012
name: Handle stale discussions
1113
runs-on: ubuntu-latest
1214
permissions:
@@ -15,4 +17,4 @@ jobs:
1517
- name: Stale discussions action
1618
uses: aws-github-ops/handle-stale-discussions@v1
1719
env:
18-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
20+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/pr-linter-trigger.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: PR Linter Trigger
2+
3+
on:
4+
pull_request_review:
5+
types: [submitted, edited, dismissed]
6+
7+
jobs:
8+
upload:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Save PR number
13+
env:
14+
PR_NUMBER: ${{ github.event.pull_request.number }}
15+
PR_SHA: ${{ github.event.pull_request.head.sha }}
16+
run: |
17+
mkdir -p ./pr
18+
echo $PR_NUMBER > ./pr/pr_number
19+
echo $PR_SHA > ./pr/pr_sha
20+
- uses: actions/upload-artifact@v3
21+
with:
22+
name: pr_info
23+
path: pr/

‎.github/workflows/pr-linter.yml‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
name: PR Linter
55
on:
6-
# Necessary to have sufficient permissions to write to the PR
76
pull_request_target:
87
types:
98
- labeled
@@ -12,18 +11,65 @@ on:
1211
- opened
1312
- synchronize
1413
- reopened
14+
workflow_run:
15+
workflows: [PR Linter Trigger]
16+
types:
17+
- completed
1518
status:
1619

1720
jobs:
21+
download-if-workflow-run:
22+
runs-on: ubuntu-latest
23+
outputs:
24+
pr_number: ${{ steps.pr_output.outputs.pr_number }}
25+
pr_sha: ${{ steps.pr_output.outputs.pr_sha }}
26+
# if conditions on all individual steps because subsequent jobs depend on this job
27+
# and we cannot skip it entirely
28+
steps:
29+
- name: 'Download artifact'
30+
if: github.event_name == 'workflow_run'
31+
uses: actions/github-script@v6
32+
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
53+
54+
- name: 'Make GitHub output'
55+
if: github.event_name == 'workflow_run'
56+
id: 'pr_output'
57+
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"
62+
1863
validate-pr:
64+
# Necessary to have sufficient permissions to write to the PR
1965
permissions:
2066
contents: read
2167
pull-requests: write
2268
statuses: read
2369
issues: read
2470
runs-on: ubuntu-latest
71+
needs: download-if-workflow-run
2572
steps:
26-
2773
- name: Checkout
2874
uses: actions/checkout@v3
2975

@@ -34,4 +80,7 @@ jobs:
3480
uses: ./tools/@aws-cdk/prlint
3581
env:
3682
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
84+
PR_NUMBER: ${{ needs.download-if-workflow-run.outputs.pr_number }}
85+
PR_SHA: ${{ needs.download-if-workflow-run.outputs.pr_sha }}
3786
REPO_ROOT: ${{ github.workspace }}

‎.github/workflows/repo-metrics.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Monthly repo metrics
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 2 1 * *'
6+
7+
permissions:
8+
issues: write
9+
pull-requests: read
10+
11+
jobs:
12+
build:
13+
# this workflow will always fail in forks; bail if this isn't running in the upstream
14+
if: github.repository == 'aws/aws-cdk'
15+
name: metrics
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Get dates for last month
20+
shell: bash
21+
run: |
22+
# Calculate the first day of the previous month
23+
first_day=$(date -d "last month" +%Y-%m-01)
24+
25+
# Calculate the last day of the previous month
26+
last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d)
27+
28+
# Set an environment variable with the date range
29+
echo "$first_day..$last_day"
30+
echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
31+
32+
- name: Report on issues
33+
uses: github/issue-metrics@v2
34+
env:
35+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_month }} -reason:"not planned"'
37+
38+
- name: Create report for issues
39+
uses: peter-evans/create-issue-from-file@v4
40+
with:
41+
title: Monthly issue metrics report
42+
token: ${{ secrets.GITHUB_TOKEN }}
43+
content-filepath: ./issue_metrics.md
44+
assignees: evgenyka
45+
46+
- name: Report on PRs
47+
uses: github/issue-metrics@v2
48+
env:
49+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_month }} -is:draft'
51+
52+
- name: Create report for PRs
53+
uses: peter-evans/create-issue-from-file@v4
54+
with:
55+
title: Monthly issue metrics report
56+
token: ${{ secrets.GITHUB_TOKEN }}
57+
content-filepath: ./issue_metrics.md
58+
assignees: evgenyka

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Request a deployment to the test pipeline
2+
3+
name: request-cli-integ-test
4+
on:
5+
pull_request_target: {}
6+
7+
jobs:
8+
cli-changes:
9+
runs-on: ubuntu-latest
10+
outputs:
11+
any-changed-files: ${{ steps.changed-cli-files.outputs.cli_any_changed }}
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3
15+
with:
16+
ref: ${{ github.event.pull_request.head.ref }}
17+
repository: ${{ github.event.pull_request.head.repo.full_name }}
18+
fetch-depth: 0
19+
persist-credentials: false
20+
- name: Find changed cli files
21+
id: changed-cli-files
22+
uses: tj-actions/changed-files@920e7b9ae1d45913fc81f86c956fee89c77d2e5e
23+
with:
24+
base_sha: ${{ github.event.pull_request.base.sha }}
25+
files_yaml: |
26+
cli:
27+
- packages/aws-cdk/bin/**
28+
- packages/aws-cdk/lib/**
29+
- packages/aws-cdk/test/**
30+
submit-to-test-pipeline:
31+
environment: test-pipeline
32+
needs: cli-changes
33+
if: needs.cli-changes.outputs.any-changed-files == 'true'
34+
runs-on: ubuntu-latest
35+
steps:
36+
- name: Checkout
37+
uses: actions/checkout@v3
38+
with:
39+
# Needs to run with PROJEN_GITHUB_TOKEN because we need permissions to force push the branch
40+
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
41+
ref: ${{ github.event.pull_request.head.ref }}
42+
repository: ${{ github.event.pull_request.head.repo.full_name }}
43+
- name: Submit to test-pipeline
44+
run: |
45+
git config --global user.name 'aws-cdk-automation'
46+
git config --global user.email 'aws-cdk-automation@users.noreply.github.com'
47+
git push --force --atomic https://github.com/${{ github.repository }}.git FETCH_HEAD:test-main-pipeline
48+
- name: Explain next steps
49+
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
50+
with:
51+
message: |
52+
:arrow_right: **PR build request submitted to `test-main-pipeline`** :arrow_left:
53+
54+
A maintainer must now check the pipeline and add the `pr-linter/cli-integ-tested` label once the pipeline succeeds.
55+
comment_tag: request-cli-integ-test
56+
mode: recreate
57+
# Post as our automation user
58+
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)