Skip to content

Commit 2cea408

Browse files
authored
Merge branch 'main' into kumvprat-patch-1
2 parents 538a082 + 2718bc4 commit 2cea408

File tree

179 files changed

+21999
-23104
lines changed

Some content is hidden

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

179 files changed

+21999
-23104
lines changed

.github/workflows/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,3 @@ Owner: CDK Support team
139139

140140
[project-prioritization-added-on.yml](project-prioritization-added-on.yml): GitHub action that runs every day to update AddedOn field in the prioritization project board.
141141
Owner: CDK Support team
142-
143-
### Issue sync
144-
[issue-sync.yml](issue-sync.yml): Github action that syncs issue metadat with the project board. More details can be found on the [project-sync](../../tools/@aws-cdk/project-sync) package.

.github/workflows/issue-sync.yml

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

.github/workflows/pr-build.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: PR Build
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- v2-release
8+
9+
jobs:
10+
build:
11+
runs-on: aws-cdk_ubuntu-latest_16-core
12+
13+
env:
14+
PR_BUILD: true
15+
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v4
19+
20+
- name: Setup Node.js
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: "18"
24+
cache: "yarn"
25+
26+
- name: Set up Docker
27+
uses: docker/setup-buildx-action@v3
28+
29+
# @TODO
30+
# - name: Start ECR proxy
31+
# run: /root/ecr-proxy/start.sh
32+
33+
- name: Cache build artifacts
34+
uses: actions/cache@v3
35+
with:
36+
path: |
37+
~/.s3buildcache
38+
key: ${{ runner.os }}-${{ github.event.pull_request.base.ref }}-s3buildcache
39+
40+
- name: Configure system settings
41+
run: |
42+
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
43+
sudo sysctl -w vm.max_map_count=2251954
44+
45+
- name: Build
46+
run: /bin/bash ./build.sh --ci
47+
48+
- name: Run Rosetta
49+
run: /bin/bash ./scripts/run-rosetta.sh
50+
51+
- name: Check for uncommitted changes
52+
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"nx": "^20",
3333
"semver": "^7.7.2",
3434
"standard-version": "^9.5.0",
35-
"ts-jest": "^29.3.4",
35+
"ts-jest": "^29.4.0",
3636
"ts-node": "^10.9.2",
3737
"typescript": "~5.5.4"
3838
},
@@ -84,7 +84,6 @@
8484
"tools/@aws-cdk/prlint",
8585
"tools/@aws-cdk/spec2cdk",
8686
"tools/@aws-cdk/lazify",
87-
"tools/@aws-cdk/project-sync",
8887
"tools/@aws-cdk/lambda-integration-test-updater",
8988
"tools/@aws-cdk/construct-metadata-updater",
9089
"scripts/@aws-cdk/script-tests"

packages/@aws-cdk-testing/framework-integ/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"license": "Apache-2.0",
3131
"devDependencies": {
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
33-
"@aws-cdk/integ-runner": "^2.187.0",
33+
"@aws-cdk/integ-runner": "^2.188.0",
3434
"@aws-cdk/pkglint": "0.0.0",
3535
"@aws-sdk/client-acm": "3.632.0",
3636
"@aws-sdk/client-rds": "3.632.0",
3737
"@aws-sdk/client-s3": "3.632.0",
3838
"@aws-sdk/client-cognito-identity-provider": "3.632.0",
39-
"axios": "1.9.0",
39+
"axios": "1.10.0",
4040
"delay": "5.0.0"
4141
},
4242
"dependencies": {
@@ -48,7 +48,7 @@
4848
"@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
4949
"@aws-cdk/lambda-layer-kubectl-v33": "^2.0.0",
5050
"aws-cdk-lib": "0.0.0",
51-
"cdk8s": "2.69.73",
51+
"cdk8s": "2.69.74",
5252
"cdk8s-plus-27": "2.9.5",
5353
"constructs": "^10.0.0"
5454
},

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/GraphqlApiLambdaPermissionTestDefaultTestDeployAssert7720B39B.assets.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/aws-graphql-lambda-permissions.assets.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/aws-graphql-lambda-permissions.template.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,25 @@
5050
"AuthorizerFunctionServiceRole5B2A061B"
5151
]
5252
},
53+
"AuthorizerFunctionLogGroupB47801AB": {
54+
"Type": "AWS::Logs::LogGroup",
55+
"Properties": {
56+
"LogGroupName": {
57+
"Fn::Join": [
58+
"",
59+
[
60+
"/aws/lambda/",
61+
{
62+
"Ref": "AuthorizerFunctionB4DBAA43"
63+
}
64+
]
65+
]
66+
},
67+
"RetentionInDays": 731
68+
},
69+
"UpdateReplacePolicy": "Retain",
70+
"DeletionPolicy": "Retain"
71+
},
5372
"AuthorizerFunctionapiappsync4E3369BF": {
5473
"Type": "AWS::Lambda::Permission",
5574
"Properties": {

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-lambda-permission.js.snapshot/integ.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)