skuba 5.0.1 → 5.1.1

package/lib/cli/init/types.d.ts

@@ -1,15 +1,16 @@
 import * as t from 'runtypes';
-export declare type InitConfigInput = t.Static<typeof InitConfigInput>;
+export type InitConfigInput = t.Static<typeof InitConfigInput>;
 export declare const InitConfigInput: t.Record<{
     destinationDir: t.String;
     templateComplete: t.Boolean;
     templateData: t.Intersect<[t.Record<{
         ownerName: t.String;
         repoName: t.String;
+        platformName: t.Union<[t.Literal<"amd64">, t.Literal<"arm64">]>;
     }, false>, t.Dictionary<t.String, string>]>;
     templateName: t.String;
 }, false>;
-export declare type InitConfig = t.Static<typeof InitConfig>;
+export type InitConfig = t.Static<typeof InitConfig>;
 declare const InitConfig: t.Record<{
     templateData: t.Intersect<[t.Record<{
         ownerName: t.String;

package/lib/cli/init/types.js

@@ -34,7 +34,8 @@ const INIT_CONFIG_INPUT_FIELDS = {
   templateComplete: t.Boolean,
   templateData: t.Record({
     ownerName: t.String,
-    repoName: t.String
+    repoName: t.String,
+    platformName: t.Union(t.Literal("amd64"), t.Literal("arm64"))
   }).And(t.Dictionary(t.String, t.String)),
   templateName: t.String
 };

package/lib/cli/init/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/types.ts"],
-  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport * as t from 'runtypes';\n\nimport { ProjectType } from '../../utils/manifest';\n\nconst INIT_CONFIG_INPUT_FIELDS = {\n  destinationDir: t.String,\n  templateComplete: t.Boolean,\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n    })\n    .And(t.Dictionary(t.String, t.String)),\n  templateName: t.String,\n};\n\nexport type InitConfigInput = t.Static<typeof InitConfigInput>;\n\nexport const InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);\n\nexport type InitConfig = t.Static<typeof InitConfig>;\n\nconst InitConfig = t.Record({\n  ...INIT_CONFIG_INPUT_FIELDS,\n\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n\n      // Derived from ownerName\n      orgName: t.String,\n      teamName: t.String,\n\n      // Generated by init command\n      port: t.String,\n    })\n    .And(t.Dictionary(t.String, t.String)),\n\n  entryPoint: t.String.optional(),\n  type: ProjectType.optional(),\n});\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,QAAmB;AAEnB,sBAA4B;AAE5B,MAAM,2BAA2B;AAAA,EAC/B,gBAAgB,EAAE;AAAA,EAClB,kBAAkB,EAAE;AAAA,EACpB,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA,EACd,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EACvC,cAAc,EAAE;AAClB;AAIO,MAAM,kBAAkB,EAAE,OAAO,wBAAwB;AAIhE,MAAM,aAAa,EAAE,OAAO;AAAA,EAC1B,GAAG;AAAA,EAEH,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA,IAGZ,SAAS,EAAE;AAAA,IACX,UAAU,EAAE;AAAA,IAGZ,MAAM,EAAE;AAAA,EACV,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EAEvC,YAAY,EAAE,OAAO,SAAS;AAAA,EAC9B,MAAM,4BAAY,SAAS;AAC7B,CAAC;",
+  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport * as t from 'runtypes';\n\nimport { ProjectType } from '../../utils/manifest';\n\nconst INIT_CONFIG_INPUT_FIELDS = {\n  destinationDir: t.String,\n  templateComplete: t.Boolean,\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n      platformName: t.Union(t.Literal('amd64'), t.Literal('arm64')),\n    })\n    .And(t.Dictionary(t.String, t.String)),\n  templateName: t.String,\n};\n\nexport type InitConfigInput = t.Static<typeof InitConfigInput>;\n\nexport const InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);\n\nexport type InitConfig = t.Static<typeof InitConfig>;\n\nconst InitConfig = t.Record({\n  ...INIT_CONFIG_INPUT_FIELDS,\n\n  templateData: t\n    .Record({\n      ownerName: t.String,\n      repoName: t.String,\n\n      // Derived from ownerName\n      orgName: t.String,\n      teamName: t.String,\n\n      // Generated by init command\n      port: t.String,\n    })\n    .And(t.Dictionary(t.String, t.String)),\n\n  entryPoint: t.String.optional(),\n  type: ProjectType.optional(),\n});\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,QAAmB;AAEnB,sBAA4B;AAE5B,MAAM,2BAA2B;AAAA,EAC/B,gBAAgB,EAAE;AAAA,EAClB,kBAAkB,EAAE;AAAA,EACpB,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA,IACZ,cAAc,EAAE,MAAM,EAAE,QAAQ,OAAO,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,EAC9D,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EACvC,cAAc,EAAE;AAClB;AAIO,MAAM,kBAAkB,EAAE,OAAO,wBAAwB;AAIhE,MAAM,aAAa,EAAE,OAAO;AAAA,EAC1B,GAAG;AAAA,EAEH,cAAc,EACX,OAAO;AAAA,IACN,WAAW,EAAE;AAAA,IACb,UAAU,EAAE;AAAA,IAGZ,SAAS,EAAE;AAAA,IACX,UAAU,EAAE;AAAA,IAGZ,MAAM,EAAE;AAAA,EACV,CAAC,EACA,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;AAAA,EAEvC,YAAY,EAAE,OAAO,SAAS;AAAA,EAC9B,MAAM,4BAAY,SAAS;AAC7B,CAAC;",
   "names": []
 }

package/lib/cli/init/validation.d.ts

@@ -1,3 +1,8 @@
 export declare const isGitHubOrg: (value: string) => boolean;
 export declare const isGitHubRepo: (value: string) => boolean;
 export declare const isGitHubTeam: (value: string) => boolean;
+declare const PLATFORMS: readonly ["amd64", "arm64"];
+export type Platform = typeof PLATFORMS[number];
+export declare const PLATFORM_OPTIONS: string;
+export declare const isPlatform: (value: unknown) => boolean;
+export {};

package/lib/cli/init/validation.js

@@ -18,18 +18,26 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var validation_exports = {};
 __export(validation_exports, {
+  PLATFORM_OPTIONS: () => PLATFORM_OPTIONS,
   isGitHubOrg: () => isGitHubOrg,
   isGitHubRepo: () => isGitHubRepo,
-  isGitHubTeam: () => isGitHubTeam
+  isGitHubTeam: () => isGitHubTeam,
+  isPlatform: () => isPlatform
 });
 module.exports = __toCommonJS(validation_exports);
 const isGitHubOrg = (value) => /^[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?$/.test(value) && !value.includes("--");
 const isGitHubRepo = (value) => /^[A-Za-z0-9_.-]+$/.test(value) && value !== "." && value !== "..";
 const isGitHubTeam = (value) => /^[A-Za-z0-9_](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?$/.test(value) && !value.endsWith("-") && !value.includes("--");
+const PLATFORMS = ["amd64", "arm64"];
+const PLATFORM_OPTIONS = PLATFORMS.join(" | ");
+const platformSet = new Set(PLATFORMS);
+const isPlatform = (value) => platformSet.has(value);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PLATFORM_OPTIONS,
   isGitHubOrg,
   isGitHubRepo,
-  isGitHubTeam
+  isGitHubTeam,
+  isPlatform
 });
 //# sourceMappingURL=validation.js.map

package/lib/cli/init/validation.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/validation.ts"],
-  "sourcesContent": ["export const isGitHubOrg = (value: string) =>\n  /^[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?$/.test(value) &&\n  !value.includes('--');\n\nexport const isGitHubRepo = (value: string) =>\n  /^[A-Za-z0-9_.-]+$/.test(value) && value !== '.' && value !== '..';\n\nexport const isGitHubTeam = (value: string) =>\n  /^[A-Za-z0-9_](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?$/.test(value) &&\n  !value.endsWith('-') &&\n  !value.includes('--');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc,CAAC,UAC1B,6CAA6C,KAAK,KAAK,KACvD,CAAC,MAAM,SAAS,IAAI;AAEf,MAAM,eAAe,CAAC,UAC3B,oBAAoB,KAAK,KAAK,KAAK,UAAU,OAAO,UAAU;AAEzD,MAAM,eAAe,CAAC,UAC3B,gDAAgD,KAAK,KAAK,KAC1D,CAAC,MAAM,SAAS,GAAG,KACnB,CAAC,MAAM,SAAS,IAAI;",
+  "sourcesContent": ["export const isGitHubOrg = (value: string) =>\n  /^[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?$/.test(value) &&\n  !value.includes('--');\n\nexport const isGitHubRepo = (value: string) =>\n  /^[A-Za-z0-9_.-]+$/.test(value) && value !== '.' && value !== '..';\n\nexport const isGitHubTeam = (value: string) =>\n  /^[A-Za-z0-9_](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?$/.test(value) &&\n  !value.endsWith('-') &&\n  !value.includes('--');\n\nconst PLATFORMS = ['amd64', 'arm64'] as const;\n\nexport type Platform = typeof PLATFORMS[number];\n\nexport const PLATFORM_OPTIONS = PLATFORMS.join(' | ');\n\nconst platformSet = new Set<unknown>(PLATFORMS);\n\nexport const isPlatform = (value: unknown) => platformSet.has(value);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc,CAAC,UAC1B,6CAA6C,KAAK,KAAK,KACvD,CAAC,MAAM,SAAS,IAAI;AAEf,MAAM,eAAe,CAAC,UAC3B,oBAAoB,KAAK,KAAK,KAAK,UAAU,OAAO,UAAU;AAEzD,MAAM,eAAe,CAAC,UAC3B,gDAAgD,KAAK,KAAK,KAC1D,CAAC,MAAM,SAAS,GAAG,KACnB,CAAC,MAAM,SAAS,IAAI;AAEtB,MAAM,YAAY,CAAC,SAAS,OAAO;AAI5B,MAAM,mBAAmB,UAAU,KAAK,KAAK;AAEpD,MAAM,cAAc,IAAI,IAAa,SAAS;AAEvC,MAAM,aAAa,CAAC,UAAmB,YAAY,IAAI,KAAK;",
   "names": []
 }

package/lib/cli/lint/autofix.d.ts

@@ -1,4 +1,6 @@
+import * as Git from '../../api/git';
 import type { Input } from './types';
+export declare const AUTOFIX_IGNORE_FILES: Git.ChangedFile[];
 interface AutofixParameters {
     debug: Input['debug'];
     eslint: boolean;

package/lib/cli/lint/autofix.js

@@ -24,6 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var autofix_exports = {};
 __export(autofix_exports, {
+  AUTOFIX_IGNORE_FILES: () => AUTOFIX_IGNORE_FILES,
   autofix: () => autofix
 });
 module.exports = __toCommonJS(autofix_exports);
@@ -37,6 +38,16 @@ var import_env = require("../../utils/env");
 var import_logging = require("../../utils/logging");
 var import_wait = require("../../utils/wait");
 const AUTOFIX_COMMIT_MESSAGE = "Run `skuba format`";
+const AUTOFIX_IGNORE_FILES = [
+  {
+    path: ".npmrc",
+    state: "added"
+  },
+  {
+    path: "Dockerfile-incunabulum",
+    state: "added"
+  }
+];
 const shouldPush = async ({
   currentBranch,
   dir
@@ -87,7 +98,8 @@ const autofix = async (params) => {
     if (process.env.GITHUB_ACTIONS) {
       const ref2 = await Git.commitAllChanges({
         dir,
-        message: AUTOFIX_COMMIT_MESSAGE
+        message: AUTOFIX_COMMIT_MESSAGE,
+        ignore: AUTOFIX_IGNORE_FILES
       });
       if (!ref2) {
         return import_logging.log.warn("No autofixes detected.");
@@ -105,9 +117,10 @@ const autofix = async (params) => {
     }
     const ref = await (0, import_wait.throwOnTimeout)(
       GitHub.uploadAllFileChanges({
-        dir,
         branch: currentBranch,
-        messageHeadline: AUTOFIX_COMMIT_MESSAGE
+        dir,
+        messageHeadline: AUTOFIX_COMMIT_MESSAGE,
+        ignore: AUTOFIX_IGNORE_FILES
       }),
       { s: 30 }
     );
@@ -127,6 +140,7 @@ const autofix = async (params) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AUTOFIX_IGNORE_FILES,
   autofix
 });
 //# sourceMappingURL=autofix.js.map

package/lib/cli/lint/autofix.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/autofix.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport simpleGit from 'simple-git';\n\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { runESLint } from '../../cli/adapter/eslint';\nimport { runPrettier } from '../../cli/adapter/prettier';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { throwOnTimeout } from '../../utils/wait';\n\nimport type { Input } from './types';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n}\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  if (!params.eslint && !params.prettier) {\n    return;\n  }\n\n  const dir = process.cwd();\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n    log.warn(\n      `Trying to autofix with ${params.eslint ? 'ESLint and ' : ''}Prettier...`,\n    );\n\n    const logger = createLogger(params.debug);\n\n    if (params.eslint) {\n      await runESLint('format', logger);\n    }\n    // Unconditionally re-run Prettier; reaching here means we have pre-existing\n    // format violations or may have created new ones through ESLint fixes.\n    await runPrettier('format', logger);\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        dir,\n        branch: currentBranch,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,wBAAsB;AAEtB,UAAqB;AACrB,aAAwB;AACxB,oBAA0B;AAC1B,sBAA4B;AAC5B,iBAAwB;AACxB,qBAAkC;AAClC,kBAA+B;AAI/B,MAAM,yBAAyB;AAE/B,MAAM,aAAa,OAAO;AAAA,EACxB;AAAA,EACA;AACF,MAGM;AACJ,MAAI,KAAC,oBAAQ,GAAG;AAId,WAAO;AAAA,EACT;AAEA,QAAM,2BACJ,iBACA,CAAC,QAAQ,IAAI,mCAAmC,UAAU,MAAM,EAAE;AAAA,IAChE;AAAA,EACF;AAEF,QAAM,0BAA0B,QAAQ,IAAI,yBAAyB;AAErE,MAAI,4BAA4B,yBAAyB;AAGvD,WAAO;AAAA,EACT;AAEA,MAAI;AACJ,MAAI;AACF,wBAAoB,MAAM,IAAI,qBAAqB,EAAE,IAAI,CAAC;AAAA,EAC5D,QAAE;AAAA,EAAO;AAET,MAAI,sBAAsB,wBAAwB;AAGhD,WAAO;AAAA,EACT;AAGA,SAAO;AACT;AASO,MAAM,UAAU,OAAO,WAA6C;AACzE,MAAI,CAAC,OAAO,UAAU,CAAC,OAAO,UAAU;AACtC;AAAA,EACF;AAEA,QAAM,MAAM,QAAQ,IAAI;AAExB,MAAI;AACJ,MAAI;AACF,oBAAgB,MAAM,IAAI,cAAc,EAAE,IAAI,CAAC;AAAA,EACjD,QAAE;AAAA,EAAO;AAET,MAAI,CAAE,MAAM,WAAW,EAAE,eAAe,IAAI,CAAC,GAAI;AAC/C;AAAA,EACF;AAEA,MAAI;AACF,uBAAI,QAAQ;AACZ,uBAAI;AAAA,MACF,0BAA0B,OAAO,SAAS,gBAAgB;AAAA,IAC5D;AAEA,UAAM,aAAS,6BAAa,OAAO,KAAK;AAExC,QAAI,OAAO,QAAQ;AACjB,gBAAM,yBAAU,UAAU,MAAM;AAAA,IAClC;AAGA,cAAM,6BAAY,UAAU,MAAM;AAElC,QAAI,QAAQ,IAAI,gBAAgB;AAE9B,YAAMA,OAAM,MAAM,IAAI,iBAAiB;AAAA,QACrC;AAAA,QACA,SAAS;AAAA,MACX,CAAC;AAED,UAAI,CAACA,MAAK;AACR,eAAO,mBAAI,KAAK,wBAAwB;AAAA,MAC1C;AAEA,gBAAM,gCAAe,kBAAAC,SAAU,EAAE,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AAClD,yBAAI,KAAK,qBAAqBD,OAAM;AACpC;AAAA,IACF;AAGA,QAAI,CAAC,eAAe;AAClB,yBAAI,KAAK,yCAAyC;AAClD,yBAAI;AAAA,QACF;AAAA,MACF;AACA;AAAA,IACF;AAEA,UAAM,MAAM,UAAM;AAAA,MAChB,OAAO,qBAAqB;AAAA,QAC1B;AAAA,QACA,QAAQ;AAAA,QACR,iBAAiB;AAAA,MACnB,CAAC;AAAA,MACD,EAAE,GAAG,GAAG;AAAA,IACV;AAEA,QAAI,CAAC,KAAK;AACR,aAAO,mBAAI,KAAK,wBAAwB;AAAA,IAC1C;AAEA,uBAAI,KAAK,qBAAqB,MAAM;AAAA,EACtC,SAAS,KAAP;AACA,uBAAI,KAAK,mBAAI,KAAK,4BAA4B,CAAC;AAC/C,uBAAI;AAAA,MACF,mBAAI;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport simpleGit from 'simple-git';\n\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { runESLint } from '../../cli/adapter/eslint';\nimport { runPrettier } from '../../cli/adapter/prettier';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { throwOnTimeout } from '../../utils/wait';\n\nimport type { Input } from './types';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nexport const AUTOFIX_IGNORE_FILES: Git.ChangedFile[] = [\n  {\n    path: '.npmrc',\n    state: 'added',\n  },\n  {\n    path: 'Dockerfile-incunabulum',\n    state: 'added',\n  },\n];\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n}\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  if (!params.eslint && !params.prettier) {\n    return;\n  }\n\n  const dir = process.cwd();\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n    log.warn(\n      `Trying to autofix with ${params.eslint ? 'ESLint and ' : ''}Prettier...`,\n    );\n\n    const logger = createLogger(params.debug);\n\n    if (params.eslint) {\n      await runESLint('format', logger);\n    }\n    // Unconditionally re-run Prettier; reaching here means we have pre-existing\n    // format violations or may have created new ones through ESLint fixes.\n    await runPrettier('format', logger);\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        branch: currentBranch,\n        dir,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,wBAAsB;AAEtB,UAAqB;AACrB,aAAwB;AACxB,oBAA0B;AAC1B,sBAA4B;AAC5B,iBAAwB;AACxB,qBAAkC;AAClC,kBAA+B;AAI/B,MAAM,yBAAyB;AAExB,MAAM,uBAA0C;AAAA,EACrD;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AACF;AAEA,MAAM,aAAa,OAAO;AAAA,EACxB;AAAA,EACA;AACF,MAGM;AACJ,MAAI,KAAC,oBAAQ,GAAG;AAId,WAAO;AAAA,EACT;AAEA,QAAM,2BACJ,iBACA,CAAC,QAAQ,IAAI,mCAAmC,UAAU,MAAM,EAAE;AAAA,IAChE;AAAA,EACF;AAEF,QAAM,0BAA0B,QAAQ,IAAI,yBAAyB;AAErE,MAAI,4BAA4B,yBAAyB;AAGvD,WAAO;AAAA,EACT;AAEA,MAAI;AACJ,MAAI;AACF,wBAAoB,MAAM,IAAI,qBAAqB,EAAE,IAAI,CAAC;AAAA,EAC5D,QAAE;AAAA,EAAO;AAET,MAAI,sBAAsB,wBAAwB;AAGhD,WAAO;AAAA,EACT;AAGA,SAAO;AACT;AASO,MAAM,UAAU,OAAO,WAA6C;AACzE,MAAI,CAAC,OAAO,UAAU,CAAC,OAAO,UAAU;AACtC;AAAA,EACF;AAEA,QAAM,MAAM,QAAQ,IAAI;AAExB,MAAI;AACJ,MAAI;AACF,oBAAgB,MAAM,IAAI,cAAc,EAAE,IAAI,CAAC;AAAA,EACjD,QAAE;AAAA,EAAO;AAET,MAAI,CAAE,MAAM,WAAW,EAAE,eAAe,IAAI,CAAC,GAAI;AAC/C;AAAA,EACF;AAEA,MAAI;AACF,uBAAI,QAAQ;AACZ,uBAAI;AAAA,MACF,0BAA0B,OAAO,SAAS,gBAAgB;AAAA,IAC5D;AAEA,UAAM,aAAS,6BAAa,OAAO,KAAK;AAExC,QAAI,OAAO,QAAQ;AACjB,gBAAM,yBAAU,UAAU,MAAM;AAAA,IAClC;AAGA,cAAM,6BAAY,UAAU,MAAM;AAElC,QAAI,QAAQ,IAAI,gBAAgB;AAE9B,YAAMA,OAAM,MAAM,IAAI,iBAAiB;AAAA,QACrC;AAAA,QACA,SAAS;AAAA,QAET,QAAQ;AAAA,MACV,CAAC;AAED,UAAI,CAACA,MAAK;AACR,eAAO,mBAAI,KAAK,wBAAwB;AAAA,MAC1C;AAEA,gBAAM,gCAAe,kBAAAC,SAAU,EAAE,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AAClD,yBAAI,KAAK,qBAAqBD,OAAM;AACpC;AAAA,IACF;AAGA,QAAI,CAAC,eAAe;AAClB,yBAAI,KAAK,yCAAyC;AAClD,yBAAI;AAAA,QACF;AAAA,MACF;AACA;AAAA,IACF;AAEA,UAAM,MAAM,UAAM;AAAA,MAChB,OAAO,qBAAqB;AAAA,QAC1B,QAAQ;AAAA,QACR;AAAA,QACA,iBAAiB;AAAA,QAEjB,QAAQ;AAAA,MACV,CAAC;AAAA,MACD,EAAE,GAAG,GAAG;AAAA,IACV;AAEA,QAAI,CAAC,KAAK;AACR,aAAO,mBAAI,KAAK,wBAAwB;AAAA,IAC1C;AAEA,uBAAI,KAAK,qBAAqB,MAAM;AAAA,EACtC,SAAS,KAAP;AACA,uBAAI,KAAK,mBAAI,KAAK,4BAA4B,CAAC;AAC/C,uBAAI;AAAA,MACF,mBAAI;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AACF;",
   "names": ["ref", "simpleGit"]
 }

package/lib/skuba.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../src/skuba.ts"],
   "sourcesContent": ["#!/usr/bin/env node\n\n/**\n * Entry point for the CLI.\n *\n * This is where you end up when you run:\n *\n * ```bash\n * [yarn] skuba help\n * ```\n */\n\nimport path from 'path';\n\nimport { parseProcessArgs } from './utils/args';\nimport { COMMAND_DIR, COMMAND_SET, commandToModule } from './utils/command';\nimport { handleCliError } from './utils/error';\nimport { showHelp } from './utils/help';\nimport { log } from './utils/logging';\nimport { showLogoAndVersionInfo } from './utils/logo';\nimport { hasProp } from './utils/validation';\n\nconst skuba = async () => {\n  const { commandName } = parseProcessArgs(process.argv);\n\n  if (COMMAND_SET.has(commandName)) {\n    const moduleName = commandToModule(commandName);\n\n    /* eslint-disable @typescript-eslint/no-var-requires */\n    const commandModule = require(path.join(\n      COMMAND_DIR,\n      moduleName,\n    )) as unknown;\n\n    if (!hasProp(commandModule, moduleName)) {\n      log.err(log.bold(commandName), \"couldn't run! Please submit an issue.\");\n      process.exitCode = 1;\n      return;\n    }\n\n    const run = commandModule[moduleName] as () => Promise<unknown>;\n\n    return run();\n  }\n\n  log.err(log.bold(commandName), 'is not recognised as a command.');\n  await showLogoAndVersionInfo();\n  showHelp();\n\n  process.exitCode = 1;\n};\n\nskuba().catch(handleCliError);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;AAYA,kBAAiB;AAEjB,kBAAiC;AACjC,qBAA0D;AAC1D,mBAA+B;AAC/B,kBAAyB;AACzB,qBAAoB;AACpB,kBAAuC;AACvC,wBAAwB;AAExB,MAAM,QAAQ,YAAY;AACxB,QAAM,EAAE,YAAY,QAAI,8BAAiB,QAAQ,IAAI;AAErD,MAAI,2BAAY,IAAI,WAAW,GAAG;AAChC,UAAM,iBAAa,gCAAgB,WAAW;AAG9C,UAAM,gBAAgB,QAAQ,YAAAA,QAAK;AAAA,MACjC;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,KAAC,2BAAQ,eAAe,UAAU,GAAG;AACvC,yBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,uCAAuC;AACtE,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,UAAM,MAAM,cAAc;AAE1B,WAAO,IAAI;AAAA,EACb;AAEA,qBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,iCAAiC;AAChE,YAAM,oCAAuB;AAC7B,4BAAS;AAET,UAAQ,WAAW;AACrB;AAEA,MAAM,EAAE,MAAM,2BAAc;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAYA,kBAAiB;AAEjB,kBAAiC;AACjC,qBAA0D;AAC1D,mBAA+B;AAC/B,kBAAyB;AACzB,qBAAoB;AACpB,kBAAuC;AACvC,wBAAwB;AAExB,MAAM,QAAQ,YAAY;AACxB,QAAM,EAAE,YAAY,QAAI,8BAAiB,QAAQ,IAAI;AAErD,MAAI,2BAAY,IAAI,WAAW,GAAG;AAChC,UAAM,iBAAa,gCAAgB,WAAW;AAG9C,UAAM,gBAAgB,QAAQ,YAAAA,QAAK;AAAA,MACjC;AAAA,MACA;AAAA,IACF;AAEA,QAAI,KAAC,2BAAQ,eAAe,UAAU,GAAG;AACvC,yBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,uCAAuC;AACtE,cAAQ,WAAW;AACnB;AAAA,IACF;AAEA,UAAM,MAAM,cAAc;AAE1B,WAAO,IAAI;AAAA,EACb;AAEA,qBAAI,IAAI,mBAAI,KAAK,WAAW,GAAG,iCAAiC;AAChE,YAAM,oCAAuB;AAC7B,4BAAS;AAET,UAAQ,WAAW;AACrB;AAEA,MAAM,EAAE,MAAM,2BAAc;",
   "names": ["path"]
 }

package/lib/utils/command.d.ts

@@ -1,4 +1,4 @@
-export declare type Command = typeof COMMAND_LIST[number];
+export type Command = typeof COMMAND_LIST[number];
 export declare const COMMAND_ALIASES: Record<string, Command>;
 export declare const COMMAND_DIR: string;
 export declare const COMMAND_LIST: readonly ["build", "build-package", "configure", "format", "help", "init", "lint", "node", "release", "start", "test", "version"];

package/lib/utils/copy.d.ts

@@ -1,4 +1,4 @@
-export declare type TextProcessor = (contents: string) => string;
+export type TextProcessor = (contents: string) => string;
 interface CopyFilesOptions {
     sourceRoot: string;
     destinationRoot: string;

package/lib/utils/error.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { inspect } from 'util';
 import * as t from 'runtypes';
-export declare type ConcurrentlyErrors = t.Static<typeof ConcurrentlyErrors>;
+export type ConcurrentlyErrors = t.Static<typeof ConcurrentlyErrors>;
 export declare const ConcurrentlyErrors: t.Array<t.Record<{
     command: t.Record<{
         command: t.String;

package/lib/utils/exec.d.ts

@@ -3,7 +3,7 @@ import stream from 'stream';
 import type { Color } from 'chalk';
 import type { ExecaChildProcess } from 'execa';
 import execa from 'execa';
-export declare type Exec = (command: string, ...args: string[]) => ExecaChildProcess<string>;
+export type Exec = (command: string, ...args: string[]) => ExecaChildProcess<string>;
 interface ExecConcurrentlyCommand {
     command: string;
     name: string;
@@ -29,7 +29,7 @@ interface ExecConcurrentlyOptions {
      */
     outputStream?: stream.Writable;
 }
-declare type ExecOptions = execa.Options & {
+type ExecOptions = execa.Options & {
     streamStdio?: true | 'yarn';
 };
 export declare const createExec: (opts: ExecOptions) => Exec;

package/lib/utils/logging.d.ts

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-export declare type Logger = typeof log;
+export type Logger = typeof log;
 export declare const createLogger: (debug: boolean, ...prefixes: unknown[]) => {
     bold: chalk.Chalk;
     formatSubtle: chalk.Chalk;

package/lib/utils/manifest.d.ts

@@ -1,7 +1,7 @@
 import type { NormalizedPackageJson } from 'read-pkg-up';
 import readPkgUp from 'read-pkg-up';
 import * as t from 'runtypes';
-export declare type ProjectType = t.Static<typeof ProjectType>;
+export type ProjectType = t.Static<typeof ProjectType>;
 export declare const ProjectType: t.Union<[t.Literal<"application">, t.Literal<"package">]>;
 export declare const PROJECT_TYPES: readonly ["application", "package"];
 export declare const getSkubaManifest: () => Promise<NormalizedPackageJson>;

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.1",
+  "version": "5.1.1",
   "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.2.0",
+    "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