skuba 3.15.2 → 3.16.2

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=12"
   },
-  "version": "3.15.2",
+  "version": "3.16.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -39,7 +39,7 @@
     "url": "https://github.com/seek-oss/skuba.git"
   },
   "devDependencies": {
-    "@changesets/cli": "2.17.0",
+    "@changesets/cli": "2.18.0",
     "@changesets/get-github-info": "0.5.0",
     "@types/concurrently": "6.3.0",
     "@types/ejs": "3.1.0",
@@ -52,19 +52,22 @@
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.11",
     "express": "4.17.1",
-    "koa": "2.13.3",
+    "jsonfile": "6.1.0",
+    "koa": "2.13.4",
     "semver": "7.3.5",
     "supertest": "6.1.6",
-    "type-fest": "2.3.4"
+    "type-fest": "2.5.2"
   },
   "dependencies": {
+    "@octokit/rest": "^18.12.0",
+    "@octokit/types": "^6.34.0",
     "@types/jest": "^27.0.1",
     "chalk": "^4.1.0",
     "concurrently": "^6.2.1",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^7.27.0",
-    "eslint-config-skuba": "1.0.11",
+    "eslint-config-skuba": "1.0.12",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -81,17 +84,18 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "2.4.1",
+    "prettier": "~2.4.1",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^17.4.7",
     "serialize-error": "^8.0.1",
     "source-map-support": "^0.5.19",
+    "strip-ansi": "^6.0.1",
     "ts-jest": "^27.0.5",
     "ts-node": "^9.1.1",
-    "ts-node-dev": "1.1.8",
+    "ts-node-dev": "^1.1.8",
     "tsconfig-seek": "1.0.2",
-    "typescript": "4.4.3"
+    "typescript": "~4.4.4"
   },
   "peerDependencies": {
     "skuba-dive": "1"
@@ -100,5 +104,8 @@
     "skuba-dive": {
       "optional": true
     }
+  },
+  "resolutions": {
+    "semantic-release/@semantic-release/npm/npm/**/ansi-regex": "5.0.1"
   }
 }

package/template/base/_.gitignore

@@ -12,6 +12,7 @@ node_modules*/
 /tmp*/
 
 .DS_Store
+.eslintcache
 .npmrc
 *.tgz
 *.tsbuildinfo

package/template/base/_.prettierignore

@@ -10,6 +10,8 @@ node_modules*/
 /tmp*/
 
 # Gantry resource files support non-standard template syntax
+/.gantry/**/*.yaml
+/.gantry/**/*.yml
 gantry*.yaml
 gantry*.yml
 # end managed by skuba

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.8.0:
+      - docker-compose#v3.9.0:
           run: app
 
   - <<: *prod
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -83,7 +83,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -99,7 +99,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

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

@@ -1 +1 @@
-14
+16

package/template/express-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM gcr.io/distroless/nodejs:14 AS runtime
+FROM gcr.io/distroless/nodejs:16 AS runtime
 
 WORKDIR /workdir
 

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

@@ -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
 

package/template/express-rest-api/docker-compose.yml

@@ -2,12 +2,14 @@ version: '3.7'
 
 services:
   app:
-    env:
-      # Enable Buildkite annotation support.
+    environment:
+      # Enable Buildkite + GitHub annotation support.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - BUILDKITE_STEP_ID
+      - GITHUB_API_TOKEN
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

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

@@ -1,19 +1,19 @@
 {
   "dependencies": {
-    "@seek/logger": "^4.4.7",
+    "@seek/logger": "^5.0.1",
     "express": "^4.17.1",
     "skuba-dive": "^1.2.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^14.17.9",
+    "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
-    "pino-pretty": "^6.0.0",
+    "pino-pretty": "^7.1.0",
     "skuba": "*",
-    "supertest": "^6.1.4"
+    "supertest": "^6.1.6"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "license": "UNLICENSED",
   "private": true,

package/template/express-rest-api/src/framework/logging.ts

@@ -12,5 +12,6 @@ export const rootLogger = createLogger({
 
   name: config.name,
 
-  prettyPrint: config.environment === 'local',
+  transport:
+    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
 });

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

@@ -35,5 +35,5 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.8.0:
+      - docker-compose#v3.9.0:
           run: app

package/template/greeter/.nvmrc

@@ -1 +1 @@
-14
+16

package/template/greeter/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
 

package/template/greeter/docker-compose.yml

@@ -2,12 +2,14 @@ version: '3.7'
 
 services:
   app:
-    env:
-      # Enable Buildkite annotation support.
+    environment:
+      # Enable Buildkite + GitHub annotation support.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - BUILDKITE_STEP_ID
+      - GITHUB_API_TOKEN
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

package/template/greeter/package.json

@@ -3,11 +3,11 @@
     "skuba-dive": "^1.2.0"
   },
   "devDependencies": {
-    "@types/node": "^14.17.9",
+    "@types/node": "^16.0.0",
     "skuba": "*"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "license": "UNLICENSED",
   "private": true,

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.8.0:
+      - docker-compose#v3.9.0:
           run: app
 
   - <<: *prod
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -83,7 +83,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -99,7 +99,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.1:
+      - seek-jobs/gantry#v1.5.2:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

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

@@ -1 +1 @@
-14
+16

package/template/koa-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM gcr.io/distroless/nodejs:14 AS runtime
+FROM gcr.io/distroless/nodejs:16 AS runtime
 
 WORKDIR /workdir
 

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

@@ -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
 

package/template/koa-rest-api/docker-compose.yml

@@ -2,12 +2,14 @@ version: '3.7'
 
 services:
   app:
-    env:
-      # Enable Buildkite annotation support.
+    environment:
+      # Enable Buildkite + GitHub annotation support.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - BUILDKITE_STEP_ID
+      - GITHUB_API_TOKEN
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}
     init: true
     volumes:

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

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "@koa/router": "^10.1.0",
-    "@seek/logger": "^4.4.7",
+    "@koa/router": "^10.1.1",
+    "@seek/logger": "^5.0.1",
     "skuba-dive": "^1.2.0",
-    "hot-shots": "^8.5.0",
-    "koa": "^2.13.1",
+    "hot-shots": "^9.0.0",
+    "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.2.0",
-    "runtypes": "^6.3.2",
+    "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
     "seek-koala": "^5.1.0",
@@ -17,17 +17,17 @@
     "@types/chance": "^1.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^5.0.2",
-    "@types/koa__router": "^8.0.7",
-    "@types/node": "^14.17.9",
+    "@types/koa__router": "^8.0.8",
+    "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
-    "chance": "^1.1.7",
-    "pino-pretty": "^6.0.0",
+    "chance": "^1.1.8",
+    "pino-pretty": "^7.1.0",
     "skuba": "*",
-    "supertest": "^6.1.4"
+    "supertest": "^6.1.6"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "license": "UNLICENSED",
   "private": true,

package/template/koa-rest-api/src/framework/logging.ts

@@ -14,7 +14,8 @@ export const rootLogger = createLogger({
 
   name: config.name,
 
-  prettyPrint: config.environment === 'local',
+  transport:
+    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
 });
 
 export const contextLogger = (ctx: Context) =>

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

@@ -45,7 +45,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v3.8.0:
+        - docker-compose#v3.9.0:
             dependencies: false
             run: app
       retry:
@@ -69,7 +69,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.8.0:
+      - docker-compose#v3.9.0:
           run: app
 
   - <<: *dev

package/template/lambda-sqs-worker/docker-compose.yml

@@ -3,11 +3,13 @@ version: '3.7'
 services:
   app:
     environment:
-      # Enable Buildkite annotation support.
+      # Enable Buildkite + GitHub annotation support.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - BUILDKITE_STEP_ID
+      - GITHUB_API_TOKEN
       # Tag AWS resources with the commit hash.
       - BUILDKITE_COMMIT
       # Pass through application configuration.

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

@@ -1,21 +1,21 @@
 {
   "dependencies": {
-    "@seek/logger": "^4.4.7",
-    "aws-sdk": "^2.965.0",
+    "@seek/logger": "^5.0.1",
+    "aws-sdk": "^2.1011.0",
     "seek-datadog-custom-metrics": "^4.0.0",
     "skuba-dive": "^1.2.0",
-    "runtypes": "^6.3.2",
+    "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0"
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.82",
+    "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
-    "@types/node": "^14.17.9",
-    "chance": "^1.1.7",
-    "pino-pretty": "^6.0.0",
-    "serverless": "^2.53.1",
+    "@types/node": "^14.0.0",
+    "chance": "^1.1.8",
+    "pino-pretty": "^7.1.0",
+    "serverless": "^2.63.0",
     "serverless-plugin-canary-deployments": "^0.7.0",
-    "serverless-prune-plugin": "^1.5.1",
+    "serverless-prune-plugin": "^1.6.1",
     "skuba": "*"
   },
   "engines": {

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

@@ -27,6 +27,7 @@ provider:
   name: aws
   region: ap-southeast-2
   runtime: nodejs14.x
+  architecture: arm64
   stackName: ${self:service}
   stage: ${env:ENVIRONMENT}
   versionFunctions: true

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

@@ -1,10 +1,10 @@
-import { pino } from '@seek/logger';
+import { Logger } from '@seek/logger';
 import { Context } from 'aws-lambda';
 
 import { contextLogger } from 'src/framework/logging';
 
 export const createHandler = <Event, Output = unknown>(
-  fn: (event: Event, ctx: { logger: pino.Logger }) => Promise<Output>,
+  fn: (event: Event, ctx: { logger: Logger }) => Promise<Output>,
 ) =>
   async function lambdaHandler(event: Event, ctx: Context) {
     const logger = contextLogger(ctx);

package/template/lambda-sqs-worker/src/framework/logging.ts

@@ -13,7 +13,8 @@ export const rootLogger = createLogger({
 
   name: config.name,
 
-  prettyPrint: config.environment === 'local',
+  transport:
+    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
 });
 
 /* istanbul ignore next: @seek/logger interface */

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

@@ -42,7 +42,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v3.8.0:
+        - docker-compose#v3.9.0:
             dependencies: false
             run: app
       retry:
@@ -66,7 +66,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.8.0:
+      - docker-compose#v3.9.0:
           run: app
 
   - <<: *dev

package/template/lambda-sqs-worker-cdk/docker-compose.yml

@@ -3,11 +3,13 @@ version: '3.7'
 services:
   app:
     environment:
-      # Enable Buildkite annotation support.
+      # Enable Buildkite + GitHub annotation support.
       - BUILDKITE
       - BUILDKITE_AGENT_ACCESS_TOKEN
+      - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - BUILDKITE_STEP_ID
+      - GITHUB_API_TOKEN
       # Tag AWS resources with the commit hash.
       - BUILDKITE_COMMIT
       # Pass through application configuration.

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

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@seek/logger": "^4.4.7",
+    "@seek/logger": "^5.0.1",
     "runtypes": "^6.3.2"
   },
   "devDependencies": {
@@ -14,7 +14,7 @@
     "@aws-cdk/aws-sqs": "^1.118.0",
     "@aws-cdk/core": "^1.118.0",
     "@types/aws-lambda": "^8.10.82",
-    "@types/node": "^14.17.9",
+    "@types/node": "^14.0.0",
     "aws-cdk": "^1.118.0",
     "skuba": "*"
   },

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

@@ -19,10 +19,10 @@ jobs:
           fetch-depth: 0
           lfs: true
 
-      - name: Set up Node.js 14.x
+      - name: Set up Node.js 16.x
         uses: actions/setup-node@master
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile

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

@@ -16,10 +16,10 @@ jobs:
         with:
           lfs: true
 
-      - name: Set up Node.js 14.x
+      - name: Set up Node.js 16.x
         uses: actions/setup-node@master
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile

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

@@ -1 +1 @@
-14
+16

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

@@ -2,7 +2,7 @@
   "dependencies": {},
   "description": "<%- description %>",
   "devDependencies": {
-    "@types/node": "^14.17.9",
+    "@types/node": "^16.0.0",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },

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

@@ -1 +1 @@
-14
+16

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

@@ -2,7 +2,7 @@
   "dependencies": {},
   "description": "<%- description %>",
   "devDependencies": {
-    "@types/node": "^14.17.9",
+    "@types/node": "^16.0.0",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },