Skip to content

Commit 17471e1

Browse files
authored
feat: upgrade lambdas to nodejs 18 (#2639)
now that AWS supports node 18 we should upgrade This is a bigish change as `aws-sdk` is no longer bundled by AWS, so we need to include it in our built lambda's https://aws.amazon.com/blogs/compute/node-js-18-x-runtime-now-available-in-aws-lambda/ some time in the future we should also migrate to aws-sdk v3.
1 parent d0e45c7 commit 17471e1

File tree

6 files changed

+111
-28
lines changed

6 files changed

+111
-28
lines changed

packages/_infra/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"devDependencies": {
2727
"@basemaps/lambda-tiler": "^6.40.0",
2828
"@basemaps/shared": "^6.40.0",
29-
"aws-cdk": "^2.21.0",
30-
"aws-cdk-lib": "^2.21.0",
31-
"constructs": "^10.0.119"
29+
"aws-cdk": "^2.80.0",
30+
"aws-cdk-lib": "^2.80.0",
31+
"constructs": "^10.2.32"
3232
}
3333
}

packages/_infra/src/analytics/edge.analytics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class EdgeAnalytics extends Stack {
2929

3030
const cacheBucket = new Bucket(this, 'AnalyticCacheBucket');
3131
this.lambda = new lf.Function(this, 'AnalyticLambda', {
32-
runtime: lf.Runtime.NODEJS_16_X,
32+
runtime: lf.Runtime.NODEJS_18_X,
3333
memorySize: 2048,
3434
timeout: Duration.minutes(10),
3535
handler: 'index.handler',

packages/_infra/src/serve/lambda.tiler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class LambdaTiler extends Construct {
4242
*/
4343

4444
this.lambdaNoVpc = new lambda.Function(this, 'TilerNoVpc', {
45-
runtime: lambda.Runtime.NODEJS_16_X,
45+
runtime: lambda.Runtime.NODEJS_18_X,
4646
memorySize: 2048,
4747
timeout: Duration.seconds(60),
4848
handler: 'index.handler',

packages/lambda-analytics/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"entry": "src/index.ts",
3535
"outdir": "dist/",
3636
"external": [
37-
"aws-sdk",
3837
"pino-pretty"
3938
]
4039
}

packages/lambda-tiler/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"entry": "src/index.ts",
4242
"outdir": "dist/",
4343
"external": [
44-
"aws-sdk",
4544
"pino-pretty",
4645
"sharp"
4746
]

yarn.lock

Lines changed: 106 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
# yarn lockfile v1
33

44

5+
"@aws-cdk/asset-awscli-v1@^2.2.177":
6+
version "2.2.184"
7+
resolved "https://registry.yarnpkg.com/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.184.tgz#5d80be70d09516db14a2e7b1e5a5145e8828568a"
8+
integrity sha512-03q3Pm/IFEJEA4QS1GH87LwU4YhN1nuvA986k7KtaMIMPTOt/YXpUsriw/Sx2XcTpUk419sPGewr5N0D2slDCg==
9+
10+
"@aws-cdk/asset-kubectl-v20@^2.1.1":
11+
version "2.1.1"
12+
resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.1.tgz#d01c1efb867fb7f2cfd8c8b230b8eae16447e156"
13+
integrity sha512-U1ntiX8XiMRRRH5J1IdC+1t5CE89015cwyt5U63Cpk0GnMlN5+h9WsWMlKlPXZR4rdq/m806JRlBMRpBUB2Dhw==
14+
15+
"@aws-cdk/asset-node-proxy-agent-v5@^2.0.148":
16+
version "2.0.154"
17+
resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.154.tgz#02b7994b1dbe1f51a6eb6784a20ace82476d8d15"
18+
integrity sha512-rz0iDfiB4uSDWYOjQKfJH99f/5+2WPS2dnM2HP5t4jD3QroQgZMEp2xqALWyso1BK5JyCh1bOeXQZ8yd5xt4+Q==
19+
520
"@babel/code-frame@^7.0.0":
621
version "7.12.13"
722
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
@@ -2209,6 +2224,16 @@ ajv@^8.0.0, ajv@^8.10.0:
22092224
require-from-string "^2.0.2"
22102225
uri-js "^4.2.2"
22112226

2227+
ajv@^8.0.1:
2228+
version "8.12.0"
2229+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
2230+
integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
2231+
dependencies:
2232+
fast-deep-equal "^3.1.1"
2233+
json-schema-traverse "^1.0.0"
2234+
require-from-string "^2.0.2"
2235+
uri-js "^4.2.2"
2236+
22122237
ajv@^8.11.0:
22132238
version "8.11.2"
22142239
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78"
@@ -2323,6 +2348,11 @@ asap@^2.0.0:
23232348
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
23242349
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
23252350

2351+
astral-regex@^2.0.0:
2352+
version "2.0.0"
2353+
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
2354+
integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
2355+
23262356
at-least-node@^1.0.0:
23272357
version "1.0.0"
23282358
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -2342,25 +2372,29 @@ avvio@^8.2.0:
23422372
debug "^4.0.0"
23432373
fastq "^1.6.1"
23442374

2345-
aws-cdk-lib@^2.21.0:
2346-
version "2.25.0"
2347-
resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.25.0.tgz#6014ab5b73b2a3012c8081b9afc8411dcb9832a0"
2348-
integrity sha512-rcQeQu/lTmi1tg5DwV0gBqJtF73khApfHt9n7BIHkKbUWvCB50lIL1Q1/7cHvTicfQ62UnwFoPWwB0YqQceDVQ==
2375+
aws-cdk-lib@^2.80.0:
2376+
version "2.80.0"
2377+
resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.80.0.tgz#1118860637d33fab8f646551c29a75728404b64e"
2378+
integrity sha512-PoqD3Yms5I0ajuTi071nTW/hpkH3XsdyZzn5gYsPv0qD7mqP3h6Qr+6RiGx+yQ1KcVFyxWdX15uK+DsC0KwvcQ==
23492379
dependencies:
2380+
"@aws-cdk/asset-awscli-v1" "^2.2.177"
2381+
"@aws-cdk/asset-kubectl-v20" "^2.1.1"
2382+
"@aws-cdk/asset-node-proxy-agent-v5" "^2.0.148"
23502383
"@balena/dockerignore" "^1.0.2"
23512384
case "1.6.3"
2352-
fs-extra "^9.1.0"
2353-
ignore "^5.2.0"
2354-
jsonschema "^1.4.0"
2385+
fs-extra "^11.1.1"
2386+
ignore "^5.2.4"
2387+
jsonschema "^1.4.1"
23552388
minimatch "^3.1.2"
2356-
punycode "^2.1.1"
2357-
semver "^7.3.7"
2389+
punycode "^2.3.0"
2390+
semver "^7.5.1"
2391+
table "^6.8.1"
23582392
yaml "1.10.2"
23592393

2360-
aws-cdk@^2.21.0:
2361-
version "2.25.0"
2362-
resolved "https://registry.yarnpkg.com/aws-cdk/-/aws-cdk-2.25.0.tgz#e76c8156c411dbfa2da1d95469d60ae3580060f1"
2363-
integrity sha512-6NZKDPgCQ0O3xlpk22sR54N4yCvGt2tM2bkKHPrV6n4HCI+a349hsF4xSngiSrHAoaNQKMgAwScpj3GTZcI+oA==
2394+
aws-cdk@^2.80.0:
2395+
version "2.80.0"
2396+
resolved "https://registry.yarnpkg.com/aws-cdk/-/aws-cdk-2.80.0.tgz#fef040f2b01df6551fba828a9df350c4c792baba"
2397+
integrity sha512-SKMZ/sGlNmFV37Lk40HHe4QJ2hJZmD0PrkScBmkr33xzEqjyKhN3jIHC4PYqTUeUK/qYemq3Y5OpXKQuWTCoKA==
23642398
optionalDependencies:
23652399
fsevents "2.3.2"
23662400

@@ -2902,10 +2936,10 @@ console-control-strings@^1.1.0:
29022936
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
29032937
integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
29042938

2905-
constructs@^10.0.119:
2906-
version "10.0.119"
2907-
resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.0.119.tgz#e74e3ad52d2a4094ec7848d8b5236a4d3391e486"
2908-
integrity sha512-Dx2qmqy3uTrFnt6uejO7uqVzB61QkD25L/nayvSPv2kcb1jE03y/4XDsbnTmr8wnt51NajmzZiRuwap749pMzw==
2939+
constructs@^10.2.32:
2940+
version "10.2.32"
2941+
resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.2.32.tgz#395ae9af2ac110052b84209664ff11e7a8eb53d1"
2942+
integrity sha512-84MhMvsroG3gu2zf43N3SUDlMKEGbauXK5z1qG/hA4X1kGZCzPbU3DslQJtLsHVctY7aYHIGU1axInDu9DvttA==
29092943

29102944
container-query-polyfill@0.1.2:
29112945
version "0.1.2"
@@ -4260,6 +4294,15 @@ fs-constants@^1.0.0:
42604294
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
42614295
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
42624296

4297+
fs-extra@^11.1.1:
4298+
version "11.1.1"
4299+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
4300+
integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
4301+
dependencies:
4302+
graceful-fs "^4.2.0"
4303+
jsonfile "^6.0.1"
4304+
universalify "^2.0.0"
4305+
42634306
fs-extra@^9.1.0:
42644307
version "9.1.0"
42654308
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -4726,6 +4769,11 @@ ignore@^5.2.0:
47264769
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
47274770
integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
47284771

4772+
ignore@^5.2.4:
4773+
version "5.2.4"
4774+
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
4775+
integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
4776+
47294777
import-fresh@^3.0.0:
47304778
version "3.3.0"
47314779
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -5123,10 +5171,10 @@ jsonparse@^1.2.0, jsonparse@^1.3.1:
51235171
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
51245172
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
51255173

5126-
jsonschema@^1.4.0:
5127-
version "1.4.0"
5128-
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2"
5129-
integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw==
5174+
jsonschema@^1.4.1:
5175+
version "1.4.1"
5176+
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab"
5177+
integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==
51305178

51315179
just-diff-apply@^5.2.0:
51325180
version "5.3.1"
@@ -5334,6 +5382,11 @@ lodash.templatesettings@^4.0.0:
53345382
dependencies:
53355383
lodash._reinterpolate "^3.0.0"
53365384

5385+
lodash.truncate@^4.4.2:
5386+
version "4.4.2"
5387+
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
5388+
integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
5389+
53375390
lodash@>=4.17.21, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.2.1, lodash@^4.7.0:
53385391
version "4.17.21"
53395392
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -6809,6 +6862,11 @@ punycode@^2.1.0, punycode@^2.1.1:
68096862
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
68106863
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
68116864

6865+
punycode@^2.3.0:
6866+
version "2.3.0"
6867+
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
6868+
integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
6869+
68126870
q@^1.4.1, q@^1.5.1:
68136871
version "1.5.1"
68146872
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -7349,6 +7407,13 @@ semver@^7.1.1, semver@^7.1.3, semver@^7.3.4, semver@^7.3.5:
73497407
dependencies:
73507408
lru-cache "^6.0.0"
73517409

7410+
semver@^7.5.1:
7411+
version "7.5.1"
7412+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
7413+
integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
7414+
dependencies:
7415+
lru-cache "^6.0.0"
7416+
73527417
send@^0.18.0:
73537418
version "0.18.0"
73547419
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -7478,6 +7543,15 @@ slash@^3.0.0:
74787543
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
74797544
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
74807545

7546+
slice-ansi@^4.0.0:
7547+
version "4.0.0"
7548+
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
7549+
integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
7550+
dependencies:
7551+
ansi-styles "^4.0.0"
7552+
astral-regex "^2.0.0"
7553+
is-fullwidth-code-point "^3.0.0"
7554+
74817555
slice-source@0.4.1:
74827556
version "0.4.1"
74837557
resolved "https://registry.yarnpkg.com/slice-source/-/slice-source-0.4.1.tgz#40a57ac03c6668b5da200e05378e000bf2a61d79"
@@ -7835,6 +7909,17 @@ svgstore@^3.0.0-2:
78357909
dependencies:
78367910
cheerio v1.0.0-rc.10
78377911

7912+
table@^6.8.1:
7913+
version "6.8.1"
7914+
resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
7915+
integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
7916+
dependencies:
7917+
ajv "^8.0.1"
7918+
lodash.truncate "^4.4.2"
7919+
slice-ansi "^4.0.0"
7920+
string-width "^4.2.3"
7921+
strip-ansi "^6.0.1"
7922+
78387923
tar-fs@^2.0.0, tar-fs@^2.1.1:
78397924
version "2.1.1"
78407925
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"

0 commit comments

Comments
 (0)