skuba 5.0.0 → 5.1.0

package/lib/utils/template.d.ts

@@ -1,6 +1,6 @@
 import * as t from 'runtypes';
 export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
-export declare type TemplateName = typeof TEMPLATE_NAMES[number];
+export type TemplateName = typeof TEMPLATE_NAMES[number];
 export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
 interface TemplateDocumentationConfig {
     /**
@@ -17,7 +17,7 @@ interface TemplateDocumentationConfig {
     filename: string;
 }
 export declare const TEMPLATE_DOCUMENTATION_CONFIG: Record<TemplateName, TemplateDocumentationConfig>;
-export declare type TemplateConfig = t.Static<typeof TemplateConfig>;
+export type TemplateConfig = t.Static<typeof TemplateConfig>;
 export declare const TemplateConfig: t.Record<{
     fields: t.Array<t.Record<{
         name: t.String;

package/lib/utils/version.d.ts

@@ -1,6 +1,6 @@
 export declare const latestNpmVersion: (packageName: string) => Promise<string>;
 export declare const getSkubaVersion: () => Promise<string>;
-declare type SkubaVersionInfo = {
+type SkubaVersionInfo = {
     isStale: true;
     local: string;
     latest: string;

package/lib/utils/wait.d.ts

@@ -5,7 +5,7 @@ export declare const sleep: (ms: number) => Timeout;
 export declare const throwOnTimeout: <T>(promise: PromiseLike<T>, { s }: {
     s: number;
 }) => Promise<T>;
-declare type TimeoutResult<T> = {
+type TimeoutResult<T> = {
     ok: true;
     value: T;
 } | {

package/lib/wrapper/main.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/wrapper/main.ts"],
   "sourcesContent": ["import path from 'path';\n\nimport { runFunctionHandler } from './functionHandler';\nimport { runRequestListener } from './requestListener';\n\nexport const main = async (rawEntryPoint: string, rawPort: string) => {\n  const availablePort = Number(rawPort) || undefined;\n\n  // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n  const [modulePath, functionName] = path\n    .join(process.cwd(), rawEntryPoint)\n    .split('#', 2);\n\n  // Load entry point as module\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const entryPoint = require(modulePath) as unknown;\n\n  return functionName\n    ? runFunctionHandler({ availablePort, entryPoint, functionName })\n    : runRequestListener({ availablePort, entryPoint });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ,UAAU;AAErC,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,6BAAmC;AACnC,6BAAmC;AAE5B,MAAM,OAAO,OAAO,eAAuB,YAAoB;AACpE,QAAM,gBAAgB,OAAO,OAAO,KAAK;AAGzC,QAAM,CAAC,YAAY,YAAY,IAAI,YAAAA,QAChC,KAAK,QAAQ,IAAI,GAAG,aAAa,EACjC,MAAM,KAAK,CAAC;AAIf,QAAM,aAAa,QAAQ;AAE3B,SAAO,mBACH,2CAAmB,EAAE,eAAe,YAAY,aAAa,CAAC,QAC9D,2CAAmB,EAAE,eAAe,WAAW,CAAC;AACtD;",
   "names": ["path"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -81,12 +81,12 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.15.7",
+    "esbuild": "~0.16.0",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.1.4",
+    "eslint-config-skuba": "1.2.1",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^11.0.0",
     "function-arguments": "^1.0.9",
     "get-port": "^5.1.1",
     "ignore": "^5.1.8",
@@ -101,7 +101,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "~2.7.0",
+    "prettier": "~2.8.0",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^19.0.0",
@@ -115,15 +115,15 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.8.2",
+    "typescript": "~4.9.0",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.25.2",
-    "@changesets/get-github-info": "0.5.1",
-    "@jest/reporters": "29.3.0",
+    "@changesets/cli": "2.26.0",
+    "@changesets/get-github-info": "0.5.2",
+    "@jest/reporters": "29.3.1",
     "@types/ejs": "3.1.1",
-    "@types/express": "4.17.14",
+    "@types/express": "4.17.15",
     "@types/fs-extra": "9.0.13",
     "@types/koa": "2.13.5",
     "@types/libnpmsearch": "2.0.3",
@@ -133,15 +133,15 @@
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
     "@types/validate-npm-package-name": "4.0.0",
-    "enhanced-resolve": "5.10.0",
+    "enhanced-resolve": "5.12.0",
     "express": "4.18.2",
     "jsonfile": "6.1.0",
-    "koa": "2.13.4",
-    "memfs": "3.4.10",
+    "koa": "2.14.1",
+    "memfs": "3.4.12",
     "remark-cli": "11.0.0",
     "remark-preset-lint-recommended": "6.1.2",
     "semver": "7.3.8",
-    "supertest": "6.3.1",
+    "supertest": "6.3.3",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.5.0:
+      - docker-compose#v4.9.0:
           run: app
     timeout_in_minutes: 10
 

package/template/express-rest-api/.gantry/common.yml

@@ -13,7 +13,7 @@ tags:
   # seek:data:consumers: internal
   # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
   # seek:data:types:restricted: job-ads
-  seek:env:label: '{{.Environment}}'
+  seek:env:label: '{{values "environment"}}'
   seek:env:production: '{{values "isProduction"}}'
   seek:owner:team: '<%- teamName %>'
   seek:source:sha: '{{.CommitSHA}}'

package/template/express-rest-api/.gantry/dev.yml

@@ -1,3 +1,4 @@
+environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 

package/template/express-rest-api/.gantry/prod.yml

@@ -1,3 +1,4 @@
+environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 

package/template/express-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM --platform=${BUILDPLATFORM:-arm64} gcr.io/distroless/nodejs:18 AS runtime
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs:18 AS runtime
 
 WORKDIR /workdir
 

package/template/express-rest-api/Dockerfile.dev-deps

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=${BUILDPLATFORM:-arm64} node:18-alpine AS dev-deps
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:18-alpine AS dev-deps
 
 WORKDIR /workdir
 

package/template/express-rest-api/README.md

@@ -4,24 +4,21 @@
 
 Next steps:
 
-1. [ ] Check if your team has a Graviton-based Buildkite cluster;
-       see the [ARM64 guide] for more information.
-2. [ ] Finish templating if this was skipped earlier:
+1. [ ] Finish templating if this was skipped earlier:
 
    ```shell
    yarn skuba configure
    ```
 
-3. [ ] Create a new repository in the appropriate GitHub organisation.
-4. [ ] Add the repository to BuildAgency;
+2. [ ] Create a new repository in the appropriate GitHub organisation.
+3. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-5. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
+4. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
        see the [Gantry] documentation for more information.
-6. [ ] Push local commits to the upstream GitHub branch.
-7. [ ] Configure [GitHub repository settings].
-8. [ ] Delete this checklist 😌.
+5. [ ] Push local commits to the upstream GitHub branch.
+6. [ ] Configure [GitHub repository settings].
+7. [ ] Delete this checklist 😌.
 
-[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 

package/template/express-rest-api/gantry.apply.yml

@@ -10,7 +10,7 @@ env:
   # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
   AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
 
-  ENVIRONMENT: '{{.Environment}}'
+  ENVIRONMENT: '{{values "environment"}}'
   SERVICE: '{{values "service"}}'
 
   {{range $key, $value := .Values.env}}
@@ -119,4 +119,4 @@ tags:
   {{$key}}: '{{$value}}'
   {{end}}
 
-cpuArchitecture: arm64
+cpuArchitecture: <%- platformName %>

package/template/express-rest-api/gantry.build.yml

@@ -12,4 +12,4 @@ buildArgs:
 # SEEK-Jobs/gantry#1661
 failOnScanFindings: false
 
-cpuArchitecture: arm64
+cpuArchitecture: <%- platformName %>

package/template/greeter/.buildkite/pipeline.yml

@@ -32,6 +32,6 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.5.0:
+      - docker-compose#v4.9.0:
           run: app
     timeout_in_minutes: 10

package/template/greeter/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=${BUILDPLATFORM:-arm64} node:18-alpine AS dev-deps
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:18-alpine AS dev-deps
 
 WORKDIR /workdir
 

package/template/greeter/README.md

@@ -4,22 +4,19 @@
 
 Next steps:
 
-1. [ ] Check if your team has a Graviton-based Buildkite cluster;
-       see the [ARM64 guide] for more information.
-2. [ ] Finish templating if this was skipped earlier:
+1. [ ] Finish templating if this was skipped earlier:
 
    ```shell
    yarn skuba configure
    ```
 
-3. [ ] Create a new repository in the appropriate GitHub organisation.
-4. [ ] Add the repository to BuildAgency;
+2. [ ] Create a new repository in the appropriate GitHub organisation.
+3. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-5. [ ] Push local commits to the upstream GitHub branch.
-6. [ ] Configure [GitHub repository settings].
-7. [ ] Delete this checklist 😌.
+4. [ ] Push local commits to the upstream GitHub branch.
+5. [ ] Configure [GitHub repository settings].
+6. [ ] Delete this checklist 😌.
 
-[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.5.0:
+      - docker-compose#v4.9.0:
           run: app
     timeout_in_minutes: 10
 

package/template/koa-rest-api/.gantry/common.yml

@@ -13,7 +13,7 @@ tags:
   # seek:data:consumers: internal
   # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
   # seek:data:types:restricted: job-ads
-  seek:env:label: '{{.Environment}}'
+  seek:env:label: '{{values "environment"}}'
   seek:env:production: '{{values "isProduction"}}'
   seek:owner:team: '<%- teamName %>'
   seek:source:sha: '{{.CommitSHA}}'

package/template/koa-rest-api/.gantry/dev.yml

@@ -1,3 +1,4 @@
+environment: dev
 env:
   SOME_ENVIRONMENT_VARIABLE: dev-value
 

package/template/koa-rest-api/.gantry/prod.yml

@@ -1,3 +1,4 @@
+environment: prod
 env:
   SOME_ENVIRONMENT_VARIABLE: prod-value
 

package/template/koa-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM --platform=${BUILDPLATFORM:-arm64} gcr.io/distroless/nodejs:18 AS runtime
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} gcr.io/distroless/nodejs:18 AS runtime
 
 WORKDIR /workdir
 

package/template/koa-rest-api/Dockerfile.dev-deps

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=${BUILDPLATFORM:-arm64} node:18-alpine AS dev-deps
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:18-alpine AS dev-deps
 
 WORKDIR /workdir
 

package/template/koa-rest-api/README.md

@@ -4,24 +4,21 @@
 
 Next steps:
 
-1. [ ] Check if your team has a Graviton-based Buildkite cluster;
-       see the [ARM64 guide] for more information.
-2. [ ] Finish templating if this was skipped earlier:
+1. [ ] Finish templating if this was skipped earlier:
 
    ```shell
    yarn skuba configure
    ```
 
-3. [ ] Create a new repository in the appropriate GitHub organisation.
-4. [ ] Add the repository to BuildAgency;
+2. [ ] Create a new repository in the appropriate GitHub organisation.
+3. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-5. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
+4. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
        see the [Gantry] documentation for more information.
-6. [ ] Push local commits to the upstream GitHub branch.
-7. [ ] Configure [GitHub repository settings].
-8. [ ] Delete this checklist 😌.
+5. [ ] Push local commits to the upstream GitHub branch.
+6. [ ] Configure [GitHub repository settings].
+7. [ ] Delete this checklist 😌.
 
-[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 

package/template/koa-rest-api/gantry.apply.yml

@@ -10,7 +10,7 @@ env:
   # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
   AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
 
-  ENVIRONMENT: '{{.Environment}}'
+  ENVIRONMENT: '{{values "environment"}}'
   OPENTELEMETRY_ENABLED: '{{.Values.openTelemetry.enabled | default false}}'
   SERVICE: '{{values "service"}}'
 
@@ -126,4 +126,4 @@ tags:
   {{$key}}: '{{$value}}'
   {{end}}
 
-cpuArchitecture: arm64
+cpuArchitecture: <%- platformName %>

package/template/koa-rest-api/gantry.build.yml

@@ -12,4 +12,4 @@ buildArgs:
 # SEEK-Jobs/gantry#1661
 failOnScanFindings: false
 
-cpuArchitecture: arm64
+cpuArchitecture: <%- platformName %>

package/template/koa-rest-api/package.json

@@ -16,8 +16,8 @@
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.32.0",
-    "@opentelemetry/instrumentation-http": "^0.33.0",
-    "@opentelemetry/sdk-node": "^0.33.0",
+    "@opentelemetry/instrumentation-http": "^0.34.0",
+    "@opentelemetry/sdk-node": "^0.34.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",

package/template/lambda-sqs-worker/.buildkite/pipeline.yml

@@ -26,13 +26,13 @@ configs:
         - yarn deploy
       concurrency: 1
       plugins:
-        - artifacts#v1.7.0:
+        - artifacts#v1.8.0:
             build: ${BUILDKITE_BUILD_ID}
             download: lib/*
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.5.0:
+        - docker-compose#v4.9.0:
             dependencies: false
             run: app
       retry:
@@ -60,13 +60,13 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.5.0:
+      - docker-compose#v4.9.0:
           run: app
     timeout_in_minutes: 10
 
   - agents:
       queue: <%- devBuildkiteQueueName %>
-    branches: '!renovate--*'
+    branches: '!renovate-*'
     label: 🧖‍♀️ Warm Dev
     command: ':'
     plugins:

package/template/lambda-sqs-worker/.nvmrc

@@ -1 +1 @@
-16
+18

package/template/lambda-sqs-worker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=${BUILDPLATFORM:-arm64} node:16-alpine AS dev-deps
+FROM --platform=${BUILDPLATFORM:-<%- platformName %>} node:18-alpine AS dev-deps
 
 WORKDIR /workdir
 

package/template/lambda-sqs-worker/README.md

@@ -4,23 +4,20 @@
 
 Next steps:
 
-1. [ ] Check if your team has a Graviton-based Buildkite cluster;
-       see the [ARM64 guide] for more information.
-2. [ ] Finish templating if this was skipped earlier:
+1. [ ] Finish templating if this was skipped earlier:
 
    ```shell
    yarn skuba configure
    ```
 
-3. [ ] Create a new repository in the appropriate GitHub organisation.
-4. [ ] Add the repository to BuildAgency;
+2. [ ] Create a new repository in the appropriate GitHub organisation.
+3. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-5. [ ] Add Datadog extension, deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
-6. [ ] Push local commits to the upstream GitHub branch.
-7. [ ] Configure [GitHub repository settings].
-8. [ ] Delete this checklist 😌.
+4. [ ] Add Datadog extension, deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
+5. [ ] Push local commits to the upstream GitHub branch.
+6. [ ] Configure [GitHub repository settings].
+7. [ ] Delete this checklist 😌.
 
-[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
 [builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 

package/template/lambda-sqs-worker/package.json

@@ -14,25 +14,30 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
+    "@aws-sdk/client-codedeploy": "^3.213.0",
+    "@aws-sdk/client-lambda": "^3.213.0",
+    "@aws-sdk/client-sns": "^3.213.0",
     "@seek/logger": "^5.0.1",
-    "aws-sdk": "^2.1011.0",
     "datadog-lambda-js": "^6.83.0",
+    "dd-trace": "^3.8.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
-    "@types/node": "16.11.64",
+    "@types/node": "^18.11.9",
+    "aws-sdk-client-mock": "^2.0.1",
+    "aws-sdk-client-mock-jest": "^2.0.1",
     "chance": "^1.1.8",
     "pino-pretty": "^9.0.0",
-    "serverless": "^3.17.0",
+    "serverless": "^3.25.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
-    "serverless-plugin-datadog": "^5.7.0",
+    "serverless-plugin-datadog": "^5.12.0",
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   }
 }

package/template/lambda-sqs-worker/serverless.yml

@@ -37,8 +37,8 @@ provider:
   logRetentionInDays: 30
   name: aws
   region: ap-southeast-2
-  runtime: nodejs16.x
-  architecture: arm64
+  runtime: nodejs18.x
+  architecture: <%- lambdaServerlessArchitecture %>
   deploymentMethod: direct
   stackName: ${self:service}
   stage: ${env:ENVIRONMENT}
@@ -47,8 +47,6 @@ provider:
     # This is easier to manage in terms of access, deployment, and tagging.
     name: ${param:deploymentBucket}
   environment:
-    # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-    AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1
     NODE_ENV: production
     # https://nodejs.org/api/cli.html#cli_node_options_options
     NODE_OPTIONS: --enable-source-maps

package/template/lambda-sqs-worker/src/app.test.ts

@@ -1,3 +1,5 @@
+import { PublishCommand } from '@aws-sdk/client-sns';
+
 import { metricsClient } from 'src/framework/metrics';
 import { createCtx, createSqsEvent } from 'src/testing/handler';
 import { logger } from 'src/testing/logging';
@@ -23,13 +25,10 @@ describe('handler', () => {
 
   beforeAll(logger.spy);
   beforeAll(scoringService.spy);
-  beforeAll(sns.spy);
 
   beforeEach(() => {
     scoringService.request.mockResolvedValue(score);
-    sns.publish.mockPromise(
-      Promise.resolve({ MessageId: chance.guid({ version: 4 }) }),
-    );
+    sns.publish.resolves({ MessageId: chance.guid({ version: 4 }) });
   });
 
   afterEach(() => {
@@ -59,7 +58,7 @@ describe('handler', () => {
       ['job.scored', 1],
     ]);
 
-    expect(sns.publish).toHaveBeenCalledTimes(1);
+    expect(sns.client).toReceiveCommandTimes(PublishCommand, 1);
   });
 
   it('throws on invalid input', () => {
@@ -83,7 +82,7 @@ describe('handler', () => {
   it('bubbles up SNS error', async () => {
     const err = Error(chance.sentence());
 
-    sns.publish.mockPromise(Promise.reject(err));
+    sns.publish.rejects(err);
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 

package/template/lambda-sqs-worker/src/framework/handler.test.ts

@@ -40,7 +40,7 @@ describe('createHandler', () => {
 
     await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error.mock.calls).toEqual([[{ err }, 'Function failed']]);
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
 
     expect(logger.info).not.toHaveBeenCalled();
   });
@@ -54,7 +54,7 @@ describe('createHandler', () => {
 
     await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error.mock.calls).toEqual([[{ err }, 'Function failed']]);
+    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
 
     expect(logger.info).not.toHaveBeenCalled();
   });