skuba 10.0.0-node-22-20250115223210 → 10.0.0-node-22-20250213035014

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

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.13
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

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

@@ -14,22 +14,22 @@
   },
   "dependencies": {
     "@seek/logger": "^9.0.0",
-    "express": "^4.17.1",
+    "express": "^5.0.0",
     "hot-shots": "^10.0.0",
     "seek-datadog-custom-metrics": "^4.6.3",
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.1",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@9.15.4",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/greeter/Dockerfile

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.13
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/greeter/README.md

@@ -69,7 +69,7 @@ It does not assume a deployment method or environment.
 For inspiration in this space, check out:
 
 - The `koa-rest-api` template for containerised deployments
-- The `lambda-sqs-worker` template for Lambda deployments
+- The `lambda-sqs-worker-cdk` template for Lambda deployments
 
 ## Support
 

package/template/greeter/package.json

@@ -16,11 +16,11 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.9.0",
-    "skuba": "10.0.0-node-22-20250115223210"
+    "@types/node": "^22.13.1",
+    "skuba": "10.0.0-node-22-20250213035014"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@9.15.4",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -70,7 +70,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -87,7 +87,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -102,7 +102,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

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

@@ -9,6 +9,5 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
-  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

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

@@ -1 +1 @@
-20
+22

package/template/koa-rest-api/Dockerfile

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 
 ###
 
-FROM gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs22-debian12 AS runtime
 
 WORKDIR /workdir
 

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.13
 
 FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 

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

@@ -36,7 +36,7 @@
     "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.1",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
@@ -44,8 +44,8 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@9.15.4",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -5,13 +5,13 @@
       // open-telemetry/opentelemetry-js#3580
       "DOM",
 
-      "ES2022"
+      "ES2024"
     ],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

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

@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.5.0:
+        - docker-compose#v5.6.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1 +1 @@
-20
+22

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,9 +1,9 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.13
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 # Needed for cdk
-RUN apk add --no-cache bash
+RUN apk add --no-cache bash git
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -227,7 +227,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs20.x",
+        "Runtime": "nodejs22.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -953,7 +953,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs20.x",
+        "Runtime": "nodejs22.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -80,7 +80,7 @@ export class AppStack extends Stack {
 
     const worker = new aws_lambda_nodejs.NodejsFunction(this, 'worker', {
       architecture: aws_lambda.Architecture[architecture],
-      runtime: aws_lambda.Runtime.NODEJS_20_X,
+      runtime: aws_lambda.Runtime.NODEJS_22_X,
       environmentEncryption: kmsKey,
       // aws-sdk-v3 sets this to true by default, so it is not necessary to set the environment variable
       // https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/node-reusing-connections.html
@@ -89,7 +89,7 @@ export class AppStack extends Stack {
       timeout: Duration.seconds(30),
       bundling: {
         sourceMap: true,
-        target: 'node20',
+        target: 'node22',
         // aws-sdk-v3 is set as an external module by default, but we want it to be bundled with the function
         externalModules: [],
         nodeModules: ['datadog-lambda-js', 'dd-trace'],

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -4,7 +4,7 @@ const ENVIRONMENTS = ['dev', 'prod'] as const;
 
 type Environment = (typeof ENVIRONMENTS)[number];
 
-export const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
+const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
 
 interface Config {
   appName: string;

package/template/lambda-sqs-worker-cdk/infra/index.ts

@@ -2,17 +2,15 @@ import { HookStack } from '@seek/aws-codedeploy-infra';
 import { App } from 'aws-cdk-lib';
 
 import { AppStack } from './appStack';
-import { config, environment } from './config';
+import { config } from './config';
 
 const app = new App();
 
 const appStack = new AppStack(app, 'appStack', {
   stackName: config.appName,
   tags: {
-    'seek:env:label': environment,
-    'seek:source:sha': process.env.BUILDKITE_COMMIT ?? 'na',
-    // 'seek:source:url': 'TODO: add source URL',
-    // 'seek:system:name': 'TODO: add system name',
+    'seek:source:url': 'https://github.com/SEEK-Jobs/<%- repoName %>',
+    // 'seek:system:name': 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema',
   },
 });
 

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

@@ -27,7 +27,7 @@
     "@seek/aws-codedeploy-infra": "^2.1.0",
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.1",
     "aws-cdk": "^2.167.1",
     "aws-cdk-lib": "^2.167.1",
     "aws-sdk-client-mock": "^4.0.0",
@@ -36,10 +36,10 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^1.18.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "10.0.0-node-22-20250115223210"
+    "skuba": "10.0.0-node-22-20250213035014"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@9.15.4",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "lib": ["ES2022"],
+    "lib": ["ES2024"],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

package/template/oss-npm-package/.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: ^22.14
 
       - name: Set up pnpm
         run: corepack enable pnpm && corepack install

package/template/oss-npm-package/.github/workflows/validate.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: ^22.14
 
       - name: Set up pnpm
         run: corepack enable pnpm && corepack install

package/template/oss-npm-package/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/oss-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.1",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },

package/template/private-npm-package/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/private-npm-package/_package.json

@@ -34,12 +34,12 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.1",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },
   "packageManager": "pnpm@8.15.1",
   "engines": {
-    "node": ">=18.12"
+    "node": ">=22"
   }
 }

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

@@ -1,108 +0,0 @@
-agents:
-  queue: <%- prodBuildkiteQueueName %>
-
-configs:
-  plugins:
-    - &aws-sm
-      seek-oss/aws-sm#v2.3.2:
-        env:
-          NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
-
-    - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
-        cache-on:
-          - .npmrc
-          - package.json#.packageManager
-          - pnpm-lock.yaml
-        secrets: id=npm,src=/tmp/.npmrc
-
-    - &private-npm
-      seek-oss/private-npm#v1.3.0:
-        env: NPM_READ_TOKEN
-        output-path: /tmp/
-
-  base-steps:
-    - &deploy
-      commands:
-        - echo '--- pnpm install --offline'
-        - pnpm install --offline
-        - echo '+++ pnpm run deploy'
-        - pnpm run deploy
-      concurrency: 1
-      plugins:
-        - artifacts#v1.9.4:
-            build: ${BUILDKITE_BUILD_ID}
-            download: lib/*
-        - *aws-sm
-        - *private-npm
-        - *docker-ecr-cache
-        - docker-compose#v5.5.0:
-            dependencies: false
-            run: app
-            propagate-environment: true
-      retry:
-        manual:
-          # Only use this if you need to roll back a deployment ASAP.
-          # Always follow up with a proper revert or fix in Git history.
-          permit_on_passed: true
-
-env:
-  VERSION: ${BUILDKITE_COMMIT:0:7}.${BUILDKITE_BUILD_NUMBER}
-
-steps:
-  - label: 🧪 Test, Lint & Build
-    artifact_paths: lib/**/*
-    commands:
-      - echo '--- pnpm install --offline'
-      - pnpm install --offline
-      - echo '+++ pnpm test:ci'
-      - pnpm test:ci
-      - echo '--- pnpm lint'
-      - pnpm lint
-      - echo '--- pnpm build'
-      - pnpm build
-    env:
-      GET_GITHUB_TOKEN: please
-    plugins:
-      - *aws-sm
-      - *private-npm
-      - *docker-ecr-cache
-      - docker-compose#v5.5.0:
-          run: app
-          environment:
-            - GITHUB_API_TOKEN
-          propagate-environment: true
-    timeout_in_minutes: 10
-
-  - agents:
-      queue: <%- devBuildkiteQueueName %>
-    branches: '!renovate-*'
-    label: 🧖‍♀️ Warm Dev
-    command: ':'
-    plugins:
-      - *aws-sm
-      - *private-npm
-      - seek-oss/docker-ecr-cache#v2.2.1:
-          <<: *docker-ecr-cache-defaults
-          skip-pull-from-cache: true
-
-  - wait
-  - block: 🙋🏻‍♀️ Deploy Dev
-    branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-
-  - <<: *deploy
-    agents:
-      queue: <%- devBuildkiteQueueName %>
-    env:
-      ENVIRONMENT: dev
-    concurrency_group: <%- repoName %>/deploy/dev
-    label: 🤞 Deploy Dev
-
-  - wait
-
-  - <<: *deploy
-    env:
-      ENVIRONMENT: prod
-    branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
-    concurrency_group: <%- repoName %>/deploy/prod
-    label: 🚀 Deploy Prod

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

@@ -1 +0,0 @@
-ENVIRONMENT=local

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

@@ -1 +0,0 @@
-20

package/template/lambda-sqs-worker/Dockerfile

@@ -1,17 +0,0 @@
-# syntax=docker/dockerfile:1.12
-
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
-
-RUN --mount=type=bind,source=package.json,target=package.json \
-    corepack enable pnpm && corepack install
-
-RUN --mount=type=bind,source=package.json,target=package.json \
-    pnpm config set store-dir /root/.pnpm-store
-
-WORKDIR /workdir
-
-RUN --mount=type=bind,source=.npmrc,target=.npmrc \
-    --mount=type=bind,source=package.json,target=package.json \
-    --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
-    pnpm fetch

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

@@ -1,132 +0,0 @@
-# <%- repoName %>
-
-[![Powered by skuba](https://img.shields.io/badge/🤿%20skuba-powered-009DC4)](https://github.com/seek-oss/skuba)
-
-Next steps:
-
-1. [ ] Finish templating if this was skipped earlier:
-
-   ```shell
-   pnpm exec skuba configure
-   ```
-
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
-       see our internal [Buildkite Docs] for more information.
-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 😌.
-
-[Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
-[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-
-## Design
-
-<%-repoName %> is a Node.js [Lambda] application built in line with our [Technical Guidelines].
-It is backed by a typical SQS message + dead letter queue configuration and uses common SEEK packages.
-Workers enable fault-tolerant asynchronous processing of events.
-
-The `lambda-sqs-worker` template is modelled after a hypothetical enricher that scores job advertisements.
-It's stubbed out with in-memory [scoring service](src/services/jobScorer.ts).
-This would be replaced with internal logic or an external service in production.
-
-This project is deployed with [Serverless].
-The Lambda runtime provisions a single Node.js process per container.
-The supplied [serverless.yml](serverless.yml) starts out with a minimal `memorySize` which may require tuning based on workload.
-Under load, we autoscale horizontally in terms of container count up to `reservedConcurrency`.
-
-Serverless configures [CodeDeploy] for a blue-green deployment approach.
-A smoke test is run against the new version before traffic is switched over,
-providing an opportunity to test access and connectivity to online dependencies.
-This defaults to an invocation with an empty object `{}`, per [src/hooks.ts](src/hooks.ts).
-
-## Development
-
-### Test
-
-```shell
-# Run Jest tests locally
-pnpm test
-
-# Authenticate to dev account
-awsauth
-
-# Run smoke test against deployed application
-ENVIRONMENT=dev pnpm smoke
-```
-
-### Lint
-
-```shell
-# Fix issues
-pnpm format
-
-# Check for issues
-pnpm lint
-```
-
-### Start
-
-```shell
-# Start a local HTTP server
-pnpm start
-
-# Start with Node.js Inspector enabled
-pnpm start:debug
-```
-
-This serves the Lambda application over HTTP.
-For example, to invoke the handler with an empty object `{}` for smoke testing:
-
-```shell
-curl --data '[{}, {"awsRequestId": "local"}]' --include localhost:<%- port %>
-```
-
-### Deploy
-
-This project is deployed through a [Buildkite pipeline](.buildkite/pipeline.yml).
-
-- Commits to a feature branch can be deployed to the dev environment by unblocking a step in the Buildkite UI
-- Commits to the default branch are automatically deployed to the dev and prod environments in sequence
-
-To deploy locally:
-
-```shell
-# Authenticate to dev account
-awsauth
-
-ENVIRONMENT=dev pnpm run deploy
-```
-
-To rapidly roll back a change,
-retry an individual deployment step from the previous build in Buildkite.
-Note that this will introduce drift between the head of the default Git branch and the live environment;
-use with caution and always follow up with a proper revert or fix in Git history.
-
-## Support
-
-### Dev
-
-TODO: add support links for the dev environment.
-
-<!--
-- CloudWatch dashboard
-- Datadog dashboard
-- Splunk logs
--->
-
-### Prod
-
-TODO: add support links for the prod environment.
-
-<!--
-- CloudWatch dashboard
-- Datadog dashboard
-- Splunk logs
--->
-
-[CodeDeploy]: https://docs.aws.amazon.com/codedeploy
-[Lambda]: https://docs.aws.amazon.com/lambda
-[Serverless]: https://www.serverless.com/
-[Technical Guidelines]: https://myseek.atlassian.net/wiki/spaces/AA/pages/2358346017/