skuba 4.2.1 → 4.3.0

package/lib/cli/test/reporters/github/annotations.js

@@ -21,13 +21,25 @@ const strip_ansi_1 = __importDefault(require("strip-ansi"));
  *     ...
  * ```
  *
+ * or:
+ *
+ * ```console
+ * Error: expect(received).toBe(expected) // Object.is equality
+ *
+ * Expected: "a"
+ * Received: "b"
+ *     at /workdir/skuba/src/test.test.ts:2:15
+ *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)
+ *     ...
+ * ```
+ *
  * This pattern will produce the following matches:
  *
  * 1. /workdir/skuba/src/test.test.ts
  * 2. 2
  * 2. 15
  */
-const JEST_LOCATION_REGEX = /\((.+?):(\d+):(\d+)\)/;
+const JEST_LOCATION_REGEX = /\n +at (.+\()?(.+?):(\d+):(\d+)/;
 const createAnnotations = (testResults) => {
     const cwd = process.cwd();
     return testResults.flatMap((testResult) => {
@@ -44,14 +56,14 @@ const createAnnotations = (testResults) => {
         if (testResult.numFailingTests > 0) {
             return testResult.testResults.flatMap((assertionResult) => assertionResult.failureMessages.flatMap((failureMessage) => {
                 const match = JEST_LOCATION_REGEX.exec(failureMessage);
-                if (match?.length === 4) {
+                if (match?.length === 5) {
                     return {
                         annotation_level: 'failure',
-                        path: path_1.default.relative(cwd, match[1]),
-                        start_line: Number(match[2]),
-                        end_line: Number(match[2]),
-                        start_column: Number(match[3]),
-                        end_column: Number(match[3]),
+                        path: path_1.default.relative(cwd, match[2]),
+                        start_line: Number(match[3]),
+                        end_line: Number(match[3]),
+                        start_column: Number(match[4]),
+                        end_column: Number(match[4]),
                         message: (0, strip_ansi_1.default)(failureMessage),
                         title: 'Jest',
                     };

package/lib/cli/test/reporters/github/annotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":"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"}

package/lib/utils/error.d.ts

@@ -19,7 +19,7 @@ export declare const ConcurrentlyErrors: t.Array<t.Record<{
  *
  * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects
  */
-export declare const createTerseError: (message?: string | undefined) => Error & {
+export declare const createTerseError: (message?: string) => Error & {
     [inspect.custom]: () => string | undefined;
 };
 export declare const handleCliError: (err: unknown) => void;

package/lib/utils/version.d.ts

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

package/lib/utils/version.js

@@ -3,13 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSkubaVersionInfo = exports.getSkubaVersion = void 0;
-const latest_version_1 = __importDefault(require("latest-version"));
+exports.getSkubaVersionInfo = exports.getSkubaVersion = exports.latestNpmVersion = void 0;
+const package_json_1 = __importDefault(require("package-json"));
 const manifest_1 = require("./manifest");
 const wait_1 = require("./wait");
+const latestNpmVersion = async (packageName) => {
+    const { version } = await (0, package_json_1.default)(packageName);
+    if (typeof version !== 'string') {
+        throw new Error(`No version found for package "${packageName}"`);
+    }
+    return version;
+};
+exports.latestNpmVersion = latestNpmVersion;
 const latestSkubaVersion = async () => {
     try {
-        const result = await (0, wait_1.withTimeout)((0, latest_version_1.default)('skuba'), { s: 2 });
+        const result = await (0, wait_1.withTimeout)((0, exports.latestNpmVersion)('skuba'), { s: 2 });
         return result.ok ? result.value : null;
     }
     catch {

package/lib/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAE3C,yCAA8C;AAC9C,iCAAqC;AAErC,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuC;AAEvC,yCAA8C;AAC9C,iCAAqC;AAE9B,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAmB,EACF,EAAE;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,sBAAW,EAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,iCAAiC,WAAW,GAAG,CAAC,CAAC;KAClE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEF,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}

package/lib/wrapper/http.d.ts

@@ -11,4 +11,4 @@ export declare const createRequestListenerFromFunction: (fn: (...args: unknown[]
  *
  * This function resolves when the server is closed.
  */
-export declare const serveRequestListener: (requestListener: http.RequestListener, port?: number | undefined) => Promise<void>;
+export declare const serveRequestListener: (requestListener: http.RequestListener, port?: number) => Promise<void>;

package/package.json

@@ -6,9 +6,11 @@
     "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
+    "@octokit/graphql": "^4.8.0",
+    "@octokit/graphql-schema": "^10.73.0",
     "@octokit/rest": "^18.12.0",
     "@octokit/types": "^6.34.0",
-    "@types/jest": "^27.5.0",
+    "@types/jest": "^28.0.0",
     "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
@@ -16,7 +18,7 @@
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.1.0",
+    "eslint-config-skuba": "1.1.1",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -26,13 +28,14 @@
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
     "jest": "^28.1.0",
-    "latest-version": "^5.1.0",
+    "jest-watch-typeahead": "^1.1.0",
     "lodash.mergewith": "^4.6.2",
     "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
+    "package-json": "^7.0.0",
     "picomatch": "^2.2.2",
-    "prettier": "~2.6.0",
+    "prettier": "~2.7.0",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
     "semantic-release": "^19.0.0",
@@ -41,16 +44,16 @@
     "strip-ansi": "^6.0.1",
     "ts-jest": "^28.0.2",
     "ts-node": "^10.7.0",
-    "ts-node-dev": "^2.0.0-0",
+    "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.6.4"
+    "typescript": "~4.7.0"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
-    "@changesets/cli": "2.22.0",
-    "@changesets/get-github-info": "0.5.0",
-    "@jest/reporters": "28.1.0",
+    "@changesets/cli": "2.23.0",
+    "@changesets/get-github-info": "0.5.1",
+    "@jest/reporters": "28.1.1",
     "@types/ejs": "3.1.1",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
@@ -64,10 +67,10 @@
     "express": "4.18.1",
     "jsonfile": "6.1.0",
     "koa": "2.13.4",
-    "memfs": "3.4.3",
+    "memfs": "3.4.6",
     "semver": "7.3.7",
     "supertest": "6.2.3",
-    "type-fest": "2.12.2"
+    "type-fest": "2.13.1"
   },
   "engines": {
     "node": ">=14.18"
@@ -123,5 +126,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.2.1"
+  "version": "4.3.0"
 }

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

@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM gcr.io/distroless/nodejs:16 AS runtime
+FROM --platform=arm64 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:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -4,17 +4,17 @@
 
 Next steps:
 
-1. [ ] Finish templating if this was skipped earlier:
+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:
 
    ```shell
    yarn skuba configure
    ```
 
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
+3. [ ] Create a new repository in the appropriate GitHub organisation.
+4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-4. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
 5. [ ] 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.
@@ -23,6 +23,12 @@ Next steps:
        request installation in [SEEK-Jobs/renovate].
 9. [ ] Delete this checklist 😌.
 
+[arm64]: 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
+[renovate]: https://github.com/apps/renovate
+[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
+
 ## Design
 
 <%-repoName %> is a Node.js HTTP server built in line with our [technology strategy].
@@ -101,12 +107,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
-[codex]: https://codex.ssod.skinfra.xyz/docs
 [express]: https://expressjs.com
 [gantry]: https://gantry.ssod.skinfra.xyz
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -118,3 +118,5 @@ tags:
   {{range $key, $value := .Values.tags}}
   {{$key}}: '{{$value}}'
   {{end}}
+
+cpuArchitecture: arm64

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

@@ -11,3 +11,5 @@ buildArgs:
 
 # SEEK-Jobs/gantry#1661
 failOnScanFindings: false
+
+cpuArchitecture: arm64

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

@@ -8,7 +8,7 @@
     "@types/express": "^4.17.13",
     "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/greeter/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

package/template/greeter/README.md

@@ -4,23 +4,29 @@
 
 Next steps:
 
-1. [ ] Finish templating if this was skipped earlier:
+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:
 
    ```shell
    yarn skuba configure
    ```
 
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
+3. [ ] Create a new repository in the appropriate GitHub organisation.
+4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-4. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
 5. [ ] Push local commits to the upstream GitHub branch.
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Keep dependencies up to date with [Renovate];
        request installation in [SEEK-Jobs/renovate].
 8. [ ] Delete this checklist 😌.
 
+[arm64]: 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
+[renovate]: https://github.com/apps/renovate
+[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
+
 ## Design
 
 The `greeter` template is the prototypical _hello world_ project.
@@ -94,9 +100,4 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
-[codex]: https://codex.ssod.skinfra.xyz/docs
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn build
 
 ###
 
-FROM gcr.io/distroless/nodejs:16 AS runtime
+FROM --platform=arm64 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:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -4,17 +4,17 @@
 
 Next steps:
 
-1. [ ] Finish templating if this was skipped earlier:
+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:
 
    ```shell
    yarn skuba configure
    ```
 
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
+3. [ ] Create a new repository in the appropriate GitHub organisation.
+4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-4. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
 5. [ ] 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.
@@ -23,6 +23,12 @@ Next steps:
        request installation in [SEEK-Jobs/renovate].
 9. [ ] Delete this checklist 😌.
 
+[arm64]: 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
+[renovate]: https://github.com/apps/renovate
+[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
+
 ## Design
 
 <%-repoName %> is a Node.js HTTP server built in line with our [technology strategy].
@@ -106,12 +112,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
-[codex]: https://codex.ssod.skinfra.xyz/docs
 [gantry]: https://gantry.ssod.skinfra.xyz
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 [koa]: https://koajs.com
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -125,3 +125,5 @@ tags:
   {{range $key, $value := .Values.tags}}
   {{$key}}: '{{$value}}'
   {{end}}
+
+cpuArchitecture: arm64

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

@@ -11,3 +11,5 @@ buildArgs:
 
 # SEEK-Jobs/gantry#1661
 failOnScanFindings: false
+
+cpuArchitecture: arm64

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

@@ -3,9 +3,9 @@
     "@koa/router": "^10.1.1",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.7.0",
-    "@opentelemetry/instrumentation-http": "^0.28.0",
-    "@opentelemetry/sdk-node": "^0.28.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.8.0",
+    "@opentelemetry/instrumentation-http": "^0.29.2",
+    "@opentelemetry/sdk-node": "^0.29.2",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",
@@ -15,7 +15,7 @@
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
-    "seek-koala": "^5.2.0",
+    "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
     "uuid": "^8.3.2"
   },
@@ -28,7 +28,7 @@
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/lambda-sqs-worker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -4,17 +4,17 @@
 
 Next steps:
 
-1. [ ] Finish templating if this was skipped earlier:
+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:
 
    ```shell
    yarn skuba configure
    ```
 
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
+3. [ ] Create a new repository in the appropriate GitHub organisation.
+4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-4. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
 5. [ ] Add 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].
@@ -22,6 +22,12 @@ Next steps:
        request installation in [SEEK-Jobs/renovate].
 9. [ ] Delete this checklist 😌.
 
+[arm64]: 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
+[renovate]: https://github.com/apps/renovate
+[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
+
 ## Design
 
 <%-repoName %> is a Node.js [Lambda] application built in line with our [technology strategy].
@@ -127,12 +133,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
-[codex]: https://codex.ssod.skinfra.xyz/docs
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 [lambda]: https://docs.aws.amazon.com/lambda
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [serverless]: https://www.serverless.com/
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -12,7 +12,7 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^16.0.0",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "serverless": "^3.17.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
     "serverless-prune-plugin": "^2.0.0",

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

@@ -18,7 +18,7 @@ export const logger = createLogger({
 
   level: config.logLevel,
 
-  mixin: () => loggerContext.getStore() ?? {},
+  mixin: () => ({ ...loggerContext.getStore() }),
 
   name: config.name,
 

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

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -146,6 +146,9 @@ Object {
         "workerServiceRole2130CC7F",
       ],
       "Properties": Object {
+        "Architectures": Array [
+          "arm64",
+        ],
         "Code": Object {
           "S3Bucket": Object {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
@@ -502,6 +505,9 @@ Object {
         "workerServiceRole2130CC7F",
       ],
       "Properties": Object {
+        "Architectures": Array [
+          "arm64",
+        ],
         "Code": Object {
           "S3Bucket": Object {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",

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

@@ -51,6 +51,7 @@ export class AppStack extends Stack {
     });
 
     const worker = new aws_lambda.Function(this, 'worker', {
+      architecture: aws_lambda.Architecture.ARM_64,
       code: new aws_lambda.AssetCode('./lib'),
       runtime: aws_lambda.Runtime.NODEJS_16_X,
       handler: 'app.handler',