Skip to content

Commit ad301b7

Browse files
Merge branch 'main' into nodegroup-gpu-instance-types
2 parents f696b9d + 189bae3 commit ad301b7

File tree

4,182 files changed

+1941934
-702722
lines changed

Some content is hidden

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

4,182 files changed

+1941934
-702722
lines changed

.devcontainer/Dockerfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ FROM jsii/superchain:1-bookworm-slim-node20
22

33
USER root
44

5+
# Setup oh-my-zsh
6+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
7+
&& apt-get -y install --no-install-recommends zsh vim \
8+
&& rm -rf /var/lib/apt/lists/* \
9+
&& chsh -s $(which zsh) superchain
10+
11+
# Required, otherwise shell is extermly slow due the size of the aws-cdk
12+
RUN sh -c 'echo "[oh-my-zsh]\n hide-dirty = 1" > /etc/gitconfig'
13+
514
# Change uid/guid of superchain so it can work with the docker-in-docker feature
615
RUN groupmod --gid 1000 superchain \
716
&& usermod --uid 1000 --gid 1000 superchain \
@@ -10,10 +19,4 @@ RUN groupmod --gid 1000 superchain \
1019
USER superchain
1120

1221
# Setup oh-my-zsh
13-
RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
14-
&& sudo apt-get -y install --no-install-recommends zsh vim \
15-
&& sudo rm -rf /var/lib/apt/lists/* \
16-
&& sudo chsh -s $(which zsh) $(whoami)
17-
RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \
18-
# Required, otherwise shell is extermly slow due the size of the aws-cdk
19-
&& sudo sh -c 'echo "[oh-my-zsh]\n hide-dirty = 1" > /etc/gitconfig'
22+
RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended

.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"build": {
44
"dockerfile": "Dockerfile"
55
},
6-
76
"customizations": {
87
"vscode": {
9-
"extensions": ["dbaeumer.vscode-eslint"]
8+
"extensions": [
9+
"dbaeumer.vscode-eslint"
10+
]
1011
}
1112
},
12-
1313
"postCreateCommand": "yarn install",
1414
"remoteUser": "superchain",
1515
"features": {
16-
"docker-in-docker": {
16+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
1717
"version": "latest",
1818
"moby": true
1919
}

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/packages/aws-cdk/ @aws/aws-cdk-core-team
2+
/packages/@aws-cdk-testing/cli-integ/ @aws/aws-cdk-core-team
3+
/packages/aws-cdk-lib/core/ @aws/aws-cdk-core-team
4+
/packages/@aws-cdk/cli-lib-alpha/ @aws/aws-cdk-core-team

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ Closes #<issue number here>.
88

99
### Description of changes
1010

11-
<!--What code changes did you make? Have you made any important design decisions?-->
11+
<!--
12+
What code changes did you make?
13+
Have you made any important design decisions?
14+
What AWS use cases does this change enable? To enable the use cases, which AWS service features are utilized?
15+
-->
16+
17+
### Describe any new or updated permissions being added
18+
19+
<!— What new or updated IAM permissions are needed to support the changes being introduced ? -->
20+
1221

1322
### Description of how you validated changes
1423

.github/workflows/codecov.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Codecov
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
jobs:
10+
collect:
11+
name: collect
12+
if: github.repository == 'aws/aws-cdk'
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Node
19+
uses: actions/setup-node@v4
20+
21+
- name: Install dependencies
22+
run: yarn install
23+
24+
- name: Build CLI
25+
run: npx lerna run build --scope=aws-cdk
26+
27+
- name: Run tests
28+
run: cd packages/aws-cdk && yarn test
29+
30+
- name: Upload results to Codecov
31+
uses: codecov/codecov-action@v4
32+
with:
33+
directory: packages/aws-cdk/coverage
34+
fail_ci_if_error: true
35+
flags: suite.unit
36+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/github-merit-badger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
1818
thresholds: '[0,3,6,13,25,50]'
1919
badge-type: 'achievement'
20-
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,vinayak-kukreja,mrgrain,pahud,cgarvis,kellertk,ashishdhingra,HBobertz,sumupitchayan,SankyRed,udaypant,colifran,khushail,scanlonp,mikewrighton,moelasmar,paulhcsun,awsmjs,evgenyka,GavinZZ,aaythapa,xazhao,ConnorRobertson,ssenchenko,gracelu0,jfuss,SimonCMoore,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,aws-cdk-automation,dependabot[bot],mergify[bot]]'
20+
ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,comcalvi,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,HBobertz,sumupitchayan,colifran,khushail,moelasmar,paulhcsun,GavinZZ,aaythapa,xazhao,gracelu0,jfuss,shikha372,kirtishrinkhala,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,michelle-wangg,jiayiwang7,1kaileychen,saiyush,5d,aws-cdk-automation,dependabot[bot],mergify[bot]]'
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Lambda Runtime Tests Update
2+
on:
3+
pull_request:
4+
paths:
5+
- 'packages/aws-cdk-lib/aws-lambda/lib/runtime.ts'
6+
7+
jobs:
8+
update-lambda-tests:
9+
if: github.repository == 'aws/aws-cdk'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
ref: ${{ github.event.pull_request.head.ref }}
15+
16+
- name: Set up Node
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: "*"
20+
env:
21+
NODE_OPTIONS: "--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
22+
23+
- name: Install dependencies
24+
run: yarn install --frozen-lockfile && cd tools/@aws-cdk/lambda-integration-test-updater && yarn build+test
25+
26+
- name: Update Lambda Runtime Tests
27+
run: |
28+
cd tools/@aws-cdk/lambda-integration-test-updater
29+
./bin/update-lambda-runtimestes-integ-testing
30+
31+
- name: Check for changes
32+
id: git-check
33+
run: |
34+
if [[ -n "$(git status --porcelain)" ]]; then
35+
echo "changes=true" >> $GITHUB_OUTPUT
36+
else
37+
echo "changes=false" >> $GITHUB_OUTPUT
38+
fi
39+
40+
- name: Commit & Push changes
41+
if: steps.git-check.outputs.changes == 'true'
42+
run: |
43+
git config --global user.name 'aws-cdk-automation'
44+
git config --global user.email '[email protected]'
45+
git add .
46+
git commit -m "chore: update lambda runtime integration tests"
47+
git push origin ${{ github.event.pull_request.head.ref }}

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

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c
22+
uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |
@@ -54,13 +54,13 @@ 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@24bffb9b452ba05a4f3f77933840a6a841d1b32b
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/v2-pull-request.yml

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

0 commit comments

Comments
 (0)