Skip to content

Commit aeffa1b

Browse files
authored
fix(e2e-sandbox): restore cloud-assembly-schema <=53 compatibility after aws-cdk-lib bump (#752)
1 parent d601d0c commit aeffa1b

8 files changed

Lines changed: 76 additions & 78 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
---
3+
4+
Fix the `e2e-sandbox` CDK cloud-assembly-schema v54 mismatch introduced by the
5+
`aws-cdk-lib` security bump, and complete the Dependabot remediation.
6+
7+
`aws-cdk-lib >= 2.258.0` ships `@aws-cdk/cloud-assembly-schema` v54, but the Amplify
8+
sandbox deployer bundled with `@aws-amplify/backend-cli` supports cloud-assembly-schema
9+
up to `53.x.x` only. Floating `^2.246.0` to the latest `2.260.0` therefore made
10+
`ampx sandbox` synth emit a v54 manifest the deployer could not read. `aws-cdk-lib` is
11+
pinned to `2.257.0` — the highest patched (`>= 2.246.0`, GHSA-999r-qq7v-r334) version
12+
that still emits cloud-assembly-schema `<= 53` — across the private `e2e-tests`
13+
workspaces. Root Yarn `resolutions` are also updated to close the remaining open alerts
14+
(`js-yaml` GHSA-h67p-54hq-rp68, `webpack-dev-server` GHSA-mx8g-39q3-5c79,
15+
`http-proxy-middleware` GHSA-64mm-vxmg-q3vj).
16+
17+
Changes are limited to private `e2e-tests` workspace devDependencies, root
18+
`resolutions`, and the lockfile. No published package (`@aws-amplify/data-schema`,
19+
`@aws-amplify/data-schema-types`) changed its source, runtime dependencies, or public
20+
API (`check:api` reports zero delta), so no release is required.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@
103103
"qs": "^6.15.2",
104104
"uuid": "^11.1.1",
105105
"js-cookie": "^3.0.7",
106-
"webpack-dev-server": "^5.2.4",
106+
"webpack-dev-server": "^5.2.5",
107107
"brace-expansion": "^5.0.6",
108108
"@opentelemetry/core": "^2.8.0",
109-
"js-yaml@npm:~4.1.0": "^4.2.0",
110-
"js-yaml@npm:4.1.1": "^4.2.0"
109+
"js-yaml": "^4.2.0",
110+
"http-proxy-middleware": "^2.0.10"
111111
}
112112
}

packages/e2e-tests/exports-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@types/jest": "^29.5.12",
2323
"@types/node": "20.8.3",
2424
"aws-cdk": "^2.149.0",
25-
"aws-cdk-lib": "^2.246.0",
25+
"aws-cdk-lib": "2.257.0",
2626
"constructs": "^10.3.0",
2727
"esbuild": "^0.28.1",
2828
"jest": "^29.7.0",

packages/e2e-tests/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@types/ws": "^8.5.11",
2323
"aws-amplify": "unstable",
2424
"aws-cdk": "^2.149.0",
25-
"aws-cdk-lib": "^2.246.0",
25+
"aws-cdk-lib": "2.257.0",
2626
"constructs": "^10.3.0",
2727
"esbuild": "^0.28.1",
2828
"jest": "^29.7.0",

packages/e2e-tests/sandbox/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@types/ws": "^8.5.11",
2727
"aws-amplify": "unstable",
2828
"aws-cdk": "^2.149.0",
29-
"aws-cdk-lib": "^2.246.0",
29+
"aws-cdk-lib": "2.257.0",
3030
"constructs": "^10.3.0",
3131
"esbuild": "^0.28.1",
3232
"execa": "^8.0.1",

packages/e2e-tests/vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@aws-amplify/data-schema": "workspace:*",
2222
"@aws-amplify/data-schema-types": "workspace:*",
2323
"aws-cdk": "^2.175.1",
24-
"aws-cdk-lib": "^2.246.0",
24+
"aws-cdk-lib": "2.257.0",
2525
"constructs": "^10.4.2",
2626
"typescript": "^5.7.3",
2727
"vite": "^8.0.16",

packages/e2e-tests/webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@aws-amplify/data-schema": "workspace:*",
2121
"@aws-amplify/data-schema-types": "workspace:*",
2222
"aws-cdk": "^2.175.1",
23-
"aws-cdk-lib": "^2.246.0",
23+
"aws-cdk-lib": "2.257.0",
2424
"constructs": "^10.4.2",
2525
"copy-webpack-plugin": "^14.0.0",
2626
"esbuild": "^0.28.1",
@@ -30,7 +30,7 @@
3030
"typescript": "^5.7.3",
3131
"webpack": "^5.97.1",
3232
"webpack-cli": "^6.0.1",
33-
"webpack-dev-server": "^5.2.4"
33+
"webpack-dev-server": "^5.2.5"
3434
},
3535
"dependencies": {
3636
"aws-amplify": "^6.12.0"

yarn.lock

Lines changed: 47 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ __metadata:
927927
"@types/ws": "npm:^8.5.11"
928928
aws-amplify: "npm:unstable"
929929
aws-cdk: "npm:^2.149.0"
930-
aws-cdk-lib: "npm:^2.246.0"
930+
aws-cdk-lib: "npm:2.257.0"
931931
constructs: "npm:^10.3.0"
932932
esbuild: "npm:^0.28.1"
933933
jest: "npm:^29.7.0"
@@ -958,7 +958,7 @@ __metadata:
958958
"@types/ws": "npm:^8.5.11"
959959
aws-amplify: "npm:unstable"
960960
aws-cdk: "npm:^2.149.0"
961-
aws-cdk-lib: "npm:^2.246.0"
961+
aws-cdk-lib: "npm:2.257.0"
962962
constructs: "npm:^10.3.0"
963963
esbuild: "npm:^0.28.1"
964964
execa: "npm:^8.0.1"
@@ -983,7 +983,7 @@ __metadata:
983983
"@aws-amplify/data-schema-types": "workspace:*"
984984
aws-amplify: "npm:^6.12.0"
985985
aws-cdk: "npm:^2.175.1"
986-
aws-cdk-lib: "npm:^2.246.0"
986+
aws-cdk-lib: "npm:2.257.0"
987987
constructs: "npm:^10.4.2"
988988
typescript: "npm:^5.7.3"
989989
vite: "npm:^8.0.16"
@@ -1001,7 +1001,7 @@ __metadata:
10011001
"@aws-amplify/data-schema-types": "workspace:*"
10021002
aws-amplify: "npm:^6.12.0"
10031003
aws-cdk: "npm:^2.175.1"
1004-
aws-cdk-lib: "npm:^2.246.0"
1004+
aws-cdk-lib: "npm:2.257.0"
10051005
constructs: "npm:^10.4.2"
10061006
copy-webpack-plugin: "npm:^14.0.0"
10071007
esbuild: "npm:^0.28.1"
@@ -1011,7 +1011,7 @@ __metadata:
10111011
typescript: "npm:^5.7.3"
10121012
webpack: "npm:^5.97.1"
10131013
webpack-cli: "npm:^6.0.1"
1014-
webpack-dev-server: "npm:^5.2.4"
1014+
webpack-dev-server: "npm:^5.2.5"
10151015
languageName: unknown
10161016
linkType: soft
10171017

@@ -1730,14 +1730,14 @@ __metadata:
17301730
languageName: node
17311731
linkType: hard
17321732

1733-
"@aws-cdk/asset-awscli-v1@npm:2.2.282":
1734-
version: 2.2.282
1735-
resolution: "@aws-cdk/asset-awscli-v1@npm:2.2.282"
1736-
checksum: 10c0/4c3014292a2d5a13d99151bbbba291e96dcc6d44d841b77415bc422db588ca6ea14999e29ed94c9bff3c8d1b4a7ebf9327eb7cf89caf3f9d5bfb3d0f1749fa8d
1733+
"@aws-cdk/asset-awscli-v1@npm:2.2.273":
1734+
version: 2.2.273
1735+
resolution: "@aws-cdk/asset-awscli-v1@npm:2.2.273"
1736+
checksum: 10c0/625f12bc6c659efcafdc135c0efcf0e780d4c33fbcbcf9cbcdef20b76d3cd7cfdf51c49306d7b65e37d58c6a4c1b20a15dac28a00bae55da10ccb01ade8a033b
17371737
languageName: node
17381738
linkType: hard
17391739

1740-
"@aws-cdk/asset-node-proxy-agent-v6@npm:^2.1.2":
1740+
"@aws-cdk/asset-node-proxy-agent-v6@npm:^2.1.1":
17411741
version: 2.1.2
17421742
resolution: "@aws-cdk/asset-node-proxy-agent-v6@npm:2.1.2"
17431743
checksum: 10c0/5b80cf4e4b853d4410d80ab906adfa9c268c9a78b9df6f736ecee09dbd1e527e893188469d8bdc932e34c4778ffd4abda74288ea009174f42f8be1acf82824e7
@@ -1801,7 +1801,7 @@ __metadata:
18011801
languageName: node
18021802
linkType: hard
18031803

1804-
"@aws-cdk/cloud-assembly-api@npm:^2.2.5":
1804+
"@aws-cdk/cloud-assembly-api@npm:^2.2.4":
18051805
version: 2.2.6
18061806
resolution: "@aws-cdk/cloud-assembly-api@npm:2.2.6"
18071807
dependencies:
@@ -1823,13 +1823,13 @@ __metadata:
18231823
languageName: node
18241824
linkType: hard
18251825

1826-
"@aws-cdk/cloud-assembly-schema@npm:^54.0.0":
1827-
version: 54.5.0
1828-
resolution: "@aws-cdk/cloud-assembly-schema@npm:54.5.0"
1826+
"@aws-cdk/cloud-assembly-schema@npm:^53.25.0":
1827+
version: 53.28.0
1828+
resolution: "@aws-cdk/cloud-assembly-schema@npm:53.28.0"
18291829
dependencies:
18301830
jsonschema: "npm:^1.5.0"
1831-
semver: "npm:^7.8.4"
1832-
checksum: 10c0/385a1fff000163eaf55d8b4c449c386bb73911ae5d1ca8dbfb877fa32e6fc2645812fa890aace7d54b0e8215433eb6b511aa9ad00f7d8014e815e78b4e8e764e
1831+
semver: "npm:^7.8.0"
1832+
checksum: 10c0/9952eb6df8b9c509582976573b3051812fd180592c22bedd964ecca8d701a6f77683c15b5a4b582c69a101834732c4a830ed932c33048bda4f40f7ad5748d095
18331833
languageName: node
18341834
linkType: hard
18351835

@@ -12802,7 +12802,14 @@ __metadata:
1280212802
languageName: node
1280312803
linkType: hard
1280412804

12805-
"argparse@npm:^1.0.7, argparse@npm:~1.0.9":
12805+
"argparse@npm:^2.0.1":
12806+
version: 2.0.1
12807+
resolution: "argparse@npm:2.0.1"
12808+
checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
12809+
languageName: node
12810+
linkType: hard
12811+
12812+
"argparse@npm:~1.0.9":
1280612813
version: 1.0.10
1280712814
resolution: "argparse@npm:1.0.10"
1280812815
dependencies:
@@ -12811,13 +12818,6 @@ __metadata:
1281112818
languageName: node
1281212819
linkType: hard
1281312820

12814-
"argparse@npm:^2.0.1":
12815-
version: 2.0.1
12816-
resolution: "argparse@npm:2.0.1"
12817-
checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
12818-
languageName: node
12819-
linkType: hard
12820-
1282112821
"arkregex@npm:0.0.5":
1282212822
version: 0.0.5
1282312823
resolution: "arkregex@npm:0.0.5"
@@ -13020,28 +13020,28 @@ __metadata:
1302013020
languageName: node
1302113021
linkType: hard
1302213022

13023-
"aws-cdk-lib@npm:^2.246.0":
13024-
version: 2.260.0
13025-
resolution: "aws-cdk-lib@npm:2.260.0"
13023+
"aws-cdk-lib@npm:2.257.0":
13024+
version: 2.257.0
13025+
resolution: "aws-cdk-lib@npm:2.257.0"
1302613026
dependencies:
13027-
"@aws-cdk/asset-awscli-v1": "npm:2.2.282"
13028-
"@aws-cdk/asset-node-proxy-agent-v6": "npm:^2.1.2"
13029-
"@aws-cdk/cloud-assembly-api": "npm:^2.2.5"
13030-
"@aws-cdk/cloud-assembly-schema": "npm:^54.0.0"
13027+
"@aws-cdk/asset-awscli-v1": "npm:2.2.273"
13028+
"@aws-cdk/asset-node-proxy-agent-v6": "npm:^2.1.1"
13029+
"@aws-cdk/cloud-assembly-api": "npm:^2.2.4"
13030+
"@aws-cdk/cloud-assembly-schema": "npm:^53.25.0"
1303113031
"@balena/dockerignore": "npm:^1.0.2"
1303213032
case: "npm:1.6.3"
13033-
fs-extra: "npm:^11.3.5"
13033+
fs-extra: "npm:^11.3.3"
1303413034
ignore: "npm:^5.3.2"
1303513035
jsonschema: "npm:^1.5.0"
1303613036
mime-types: "npm:^2.1.35"
13037-
minimatch: "npm:^10.2.5"
13037+
minimatch: "npm:^10.2.3"
1303813038
punycode: "npm:^2.3.1"
13039-
semver: "npm:^7.8.1"
13039+
semver: "npm:^7.7.4"
1304013040
table: "npm:^6.9.0"
1304113041
yaml: "npm:1.10.3"
1304213042
peerDependencies:
1304313043
constructs: ^10.5.0
13044-
checksum: 10c0/08be8c18e0c388c6f47d8a183d6580a4f3f88afea759a60fb5bec8b2be40d952fff62638d70260f49e46e5bda10459cdf21fe23d85e7ed065241fb73b85c633a
13044+
checksum: 10c0/878e552b3c7a3095adbe90a00f938c70df50a2935804edcb3ad32d84df5b90983fa55e7a98807aae48d77deec4f7e33e6b2f95f19bf0bcfd368166ef348b764c
1304513045
languageName: node
1304613046
linkType: hard
1304713047

@@ -15471,16 +15471,6 @@ __metadata:
1547115471
languageName: node
1547215472
linkType: hard
1547315473

15474-
"esprima@npm:^4.0.0":
15475-
version: 4.0.1
15476-
resolution: "esprima@npm:4.0.1"
15477-
bin:
15478-
esparse: ./bin/esparse.js
15479-
esvalidate: ./bin/esvalidate.js
15480-
checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
15481-
languageName: node
15482-
linkType: hard
15483-
1548415474
"esquery@npm:^1.5.0":
1548515475
version: 1.7.0
1548615476
resolution: "esquery@npm:1.7.0"
@@ -15658,7 +15648,7 @@ __metadata:
1565815648
"@types/jest": "npm:^29.5.12"
1565915649
"@types/node": "npm:20.8.3"
1566015650
aws-cdk: "npm:^2.149.0"
15661-
aws-cdk-lib: "npm:^2.246.0"
15651+
aws-cdk-lib: "npm:2.257.0"
1566215652
constructs: "npm:^10.3.0"
1566315653
esbuild: "npm:^0.28.1"
1566415654
jest: "npm:^29.7.0"
@@ -16080,7 +16070,7 @@ __metadata:
1608016070
languageName: node
1608116071
linkType: hard
1608216072

16083-
"fs-extra@npm:^11.3.5":
16073+
"fs-extra@npm:^11.3.3":
1608416074
version: 11.3.5
1608516075
resolution: "fs-extra@npm:11.3.5"
1608616076
dependencies:
@@ -16793,9 +16783,9 @@ __metadata:
1679316783
languageName: node
1679416784
linkType: hard
1679516785

16796-
"http-proxy-middleware@npm:^2.0.9":
16797-
version: 2.0.9
16798-
resolution: "http-proxy-middleware@npm:2.0.9"
16786+
"http-proxy-middleware@npm:^2.0.10":
16787+
version: 2.0.10
16788+
resolution: "http-proxy-middleware@npm:2.0.10"
1679916789
dependencies:
1680016790
"@types/http-proxy": "npm:^1.17.8"
1680116791
http-proxy: "npm:^1.18.1"
@@ -16807,7 +16797,7 @@ __metadata:
1680716797
peerDependenciesMeta:
1680816798
"@types/express":
1680916799
optional: true
16810-
checksum: 10c0/8e9032af625f7c9f2f0d318f6cdb14eb725cc16ffe7b4ccccea25cf591fa819bb7c3bb579e0b543e0ae9c73059b505a6d728290c757bff27bae526a6ed11c05e
16800+
checksum: 10c0/363cd25fbac18f851af93cea34ac7068656413c9af5af12d3b2a127adc70623d2c0d6e9e12037bbac5a4744b762fd9f89fb16e16c29ad06af2b17766890c1b26
1681116801
languageName: node
1681216802
linkType: hard
1681316803

@@ -18292,19 +18282,7 @@ __metadata:
1829218282
languageName: node
1829318283
linkType: hard
1829418284

18295-
"js-yaml@npm:^3.13.1, js-yaml@npm:^3.6.1":
18296-
version: 3.14.2
18297-
resolution: "js-yaml@npm:3.14.2"
18298-
dependencies:
18299-
argparse: "npm:^1.0.7"
18300-
esprima: "npm:^4.0.0"
18301-
bin:
18302-
js-yaml: bin/js-yaml.js
18303-
checksum: 10c0/3261f25912f5dd76605e5993d0a126c2b6c346311885d3c483706cd722efe34f697ea0331f654ce27c00a42b426e524518ec89d65ed02ea47df8ad26dcc8ce69
18304-
languageName: node
18305-
linkType: hard
18306-
18307-
"js-yaml@npm:^4.1.1, js-yaml@npm:^4.2.0":
18285+
"js-yaml@npm:^4.2.0":
1830818286
version: 4.2.0
1830918287
resolution: "js-yaml@npm:4.2.0"
1831018288
dependencies:
@@ -21637,7 +21615,7 @@ __metadata:
2163721615
languageName: node
2163821616
linkType: hard
2163921617

21640-
"semver@npm:^7.8.1, semver@npm:^7.8.4":
21618+
"semver@npm:^7.8.0, semver@npm:^7.8.4":
2164121619
version: 7.8.5
2164221620
resolution: "semver@npm:7.8.5"
2164321621
bin:
@@ -24089,9 +24067,9 @@ __metadata:
2408924067
languageName: node
2409024068
linkType: hard
2409124069

24092-
"webpack-dev-server@npm:^5.2.4":
24093-
version: 5.2.4
24094-
resolution: "webpack-dev-server@npm:5.2.4"
24070+
"webpack-dev-server@npm:^5.2.5":
24071+
version: 5.2.5
24072+
resolution: "webpack-dev-server@npm:5.2.5"
2409524073
dependencies:
2409624074
"@types/bonjour": "npm:^3.5.13"
2409724075
"@types/connect-history-api-fallback": "npm:^1.5.4"
@@ -24130,7 +24108,7 @@ __metadata:
2413024108
optional: true
2413124109
bin:
2413224110
webpack-dev-server: bin/webpack-dev-server.js
24133-
checksum: 10c0/42f8afe11b7bfe65d72e30d861ddf1e4d05f27202c4c1162d204cb41a4a858dffc91c5a02bf44ec08acc8c02b4a57aaf46924ec12a5e5b97c307991379282669
24111+
checksum: 10c0/8963b3533197ebd820456f3cb14d9234ba4dff10412eb11200b8099c501559abf7a700e9a5d4136f17929374b61c1af5c6ef597471ea45b97ba6ca69a12e5ca8
2413424112
languageName: node
2413524113
linkType: hard
2413624114

0 commit comments

Comments
 (0)