Skip to content

Commit c07d87b

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into ecs-exec
2 parents 0411ddb + c946615 commit c07d87b

2,051 files changed

Lines changed: 46825 additions & 18386 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/ISSUE_TEMPLATE/documentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: "📕 Documentation Issue"
33
description: Report an issue in the API Reference documentation or Developer Guide
4-
title: "(short issue description)"
4+
title: "(module name): (short issue description)"
55
labels: [documentation, needs-triage]
66
assignees: []
77
body:

‎.github/ISSUE_TEMPLATE/feature-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: 🚀 Feature Request
33
description: Suggest an idea for this project
4-
title: "(short issue description)"
4+
title: "(module name): (short issue description)"
55
labels: [feature-request, needs-triage]
66
assignees: []
77
body:

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
### All Submissions:
55

6-
* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)
6+
* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)
77

88
### Adding new Unconventional Dependencies:
99

10-
* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)
10+
* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)
1111

1212
### New Features
1313

14-
* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
14+
* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
1515
* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?
1616

1717
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

‎.github/dependabot.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,24 @@ updates:
1818
labels:
1919
- "auto-approve"
2020
open-pull-requests-limit: 5
21+
22+
# run same dependabot upgrades on v1-main
23+
- package-ecosystem: "github-actions"
24+
directory: "/"
25+
target-branch: "v1-main"
26+
schedule:
27+
interval: "weekly"
28+
labels:
29+
- "auto-approve"
30+
open-pull-requests-limit: 5
31+
- package-ecosystem: "pip"
32+
directory: "/packages/@aws-cdk/lambda-layer-awscli"
33+
target-branch: "v1-main"
34+
schedule:
35+
interval: "weekly"
36+
labels:
37+
- "auto-approve"
38+
open-pull-requests-limit: 5
2139

2240
# Non-TypeScript init template dependency updates
2341
- package-ecosystem: "pip"

‎.github/workflows/cr-mapping.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"mappings": [
33
{
44
"keywords": ["CustomResourceProvider", "CustomResource", "CloudFormationCustomResourceDeleteEvent", "CloudFormationCustomResourceUpdateEvent", "CloudFormationCustomResourceCreateEvent"],
5-
"comment": "I have read the guidelines on the [important cases to handle](https://github.com/aws/aws-cdk/tree/master/packages/%40aws-cdk/custom-resources#important-cases-to-handle) when implementing the custom resource."
5+
"comment": "I have read the guidelines on the [important cases to handle](https://github.com/aws/aws-cdk/tree/main/packages/%40aws-cdk/custom-resources#important-cases-to-handle) when implementing the custom resource."
66
}
77
]
88
}

‎.github/workflows/issue-label-assign.yml‎

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎.github/workflows/issue-reprioritization.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
issue-reprioritization:
88
permissions:
99
issues: write
10+
repository-projects: write
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: kaizencc/issue-reprioritization-manager@main
@@ -16,6 +17,7 @@ jobs:
1617
original-label: p2
1718
new-label: p1
1819
reprioritization-threshold: 20
20+
project-column-url: https://github.com/aws/aws-cdk/projects/13#column-18002436
1921
- uses: kaizencc/pr-triage-manager@main
2022
with:
2123
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/team-owners-assignment.yml‎

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

‎.github/workflows/yarn-upgrade-v1main.yml‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
name: Yarn Upgrade v1-main
2+
3+
on:
4+
schedule:
5+
# Every wednesday at 13:37 UTC
6+
- cron: 37 13 * * 3
7+
workflow_dispatch: {}
8+
9+
jobs:
10+
upgrade:
11+
name: Yarn Upgrade
12+
permissions:
13+
contents: read
14+
runs-on: ubuntu-latest
15+
steps:
16+
17+
- name: Check Out
18+
uses: actions/checkout@v3
19+
with:
20+
ref: v1-main
21+
22+
- name: Set up Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14
26+
27+
- name: Locate Yarn cache
28+
id: yarn-cache
29+
run: echo "::set-output name=dir::$(yarn cache dir)"
30+
31+
- name: Restore Yarn cache
32+
uses: actions/cache@v3
33+
with:
34+
path: ${{ steps.yarn-cache.outputs.dir }}
35+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
36+
restore-keys: |-
37+
${{ runner.os }}-yarn-
38+
- name: Yarn Install
39+
run: yarn install --frozen-lockfile
40+
- name: Install Tools
41+
run: |-
42+
npm -g install lerna npm-check-updates@^9.0.0
43+
- name: Build CLI
44+
run: cd packages/aws-cdk && ../../scripts/buildup
45+
- name: Build Integ Runner
46+
run: cd packages/@aws-cdk/integ-runner && ../../../scripts/buildup
47+
- name: List Mono-Repo Packages
48+
id: list-packages
49+
# These need to be ignored from the `ncu` runs!
50+
run: |-
51+
echo -n "::set-output name=list::"
52+
node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')"
53+
- name: Run "ncu -u"
54+
# We special-case @types/node because we want to stay on the current major (minimum supported node release)
55+
# We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
56+
# We special-case aws-sdk because of breaking changes with TS interface exports in recent minor versions - https://github.com/aws/aws-sdk-js/issues/3453
57+
# We special-case typescript because it's not semantically versionned
58+
# We special-case constructs because we want to stay in control of the minimum compatible version
59+
# We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases.
60+
# We special-case aws-sdk-mock because of breaking changes in type exports https://github.com/dwyl/aws-sdk-mock/pull/260. We are not respecting `@ts-ignore`
61+
run: |-
62+
# Upgrade dependencies at repository root
63+
ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
64+
ncu --upgrade --filter=typescript --target=patch
65+
ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript,lerna --target=minor
66+
# Upgrade all the packages
67+
lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
68+
lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
69+
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
70+
71+
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
72+
- name: Run "yarn install"
73+
run: yarn install
74+
75+
- name: Run "yarn upgrade"
76+
run: yarn upgrade
77+
78+
- name: Regenerate CLI attributions
79+
run: cd packages/aws-cdk && yarn pkglint
80+
- name: Regenerate Integ Runner attributions
81+
run: cd packages/@aws-cdk/integ-runner && yarn pkglint
82+
83+
# Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
84+
# Creating a pull request requires write permissions and it's best to keep write privileges isolated.
85+
- name: Create Patch
86+
run: |-
87+
git add .
88+
git diff --patch --staged > ${{ runner.temp }}/upgrade.patch
89+
- name: Upload Patch
90+
uses: actions/upload-artifact@v3
91+
with:
92+
name: upgrade.patch
93+
path: ${{ runner.temp }}/upgrade.patch
94+
95+
pr:
96+
name: Create Pull Request
97+
needs: upgrade
98+
permissions:
99+
contents: write
100+
pull-requests: write
101+
runs-on: ubuntu-latest
102+
steps:
103+
- name: Check Out
104+
uses: actions/checkout@v3
105+
with:
106+
ref: v1-main
107+
108+
- name: Download patch
109+
uses: actions/download-artifact@v3
110+
with:
111+
name: upgrade.patch
112+
path: ${{ runner.temp }}
113+
114+
- name: Apply patch
115+
run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp
116+
}}/upgrade.patch || echo "Empty patch. Skipping."'
117+
118+
- name: Make Pull Request
119+
uses: peter-evans/create-pull-request@v4
120+
with:
121+
# Git commit details
122+
branch: automation/yarn-upgrade
123+
commit-message: |-
124+
chore: npm-check-updates && yarn upgrade
125+
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
126+
# Pull Request details
127+
title: 'chore: npm-check-updates && yarn upgrade'
128+
body: |-
129+
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
130+
labels: contribution/core,dependencies,auto-approve
131+
team-reviewers: aws-cdk-team
132+
# Github prevents further Github actions to be run if the default Github token is used.
133+
# Instead use a privileged token here, so further GH actions can be triggered on this PR.
134+
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

‎.github/workflows/yarn-upgrade.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Node
2121
uses: actions/setup-node@v3
2222
with:
23-
node-version: 12
23+
node-version: 14
2424

2525
- name: Locate Yarn cache
2626
id: yarn-cache
@@ -60,14 +60,14 @@ jobs:
6060
# Upgrade dependencies at repository root
6161
ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
6262
ncu --upgrade --filter=typescript --target=patch
63-
ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript,lerna --target=minor
63+
ncu --upgrade --reject=@types/node,@types/prettier,@types/fs-extra,constructs,typescript,lerna --target=minor
6464
# Upgrade all the packages
6565
lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
6666
lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
67-
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
67+
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
6868
# Upgrade package.jsons in init templates
6969
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
70-
(cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
70+
(cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
7171
done
7272
7373
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)

0 commit comments

Comments
 (0)