From 49acc4176799498ed48c46f8031fa6737630b697 Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Wed, 11 May 2022 13:48:21 +1000 Subject: [PATCH 1/7] feat: bump up template to node 16 --- template/lambda-sqs-worker/.nvmrc | 2 +- template/lambda-sqs-worker/Dockerfile | 2 +- template/lambda-sqs-worker/package.json | 6 +++--- template/lambda-sqs-worker/serverless.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/template/lambda-sqs-worker/.nvmrc b/template/lambda-sqs-worker/.nvmrc index 8351c1939..b6a7d89c6 100644 --- a/template/lambda-sqs-worker/.nvmrc +++ b/template/lambda-sqs-worker/.nvmrc @@ -1 +1 @@ -14 +16 diff --git a/template/lambda-sqs-worker/Dockerfile b/template/lambda-sqs-worker/Dockerfile index 418fcbaf9..973f24661 100644 --- a/template/lambda-sqs-worker/Dockerfile +++ b/template/lambda-sqs-worker/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.2 -FROM node:14-alpine AS dev-deps +FROM node:16-alpine AS dev-deps WORKDIR /workdir diff --git a/template/lambda-sqs-worker/package.json b/template/lambda-sqs-worker/package.json index 0b457ad1c..49ada13a5 100644 --- a/template/lambda-sqs-worker/package.json +++ b/template/lambda-sqs-worker/package.json @@ -10,16 +10,16 @@ "devDependencies": { "@types/aws-lambda": "^8.10.84", "@types/chance": "^1.1.3", - "@types/node": "^14.0.0", + "@types/node": "^16.0.0", "chance": "^1.1.8", "pino-pretty": "^7.1.0", - "serverless": "^3.0.0", + "serverless": "^3.17.0", "serverless-plugin-canary-deployments": "^0.8.0", "serverless-prune-plugin": "^2.0.0", "skuba": "*" }, "engines": { - "node": ">=14" + "node": ">=16" }, "license": "UNLICENSED", "private": true, diff --git a/template/lambda-sqs-worker/serverless.yml b/template/lambda-sqs-worker/serverless.yml index f06658231..5411d0b2e 100644 --- a/template/lambda-sqs-worker/serverless.yml +++ b/template/lambda-sqs-worker/serverless.yml @@ -25,7 +25,7 @@ provider: logRetentionInDays: 30 name: aws region: ap-southeast-2 - runtime: nodejs14.x + runtime: nodejs16.x architecture: arm64 stackName: ${self:service} stage: ${env:ENVIRONMENT} From 3f8cc413e4ec8750b1d8488daa263b8f754b41b8 Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Wed, 11 May 2022 13:49:17 +1000 Subject: [PATCH 2/7] remove optional parameter --- template/lambda-sqs-worker/serverless.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/template/lambda-sqs-worker/serverless.yml b/template/lambda-sqs-worker/serverless.yml index 5411d0b2e..9807027c0 100644 --- a/template/lambda-sqs-worker/serverless.yml +++ b/template/lambda-sqs-worker/serverless.yml @@ -29,7 +29,6 @@ provider: architecture: arm64 stackName: ${self:service} stage: ${env:ENVIRONMENT} - versionFunctions: true deploymentBucket: # Use a shared account-level bucket for Lambda bundles and other artefacts. # This is easier to manage in terms of access, deployment, and tagging. From fbf98a87eabb5a62a7b74873c77f648e1dea736b Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Wed, 11 May 2022 13:52:02 +1000 Subject: [PATCH 3/7] Create serious-games-study.md --- .changeset/serious-games-study.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/serious-games-study.md diff --git a/.changeset/serious-games-study.md b/.changeset/serious-games-study.md new file mode 100644 index 000000000..e88b0aae5 --- /dev/null +++ b/.changeset/serious-games-study.md @@ -0,0 +1,5 @@ +--- +"skuba": patch +--- + +template/lambda-sqs-worker: Bump up node version to 16 From bb5d7e2976190655a73d5dd837209482d0aaa5fa Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 11 May 2022 13:58:23 +1000 Subject: [PATCH 4/7] Update serious-games-study.md --- .changeset/serious-games-study.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/serious-games-study.md b/.changeset/serious-games-study.md index e88b0aae5..4caeeedaf 100644 --- a/.changeset/serious-games-study.md +++ b/.changeset/serious-games-study.md @@ -1,5 +1,5 @@ --- -"skuba": patch +'skuba': patch --- -template/lambda-sqs-worker: Bump up node version to 16 +template/lambda-sqs-worker\*: Bump Node.js version to 16 From 88573e41d71df32fad62808d94e24a62b684067a Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Fri, 13 May 2022 11:16:06 +1000 Subject: [PATCH 5/7] feat: bump up cdk template to 16 --- template/lambda-sqs-worker-cdk/.nvmrc | 2 +- template/lambda-sqs-worker-cdk/Dockerfile | 2 +- template/lambda-sqs-worker-cdk/infra/appStack.ts | 2 +- template/lambda-sqs-worker-cdk/package.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/.nvmrc b/template/lambda-sqs-worker-cdk/.nvmrc index 8351c1939..b6a7d89c6 100644 --- a/template/lambda-sqs-worker-cdk/.nvmrc +++ b/template/lambda-sqs-worker-cdk/.nvmrc @@ -1 +1 @@ -14 +16 diff --git a/template/lambda-sqs-worker-cdk/Dockerfile b/template/lambda-sqs-worker-cdk/Dockerfile index 6475878fa..795b13dd0 100644 --- a/template/lambda-sqs-worker-cdk/Dockerfile +++ b/template/lambda-sqs-worker-cdk/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.2 -FROM node:14-alpine AS dev-deps +FROM node:16-alpine AS dev-deps WORKDIR /workdir diff --git a/template/lambda-sqs-worker-cdk/infra/appStack.ts b/template/lambda-sqs-worker-cdk/infra/appStack.ts index a2aed78c2..35e1e27c3 100644 --- a/template/lambda-sqs-worker-cdk/infra/appStack.ts +++ b/template/lambda-sqs-worker-cdk/infra/appStack.ts @@ -52,7 +52,7 @@ export class AppStack extends Stack { const worker = new aws_lambda.Function(this, 'worker', { code: new aws_lambda.AssetCode('./lib'), - runtime: aws_lambda.Runtime.NODEJS_14_X, + runtime: aws_lambda.Runtime.NODEJS_16_X, handler: 'app.handler', functionName: '<%- serviceName %>', environmentEncryption: kmsKey, diff --git a/template/lambda-sqs-worker-cdk/package.json b/template/lambda-sqs-worker-cdk/package.json index 2768b8914..a3390fcc0 100644 --- a/template/lambda-sqs-worker-cdk/package.json +++ b/template/lambda-sqs-worker-cdk/package.json @@ -4,11 +4,11 @@ "runtypes": "^6.3.2" }, "devDependencies": { - "@aws-cdk/assert": "^2.3.0", + "@aws-cdk/assert": "^2.24.0", "@types/aws-lambda": "^8.10.82", - "@types/node": "^14.0.0", - "aws-cdk": "^2.3.0", - "aws-cdk-lib": "^2.3.0", + "@types/node": "^16.0.0", + "aws-cdk": "^2.24.0", + "aws-cdk-lib": "^2.24.0", "constructs": "^10.0.17" }, "license": "UNLICENSED", From 28e8fa119377237b05c3f6fd93e593622e607058 Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Fri, 13 May 2022 11:24:40 +1000 Subject: [PATCH 6/7] refactor: add missing skuba dependency --- template/lambda-sqs-worker-cdk/package.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/package.json b/template/lambda-sqs-worker-cdk/package.json index a3390fcc0..5bb8c066a 100644 --- a/template/lambda-sqs-worker-cdk/package.json +++ b/template/lambda-sqs-worker-cdk/package.json @@ -9,7 +9,11 @@ "@types/node": "^16.0.0", "aws-cdk": "^2.24.0", "aws-cdk-lib": "^2.24.0", - "constructs": "^10.0.17" + "constructs": "^10.0.17", + "skuba": "*" + }, + "engines": { + "node": ">=16" }, "license": "UNLICENSED", "private": true, @@ -22,11 +26,5 @@ "test": "skuba test", "test:ci": "skuba test --coverage", "test:watch": "skuba test --watch" - }, - "skuba": { - "entryPoint": "src/app.ts#handler", - "template": "lambda-sqs-worker-cdk", - "type": "application", - "version": "3.16.2" } } From 5b663952d9e533142bb9126927dd05a93c39e864 Mon Sep 17 00:00:00 2001 From: Sam Chung Date: Fri, 13 May 2022 11:25:46 +1000 Subject: [PATCH 7/7] fix: update snapshot --- .../infra/__snapshots__/appStack.test.ts.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap index fa53e2132..09da61056 100644 --- a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +++ b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap @@ -174,7 +174,7 @@ Object { "Arn", ], }, - "Runtime": "nodejs14.x", + "Runtime": "nodejs16.x", }, "Type": "AWS::Lambda::Function", }, @@ -530,7 +530,7 @@ Object { "Arn", ], }, - "Runtime": "nodejs14.x", + "Runtime": "nodejs16.x", }, "Type": "AWS::Lambda::Function", },