Skip to content

Commit df932f1

Browse files
mergify[bot]mergify[bot]
authored
chore: forward merge 'master' into 'v2-main' (#20299)
Automated action from aws/cdk-ops
2 parents cbf8ac4 + f955a03 commit df932f1

File tree

297 files changed

+1477
-1332
lines changed

Some content is hidden

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

297 files changed

+1477
-1332
lines changed

‎.github/workflows/yarn-upgrade.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
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
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,${{ steps.list-packages.outputs.list }}')
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 }}')
7171
done
7272
7373
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
@@ -120,6 +120,7 @@ jobs:
120120
with:
121121
# Git commit details
122122
branch: automation/yarn-upgrade
123+
author: aws-cdk-automation <[email protected]>
123124
commit-message: |-
124125
chore: npm-check-updates && yarn upgrade
125126
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.

‎package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
},
1818
"devDependencies": {
1919
"@yarnpkg/lockfile": "^1.1.0",
20-
"cdk-generate-synthetic-examples": "^0.1.8",
20+
"cdk-generate-synthetic-examples": "^0.1.10",
2121
"conventional-changelog-cli": "^2.2.2",
2222
"fs-extra": "^9.1.0",
2323
"graceful-fs": "^4.2.10",
24-
"jest-junit": "^13.1.0",
25-
"jsii-diff": "^1.57.0",
26-
"jsii-pacmak": "^1.57.0",
27-
"jsii-reflect": "^1.57.0",
28-
"jsii-rosetta": "^1.57.0",
24+
"jest-junit": "^13.2.0",
25+
"jsii-diff": "^1.58.0",
26+
"jsii-pacmak": "^1.58.0",
27+
"jsii-reflect": "^1.58.0",
28+
"jsii-rosetta": "^1.58.0",
2929
"lerna": "^4.0.0",
3030
"patch-package": "^6.4.7",
3131
"semver": "^6.3.0",

‎packages/@aws-cdk-containers/ecs-service-extensions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"license": "Apache-2.0",
4040
"devDependencies": {
41-
"@types/jest": "^27.4.1",
41+
"@types/jest": "^27.5.0",
4242
"@aws-cdk/cdk-build-tools": "0.0.0",
4343
"@aws-cdk/integ-runner": "0.0.0",
4444
"@aws-cdk/aws-autoscaling": "0.0.0",

‎packages/@aws-cdk/alexa-ask/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1"
88+
"@types/jest": "^27.5.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/app-delivery/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
"@aws-cdk/cdk-build-tools": "0.0.0",
7474
"@aws-cdk/integ-runner": "0.0.0",
7575
"@aws-cdk/pkglint": "0.0.0",
76-
"@types/jest": "^27.4.1",
77-
"fast-check": "^2.24.0",
76+
"@types/jest": "^27.5.0",
77+
"fast-check": "^2.25.0",
7878
"jest": "^27.5.1"
7979
},
8080
"repository": {

‎packages/@aws-cdk/assert-internal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"devDependencies": {
2727
"@aws-cdk/cdk-build-tools": "0.0.0",
2828
"@aws-cdk/pkglint": "0.0.0",
29-
"@types/jest": "^27.4.1",
29+
"@types/jest": "^27.5.0",
3030
"jest": "^27.5.1",
3131
"ts-jest": "^27.1.4"
3232
},

‎packages/@aws-cdk/assert/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@aws-cdk/assert-internal": "0.0.0",
3838
"@aws-cdk/cdk-build-tools": "0.0.0",
3939
"@aws-cdk/pkglint": "0.0.0",
40-
"@types/jest": "^27.4.1",
40+
"@types/jest": "^27.5.0",
4141
"aws-cdk-lib": "0.0.0",
4242
"aws-cdk-migration": "0.0.0",
4343
"constructs": "^10.0.0",

‎packages/@aws-cdk/assertions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@aws-cdk/cdk-build-tools": "0.0.0",
6666
"@aws-cdk/pkglint": "0.0.0",
6767
"@types/fs-extra": "^9.0.13",
68-
"@types/jest": "^27.4.1",
68+
"@types/jest": "^27.5.0",
6969
"jest": "^27.5.1",
7070
"constructs": "^10.0.0",
7171
"ts-jest": "^27.1.4"

‎packages/@aws-cdk/assets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@aws-cdk/cdk-build-tools": "0.0.0",
8282
"@aws-cdk/integ-runner": "0.0.0",
8383
"@aws-cdk/pkglint": "0.0.0",
84-
"@types/jest": "^27.4.1",
84+
"@types/jest": "^27.5.0",
8585
"@types/sinon": "^9.0.11",
8686
"aws-cdk": "0.0.0",
8787
"jest": "^27.5.1",

‎packages/@aws-cdk/aws-accessanalyzer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.1"
89+
"@types/jest": "^27.5.0"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-acmpca/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.1"
89+
"@types/jest": "^27.5.0"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-amazonmq/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1"
88+
"@types/jest": "^27.5.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-amplify/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.1",
90+
"@types/jest": "^27.5.0",
9191
"@types/yaml": "1.9.6",
9292
"aws-sdk": "^2.848.0"
9393
},

‎packages/@aws-cdk/aws-apigateway/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1"
88+
"@types/jest": "^27.5.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/aws-certificatemanager": "0.0.0",

‎packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/integ-runner": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/aws-lambda": "^8.10.93",
89-
"@types/jest": "^27.4.1"
88+
"@types/aws-lambda": "^8.10.97",
89+
"@types/jest": "^27.5.0"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/aws-apigatewayv2": "0.0.0",

‎packages/@aws-cdk/aws-apigatewayv2-integrations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@aws-cdk/cdk-build-tools": "0.0.0",
8383
"@aws-cdk/integ-runner": "0.0.0",
8484
"@aws-cdk/pkglint": "0.0.0",
85-
"@types/jest": "^27.4.1"
85+
"@types/jest": "^27.5.0"
8686
},
8787
"dependencies": {
8888
"@aws-cdk/aws-apigatewayv2": "0.0.0",

‎packages/@aws-cdk/aws-apigatewayv2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@aws-cdk/integ-runner": "0.0.0",
9191
"@aws-cdk/cfn2ts": "0.0.0",
9292
"@aws-cdk/pkglint": "0.0.0",
93-
"@types/jest": "^27.4.1"
93+
"@types/jest": "^27.5.0"
9494
},
9595
"dependencies": {
9696
"@aws-cdk/aws-certificatemanager": "0.0.0",

‎packages/@aws-cdk/aws-appconfig/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.1"
89+
"@types/jest": "^27.5.0"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-appflow/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"@aws-cdk/cdk-build-tools": "0.0.0",
8484
"@aws-cdk/cfn2ts": "0.0.0",
8585
"@aws-cdk/pkglint": "0.0.0",
86-
"@types/jest": "^27.4.1"
86+
"@types/jest": "^27.5.0"
8787
},
8888
"dependencies": {
8989
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-appintegrations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cdk-build-tools": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.1"
90+
"@types/jest": "^27.5.0"
9191
},
9292
"dependencies": {
9393
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-applicationautoscaling/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"@aws-cdk/cdk-build-tools": "0.0.0",
8585
"@aws-cdk/cfn2ts": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
87-
"@types/jest": "^27.4.1",
88-
"fast-check": "^2.24.0",
87+
"@types/jest": "^27.5.0",
88+
"fast-check": "^2.25.0",
8989
"jest": "^27.5.1"
9090
},
9191
"dependencies": {

‎packages/@aws-cdk/aws-applicationinsights/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/cdk-build-tools": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.1"
89+
"@types/jest": "^27.5.0"
9090
},
9191
"dependencies": {
9292
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-appmesh/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@aws-cdk/integ-runner": "0.0.0",
9191
"@aws-cdk/cfn2ts": "0.0.0",
9292
"@aws-cdk/pkglint": "0.0.0",
93-
"@types/jest": "^27.4.1",
93+
"@types/jest": "^27.5.0",
9494
"jest": "^27.5.1"
9595
},
9696
"dependencies": {

‎packages/@aws-cdk/aws-apprunner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@aws-cdk/integ-runner": "0.0.0",
8989
"@aws-cdk/cfn2ts": "0.0.0",
9090
"@aws-cdk/pkglint": "0.0.0",
91-
"@types/jest": "^27.4.1"
91+
"@types/jest": "^27.5.0"
9292
},
9393
"dependencies": {
9494
"@aws-cdk/aws-ecr": "0.0.0",

‎packages/@aws-cdk/aws-appstream/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1"
88+
"@types/jest": "^27.5.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-appsync/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@aws-cdk/integ-runner": "0.0.0",
8787
"@aws-cdk/cfn2ts": "0.0.0",
8888
"@aws-cdk/pkglint": "0.0.0",
89-
"@types/jest": "^27.4.1",
89+
"@types/jest": "^27.5.0",
9090
"jest": "^27.5.1"
9191
},
9292
"dependencies": {

‎packages/@aws-cdk/aws-appsync/test/verify.integ.appsync-lambda.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
function error {
4-
printf "\e[91;5;81m$@\e[0m\n"
4+
printf "\e[91m$@\e[0m\n"
55
}
66

77
function usage {

‎packages/@aws-cdk/aws-appsync/test/verify.integ.auth-apikey.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
function error {
4-
printf "\e[91;5;81m$@\e[0m\n"
4+
printf "\e[91m$@\e[0m\n"
55
}
66

77
function usage {

‎packages/@aws-cdk/aws-appsync/test/verify.integ.graphql-iam.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!bin/bash
22

33
function error {
4-
printf "\e[91;5;81m$@\e[0m\n"
4+
printf "\e[91m$@\e[0m\n"
55
}
66

77
if [[ "$1" == "--start" ]]; then

‎packages/@aws-cdk/aws-appsync/test/verify.integ.graphql-schema.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
function error {
4-
printf "\e[91;5;81m$@\e[0m\n"
4+
printf "\e[91m$@\e[0m\n"
55
}
66

77
function usage {

‎packages/@aws-cdk/aws-aps/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cdk-build-tools": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.1"
90+
"@types/jest": "^27.5.0"
9191
},
9292
"dependencies": {
9393
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-athena/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1",
88+
"@types/jest": "^27.5.0",
8989
"jest": "^27.5.1"
9090
},
9191
"dependencies": {

‎packages/@aws-cdk/aws-auditmanager/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/cdk-build-tools": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1"
88+
"@types/jest": "^27.5.0"
8989
},
9090
"dependencies": {
9191
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-autoscaling-common/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"@aws-cdk/cdk-build-tools": "0.0.0",
7676
"@aws-cdk/integ-runner": "0.0.0",
7777
"@aws-cdk/pkglint": "0.0.0",
78-
"@types/jest": "^27.4.1",
79-
"fast-check": "^2.24.0",
78+
"@types/jest": "^27.5.0",
79+
"fast-check": "^2.25.0",
8080
"jest": "^27.5.1"
8181
},
8282
"dependencies": {

‎packages/@aws-cdk/aws-autoscaling-hooktargets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"@aws-cdk/integ-runner": "0.0.0",
7979
"@aws-cdk/cfn2ts": "0.0.0",
8080
"@aws-cdk/pkglint": "0.0.0",
81-
"@types/jest": "^27.4.1",
81+
"@types/jest": "^27.5.0",
8282
"jest": "^27.5.1"
8383
},
8484
"dependencies": {

‎packages/@aws-cdk/aws-autoscaling/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/cloud-assembly-schema": "0.0.0",
8888
"@aws-cdk/cx-api": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.1",
90+
"@types/jest": "^27.5.0",
9191
"jest": "^27.5.1"
9292
},
9393
"dependencies": {

‎packages/@aws-cdk/aws-autoscalingplans/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"@aws-cdk/cdk-build-tools": "0.0.0",
8585
"@aws-cdk/cfn2ts": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
87-
"@types/jest": "^27.4.1"
87+
"@types/jest": "^27.5.0"
8888
},
8989
"dependencies": {
9090
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-backup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@aws-cdk/integ-runner": "0.0.0",
8888
"@aws-cdk/cfn2ts": "0.0.0",
8989
"@aws-cdk/pkglint": "0.0.0",
90-
"@types/jest": "^27.4.1"
90+
"@types/jest": "^27.5.0"
9191
},
9292
"dependencies": {
9393
"@aws-cdk/aws-dynamodb": "0.0.0",

‎packages/@aws-cdk/aws-batch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"@aws-cdk/integ-runner": "0.0.0",
8686
"@aws-cdk/cfn2ts": "0.0.0",
8787
"@aws-cdk/pkglint": "0.0.0",
88-
"@types/jest": "^27.4.1",
88+
"@types/jest": "^27.5.0",
8989
"jest": "^27.5.1"
9090
},
9191
"dependencies": {

‎packages/@aws-cdk/aws-billingconductor/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"@aws-cdk/cdk-build-tools": "0.0.0",
8989
"@aws-cdk/cfn2ts": "0.0.0",
9090
"@aws-cdk/pkglint": "0.0.0",
91-
"@types/jest": "^27.4.1"
91+
"@types/jest": "^27.5.0"
9292
},
9393
"dependencies": {
9494
"@aws-cdk/core": "0.0.0",

‎packages/@aws-cdk/aws-budgets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"@aws-cdk/cdk-build-tools": "0.0.0",
8585
"@aws-cdk/cfn2ts": "0.0.0",
8686
"@aws-cdk/pkglint": "0.0.0",
87-
"@types/jest": "^27.4.1"
87+
"@types/jest": "^27.5.0"
8888
},
8989
"dependencies": {
9090
"@aws-cdk/core": "0.0.0",

0 commit comments

Comments
 (0)