skuba 9.1.0 → 9.2.0-main-20250115035914

package/lib/cli/adapter/prettier.js

@@ -163,7 +163,10 @@ const runPrettier = async (mode, logger, cwd = process.cwd()) => {
   if (result.errored.length) {
     logger.plain(`Flagged ${(0, import_logging.pluralise)(result.errored.length, "file")}:`);
     for (const { err, filepath } of result.errored) {
-      logger.warn(filepath, ...err ? [String(err)] : []);
+      logger.warn(
+        filepath,
+        ...typeof err === "string" || err instanceof Error ? [String(err)] : []
+      );
     }
   }
   return { ok: result.errored.length === 0, result };

package/lib/cli/adapter/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/adapter/prettier.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, pluralise } from '../../utils/logging';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { formatPackage, parsePackage } from '../configure/processing/package';\n\nlet languages: SupportLanguage[] | undefined;\n\n/**\n * Infers a parser for the specified filepath.\n *\n * This is a cut-down version of Prettier's built-in function of the same name;\n * ours operates purely on the `filepath` string and does not perform file I/O.\n * Prettier's internal `getInterpreter` function can open a file to read the\n * shebang, and its file descriptor usage can throw warnings on worker threads:\n *\n * ```console\n * Warning: File descriptor 123 closed but not opened in unmanaged mode\n *     at Object.closeSync (node:fs:530:11)\n *     at Object.closeSync (node_modules/graceful-fs/graceful-fs.js:74:20)\n *     ...\n * ```\n *\n * References:\n *\n * - https://github.com/prettier/prettier/blob/2.4.1/src/main/options.js#L167\n * - seek-oss/skuba#659\n */\nexport const inferParser = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\n\n  const firstLanguage = languages.find(\n    (language) =>\n      language.extensions?.some((extension) => filename.endsWith(extension)) ||\n      language.filenames?.some((name) => name.toLowerCase() === filename),\n  );\n\n  return firstLanguage?.parsers[0];\n};\n\nconst isPackageJsonOk = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await formatPackage(packageJson)) === data;\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  return true;\n};\n\ninterface File {\n  data: string;\n  options: Options;\n  filepath: string;\n}\n\ninterface Result {\n  count: number;\n  errored: Array<{ err?: unknown; filepath: string }>;\n  touched: string[];\n  unparsed: string[];\n}\n\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await isPackageJsonOk({ data, filepath }));\n    } catch (err) {\n      result?.errored.push({ err, filepath });\n      return;\n    }\n\n    if (!ok) {\n      result?.errored.push({ filepath });\n    }\n\n    return;\n  }\n\n  let formatted: string;\n  try {\n    formatted = await format(data, options);\n  } catch (err) {\n    result?.errored.push({ err, filepath });\n    return;\n  }\n\n  // Perform additional formatting (i.e. sorting) on a `package.json` manifest.\n  try {\n    if (path.basename(filepath) === 'package.json') {\n      const packageJson = parsePackage(formatted);\n      if (packageJson) {\n        formatted = await formatPackage(packageJson);\n      }\n    }\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  if (formatted === data) {\n    return;\n  }\n\n  result?.touched.push(filepath);\n  return formatted;\n};\n\nexport interface PrettierOutput {\n  ok: boolean;\n  result: Result;\n}\n\n/**\n * Formats/lints files with Prettier.\n *\n * Prettier doesn't provide a higher-level Node.js API that replicates the\n * behaviour of its CLI, so we have to plumb together its lower-level functions.\n * On the other hand, this affords more flexibility in how we track and report\n * on progress and results.\n */\nexport const runPrettier = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  cwd = process.cwd(),\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  const manifest = await getConsumerManifest(cwd);\n\n  const directory = manifest ? path.dirname(manifest.path) : cwd;\n\n  logger.debug(\n    manifest ? 'Detected project root:' : 'Detected working directory:',\n    directory,\n  );\n\n  logger.debug('Discovering files...');\n\n  // Match Prettier's opinion of respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const relativeFilepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\n\n  logger.debug(`Discovered ${pluralise(relativeFilepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: relativeFilepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const relativeFilepath of relativeFilepaths) {\n    // Use relative paths to keep log output cleaner, particularly in the common\n    // case where we are executing against the current working directory.\n    const filepath = path.relative(\n      process.cwd(),\n      path.join(directory, relativeFilepath),\n    );\n\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = await inferParser(filepath);\n\n    logger.debug(filepath);\n    logger.debug('  parser:', parser ?? '-');\n\n    if (!parser) {\n      result.unparsed.push(filepath);\n      continue;\n    }\n\n    const [config, data] = await Promise.all([\n      resolveConfig(filepath),\n      fs.promises.readFile(filepath, 'utf-8'),\n    ]);\n\n    const file: File = {\n      data,\n      filepath,\n      options: { ...config, filepath },\n    };\n\n    const formatted = await formatOrLintFile(file, mode, result);\n\n    if (typeof formatted === 'string') {\n      await fs.promises.writeFile(filepath, formatted);\n    }\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(\n      result.count - result.unparsed.length,\n      'file',\n    )} in ${logger.timing(start, end)}.`,\n  );\n\n  if (result.touched.length) {\n    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);\n    for (const filepath of result.touched) {\n      logger.warn(filepath);\n    }\n  }\n\n  if (result.errored.length) {\n    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);\n    for (const { err, filepath } of result.errored) {\n      logger.warn(filepath, ...(err ? [String(err)] : []));\n    }\n  }\n\n  return { ok: result.errored.length === 0, result };\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, pluralise } from '../../utils/logging';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { formatPackage, parsePackage } from '../configure/processing/package';\n\nlet languages: SupportLanguage[] | undefined;\n\n/**\n * Infers a parser for the specified filepath.\n *\n * This is a cut-down version of Prettier's built-in function of the same name;\n * ours operates purely on the `filepath` string and does not perform file I/O.\n * Prettier's internal `getInterpreter` function can open a file to read the\n * shebang, and its file descriptor usage can throw warnings on worker threads:\n *\n * ```console\n * Warning: File descriptor 123 closed but not opened in unmanaged mode\n *     at Object.closeSync (node:fs:530:11)\n *     at Object.closeSync (node_modules/graceful-fs/graceful-fs.js:74:20)\n *     ...\n * ```\n *\n * References:\n *\n * - https://github.com/prettier/prettier/blob/2.4.1/src/main/options.js#L167\n * - seek-oss/skuba#659\n */\nexport const inferParser = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\n\n  const firstLanguage = languages.find(\n    (language) =>\n      language.extensions?.some((extension) => filename.endsWith(extension)) ||\n      language.filenames?.some((name) => name.toLowerCase() === filename),\n  );\n\n  return firstLanguage?.parsers[0];\n};\n\nconst isPackageJsonOk = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await formatPackage(packageJson)) === data;\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  return true;\n};\n\ninterface File {\n  data: string;\n  options: Options;\n  filepath: string;\n}\n\ninterface Result {\n  count: number;\n  errored: Array<{ err?: unknown; filepath: string }>;\n  touched: string[];\n  unparsed: string[];\n}\n\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await isPackageJsonOk({ data, filepath }));\n    } catch (err) {\n      result?.errored.push({ err, filepath });\n      return;\n    }\n\n    if (!ok) {\n      result?.errored.push({ filepath });\n    }\n\n    return;\n  }\n\n  let formatted: string;\n  try {\n    formatted = await format(data, options);\n  } catch (err) {\n    result?.errored.push({ err, filepath });\n    return;\n  }\n\n  // Perform additional formatting (i.e. sorting) on a `package.json` manifest.\n  try {\n    if (path.basename(filepath) === 'package.json') {\n      const packageJson = parsePackage(formatted);\n      if (packageJson) {\n        formatted = await formatPackage(packageJson);\n      }\n    }\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  if (formatted === data) {\n    return;\n  }\n\n  result?.touched.push(filepath);\n  return formatted;\n};\n\nexport interface PrettierOutput {\n  ok: boolean;\n  result: Result;\n}\n\n/**\n * Formats/lints files with Prettier.\n *\n * Prettier doesn't provide a higher-level Node.js API that replicates the\n * behaviour of its CLI, so we have to plumb together its lower-level functions.\n * On the other hand, this affords more flexibility in how we track and report\n * on progress and results.\n */\nexport const runPrettier = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  cwd = process.cwd(),\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  const manifest = await getConsumerManifest(cwd);\n\n  const directory = manifest ? path.dirname(manifest.path) : cwd;\n\n  logger.debug(\n    manifest ? 'Detected project root:' : 'Detected working directory:',\n    directory,\n  );\n\n  logger.debug('Discovering files...');\n\n  // Match Prettier's opinion of respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const relativeFilepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\n\n  logger.debug(`Discovered ${pluralise(relativeFilepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: relativeFilepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const relativeFilepath of relativeFilepaths) {\n    // Use relative paths to keep log output cleaner, particularly in the common\n    // case where we are executing against the current working directory.\n    const filepath = path.relative(\n      process.cwd(),\n      path.join(directory, relativeFilepath),\n    );\n\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = await inferParser(filepath);\n\n    logger.debug(filepath);\n    logger.debug('  parser:', parser ?? '-');\n\n    if (!parser) {\n      result.unparsed.push(filepath);\n      continue;\n    }\n\n    const [config, data] = await Promise.all([\n      resolveConfig(filepath),\n      fs.promises.readFile(filepath, 'utf-8'),\n    ]);\n\n    const file: File = {\n      data,\n      filepath,\n      options: { ...config, filepath },\n    };\n\n    const formatted = await formatOrLintFile(file, mode, result);\n\n    if (typeof formatted === 'string') {\n      await fs.promises.writeFile(filepath, formatted);\n    }\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(\n      result.count - result.unparsed.length,\n      'file',\n    )} in ${logger.timing(start, end)}.`,\n  );\n\n  if (result.touched.length) {\n    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);\n    for (const filepath of result.touched) {\n      logger.warn(filepath);\n    }\n  }\n\n  if (result.errored.length) {\n    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);\n    for (const { err, filepath } of result.errored) {\n      logger.warn(\n        filepath,\n        ...(typeof err === 'string' || err instanceof Error\n          ? [String(err)]\n          : []),\n      );\n    }\n  }\n\n  return { ok: result.errored.length === 0, result };\n};\n"],
+  "mappings": "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",
   "names": ["path", "fs"]
 }

package/lib/cli/configure/analysis/git.js

@@ -37,14 +37,27 @@ var import_dir = require("../../../utils/dir");
 var import_logging = require("../../../utils/logging");
 const auditWorkingTree = async (dir) => {
   const filepaths = await (0, import_dir.crawlDirectory)(dir);
+  let anyFailed = false;
   const statuses = await Promise.all(
-    filepaths.map((filepath) => import_isomorphic_git.default.status({ dir, fs: import_fs_extra.default, filepath }))
+    filepaths.map(async (filepath) => {
+      try {
+        return await import_isomorphic_git.default.status({ dir, fs: import_fs_extra.default, filepath });
+      } catch {
+        anyFailed = true;
+        return "absent";
+      }
+    })
   );
   if (statuses.some(
     (status) => status !== "absent" && status !== "ignored" && status !== "unmodified"
   )) {
     import_logging.log.newline();
     import_logging.log.warn("You have dirty/untracked files that may be overwritten.");
+  } else if (anyFailed) {
+    import_logging.log.newline();
+    import_logging.log.warn(
+      "Some files failed to be read. Check that you don't have any dirty/untracked files that may be overwritten."
+    );
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/cli/configure/analysis/git.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/analysis/git.ts"],
-  "sourcesContent": ["import fs from 'fs-extra';\nimport git from 'isomorphic-git';\n\nimport { crawlDirectory } from '../../../utils/dir';\nimport { log } from '../../../utils/logging';\n\nexport const auditWorkingTree = async (dir: string) => {\n  const filepaths = await crawlDirectory(dir);\n\n  const statuses = await Promise.all(\n    filepaths.map((filepath) => git.status({ dir, fs, filepath })),\n  );\n\n  if (\n    statuses.some(\n      (status) =>\n        status !== 'absent' && status !== 'ignored' && status !== 'unmodified',\n    )\n  ) {\n    log.newline();\n    log.warn('You have dirty/untracked files that may be overwritten.');\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe;AACf,4BAAgB;AAEhB,iBAA+B;AAC/B,qBAAoB;AAEb,MAAM,mBAAmB,OAAO,QAAgB;AACrD,QAAM,YAAY,UAAM,2BAAe,GAAG;AAE1C,QAAM,WAAW,MAAM,QAAQ;AAAA,IAC7B,UAAU,IAAI,CAAC,aAAa,sBAAAA,QAAI,OAAO,EAAE,KAAK,oBAAAC,SAAI,SAAS,CAAC,CAAC;AAAA,EAC/D;AAEA,MACE,SAAS;AAAA,IACP,CAAC,WACC,WAAW,YAAY,WAAW,aAAa,WAAW;AAAA,EAC9D,GACA;AACA,uBAAI,QAAQ;AACZ,uBAAI,KAAK,yDAAyD;AAAA,EACpE;AACF;",
+  "sourcesContent": ["import fs from 'fs-extra';\nimport git from 'isomorphic-git';\n\nimport { crawlDirectory } from '../../../utils/dir';\nimport { log } from '../../../utils/logging';\n\nexport const auditWorkingTree = async (dir: string) => {\n  const filepaths = await crawlDirectory(dir);\n\n  let anyFailed = false;\n\n  const statuses = await Promise.all(\n    filepaths.map(async (filepath) => {\n      try {\n        return await git.status({ dir, fs, filepath });\n      } catch {\n        // TODO: Why does isomorphic-git sometimes just _fail_?\n        anyFailed = true;\n        return 'absent';\n      }\n    }),\n  );\n\n  if (\n    statuses.some(\n      (status) =>\n        status !== 'absent' && status !== 'ignored' && status !== 'unmodified',\n    )\n  ) {\n    log.newline();\n    log.warn('You have dirty/untracked files that may be overwritten.');\n  } else if (anyFailed) {\n    log.newline();\n    log.warn(\n      \"Some files failed to be read. Check that you don't have any dirty/untracked files that may be overwritten.\",\n    );\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe;AACf,4BAAgB;AAEhB,iBAA+B;AAC/B,qBAAoB;AAEb,MAAM,mBAAmB,OAAO,QAAgB;AACrD,QAAM,YAAY,UAAM,2BAAe,GAAG;AAE1C,MAAI,YAAY;AAEhB,QAAM,WAAW,MAAM,QAAQ;AAAA,IAC7B,UAAU,IAAI,OAAO,aAAa;AAChC,UAAI;AACF,eAAO,MAAM,sBAAAA,QAAI,OAAO,EAAE,KAAK,oBAAAC,SAAI,SAAS,CAAC;AAAA,MAC/C,QAAQ;AAEN,oBAAY;AACZ,eAAO;AAAA,MACT;AAAA,IACF,CAAC;AAAA,EACH;AAEA,MACE,SAAS;AAAA,IACP,CAAC,WACC,WAAW,YAAY,WAAW,aAAa,WAAW;AAAA,EAC9D,GACA;AACA,uBAAI,QAAQ;AACZ,uBAAI,KAAK,yDAAyD;AAAA,EACpE,WAAW,WAAW;AACpB,uBAAI,QAAQ;AACZ,uBAAI;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["git", "fs"]
 }

package/lib/cli/lint/annotate/buildkite/prettier.js

@@ -36,7 +36,10 @@ const createPrettierAnnotations = (prettier) => !prettier.ok ? [
   "**Prettier**",
   Buildkite.md.terminal(
     prettier.result.errored.map(
-      ({ err, filepath }) => [filepath, ...err ? [String(err)] : []].join(" ")
+      ({ err, filepath }) => [
+        filepath,
+        ...typeof err === "string" || err instanceof Error ? [String(err)] : []
+      ].join(" ")
     ).join("\n")
   )
 ] : [];

package/lib/cli/lint/annotate/buildkite/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/annotate/buildkite/prettier.ts"],
-  "sourcesContent": ["import * as Buildkite from '../../../../api/buildkite';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): string[] =>\n  !prettier.ok\n    ? [\n        '**Prettier**',\n        Buildkite.md.terminal(\n          prettier.result.errored\n            .map(({ err, filepath }) =>\n              [filepath, ...(err ? [String(err)] : [])].join(' '),\n            )\n            .join('\\n'),\n        ),\n      ]\n    : [];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAA2B;AAGpB,MAAM,4BAA4B,CACvC,aAEA,CAAC,SAAS,KACN;AAAA,EACE;AAAA,EACA,UAAU,GAAG;AAAA,IACX,SAAS,OAAO,QACb;AAAA,MAAI,CAAC,EAAE,KAAK,SAAS,MACpB,CAAC,UAAU,GAAI,MAAM,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAE,EAAE,KAAK,GAAG;AAAA,IACpD,EACC,KAAK,IAAI;AAAA,EACd;AACF,IACA,CAAC;",
+  "sourcesContent": ["import * as Buildkite from '../../../../api/buildkite';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): string[] =>\n  !prettier.ok\n    ? [\n        '**Prettier**',\n        Buildkite.md.terminal(\n          prettier.result.errored\n            .map(({ err, filepath }) =>\n              [\n                filepath,\n                ...(typeof err === 'string' || err instanceof Error\n                  ? [String(err)]\n                  : []),\n              ].join(' '),\n            )\n            .join('\\n'),\n        ),\n      ]\n    : [];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAA2B;AAGpB,MAAM,4BAA4B,CACvC,aAEA,CAAC,SAAS,KACN;AAAA,EACE;AAAA,EACA,UAAU,GAAG;AAAA,IACX,SAAS,OAAO,QACb;AAAA,MAAI,CAAC,EAAE,KAAK,SAAS,MACpB;AAAA,QACE;AAAA,QACA,GAAI,OAAO,QAAQ,YAAY,eAAe,QAC1C,CAAC,OAAO,GAAG,CAAC,IACZ,CAAC;AAAA,MACP,EAAE,KAAK,GAAG;AAAA,IACZ,EACC,KAAK,IAAI;AAAA,EACd;AACF,IACA,CAAC;",
   "names": []
 }

package/lib/cli/lint/annotate/github/prettier.js

@@ -28,7 +28,7 @@ const createPrettierAnnotations = (prettier) => prettier.result.errored.map((res
     start_line: 1,
     end_line: 1,
     path: result.filepath,
-    message: message ? String(message) : "This file has not been formatted.",
+    message: typeof message === "string" || message instanceof Error ? String(message) : "This file has not been formatted.",
     title: "Prettier"
   };
 });

package/lib/cli/lint/annotate/github/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/annotate/github/prettier.ts"],
-  "sourcesContent": ["import type * as GitHub from '../../../../api/github';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): GitHub.Annotation[] =>\n  prettier.result.errored.map((result) => {\n    const message =\n      result.err instanceof Error ? result.err.message : result.err;\n\n    return {\n      annotation_level: 'failure',\n      start_line: 1,\n      end_line: 1,\n      path: result.filepath,\n      message: message ? String(message) : 'This file has not been formatted.',\n      title: 'Prettier',\n    };\n  });\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,4BAA4B,CACvC,aAEA,SAAS,OAAO,QAAQ,IAAI,CAAC,WAAW;AACtC,QAAM,UACJ,OAAO,eAAe,QAAQ,OAAO,IAAI,UAAU,OAAO;AAE5D,SAAO;AAAA,IACL,kBAAkB;AAAA,IAClB,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,MAAM,OAAO;AAAA,IACb,SAAS,UAAU,OAAO,OAAO,IAAI;AAAA,IACrC,OAAO;AAAA,EACT;AACF,CAAC;",
+  "sourcesContent": ["import type * as GitHub from '../../../../api/github';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): GitHub.Annotation[] =>\n  prettier.result.errored.map((result) => {\n    const message =\n      result.err instanceof Error ? result.err.message : result.err;\n\n    return {\n      annotation_level: 'failure',\n      start_line: 1,\n      end_line: 1,\n      path: result.filepath,\n      message:\n        typeof message === 'string' || message instanceof Error\n          ? String(message)\n          : 'This file has not been formatted.',\n      title: 'Prettier',\n    };\n  });\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,4BAA4B,CACvC,aAEA,SAAS,OAAO,QAAQ,IAAI,CAAC,WAAW;AACtC,QAAM,UACJ,OAAO,eAAe,QAAQ,OAAO,IAAI,UAAU,OAAO;AAE5D,SAAO;AAAA,IACL,kBAAkB;AAAA,IAClB,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,MAAM,OAAO;AAAA,IACb,SACE,OAAO,YAAY,YAAY,mBAAmB,QAC9C,OAAO,OAAO,IACd;AAAA,IACN,OAAO;AAAA,EACT;AACF,CAAC;",
   "names": []
 }

package/lib/wrapper/http.js

@@ -34,19 +34,16 @@ __export(http_exports, {
 });
 module.exports = __toCommonJS(http_exports);
 var import_http = __toESM(require("http"));
-var import_serialize_error = require("serialize-error");
+var import_util = __toESM(require("util"));
 var import_logging = require("../utils/logging");
 const createRequestListenerFromFunction = (fn) => async (req, res) => {
-  const writeJsonResponse = (statusCode, jsonResponse) => {
-    res.writeHead(statusCode, { "Content-Type": "application/json" });
-    return new Promise(
-      (resolve, reject) => jsonResponse === void 0 ? res.end(resolve) : res.write(
-        JSON.stringify(jsonResponse, null, 2),
-        "utf8",
-        (err) => err ? reject(err) : res.end(resolve)
-      )
-    );
-  };
+  const writeResponse = (response) => new Promise(
+    (resolve, reject) => response === void 0 ? res.end(resolve) : res.write(
+      response,
+      "utf8",
+      (err) => err ? reject(err) : res.end(resolve)
+    )
+  );
   try {
     const requestBody = await new Promise((resolve, reject) => {
       const data = [];
@@ -55,9 +52,11 @@ const createRequestListenerFromFunction = (fn) => async (req, res) => {
     const jsonRequest = requestBody ? JSON.parse(requestBody) : [];
     const args = Array.isArray(jsonRequest) ? jsonRequest : [jsonRequest];
     const response = await fn(...args);
-    await writeJsonResponse(200, response);
+    res.writeHead(200, { "Content-Type": "application/json" });
+    await writeResponse(JSON.stringify(response, null, 2));
   } catch (err) {
-    await writeJsonResponse(500, (0, import_serialize_error.serializeError)(err));
+    res.writeHead(500);
+    await writeResponse(import_util.default.inspect(err));
   }
 };
 const serveRequestListener = (requestListener, port) => {

package/lib/wrapper/http.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/http.ts"],
-  "sourcesContent": ["import http from 'http';\nimport type { AddressInfo } from 'net';\n\nimport { serializeError } from 'serialize-error';\n\nimport { log } from '../utils/logging';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n  (fn: (...args: unknown[]) => Promise<unknown>): http.RequestListener =>\n  async (req, res) => {\n    const writeJsonResponse = (statusCode: number, jsonResponse: unknown) => {\n      res.writeHead(statusCode, { 'Content-Type': 'application/json' });\n\n      return new Promise<void>((resolve, reject) =>\n        jsonResponse === undefined\n          ? res.end(resolve)\n          : res.write(JSON.stringify(jsonResponse, null, 2), 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\n      );\n    };\n\n    try {\n      const requestBody = await new Promise<string>((resolve, reject) => {\n        const data: Buffer[] = [];\n\n        req\n          .on('data', (chunk: Buffer) => data.push(chunk))\n          .on('end', () => resolve(Buffer.concat(data).toString()))\n          .on('error', (err) => reject(err));\n      });\n\n      // Treat an empty body as no arguments\n      const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n      // Pass a non-array request body as the first parameter\n      const args: unknown[] = Array.isArray(jsonRequest)\n        ? jsonRequest\n        : [jsonRequest];\n\n      const response: unknown = await fn(...args);\n\n      await writeJsonResponse(200, response);\n    } catch (err) {\n      await writeJsonResponse(500, serializeError(err));\n    }\n  };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n  requestListener: http.RequestListener,\n  port?: number,\n) => {\n  const server = http.createServer(requestListener);\n  return startServer(server, port);\n};\n\n/**\n * Returns a HTTP server wrapped in a promise\n *\n * This function resolves when the server is closed.\n */\nexport const startServer = (server: http.Server, port?: number) =>\n  new Promise<void>((resolve, reject) =>\n    server\n      .listen(port)\n      .on('close', resolve)\n      .on('error', reject)\n      .on('listening', () => {\n        const address = server.address() as AddressInfo;\n\n        log.ok('listening on port', log.bold(address.port));\n      }),\n  );\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,6BAA+B;AAE/B,qBAAoB;AAQb,MAAM,oCACX,CAAC,OACD,OAAO,KAAK,QAAQ;AAClB,QAAM,oBAAoB,CAAC,YAAoB,iBAA0B;AACvE,QAAI,UAAU,YAAY,EAAE,gBAAgB,mBAAmB,CAAC;AAEhE,WAAO,IAAI;AAAA,MAAc,CAAC,SAAS,WACjC,iBAAiB,SACb,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,QAAM,KAAK,UAAU,cAAc,MAAM,CAAC;AAAA,QAAG;AAAA,QAAQ,CAAC,QACxD,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,MACrC;AAAA,IACN;AAAA,EACF;AAEA,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,UAAM,kBAAkB,KAAK,QAAQ;AAAA,EACvC,SAAS,KAAK;AACZ,UAAM,kBAAkB,SAAK,uCAAe,GAAG,CAAC;AAAA,EAClD;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAA,QAAK,aAAa,eAAe;AAChD,SAAO,YAAY,QAAQ,IAAI;AACjC;AAOO,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,EACpD,CAAC;AACL;",
-  "names": ["http"]
+  "sourcesContent": ["import http from 'http';\nimport type { AddressInfo } from 'net';\nimport util from 'util';\n\nimport { log } from '../utils/logging';\n\n/**\n * Create an HTTP request listener based on the supplied function.\n *\n * - The request body is JSON parsed and passed into the function as parameters.\n * - The function's return value is JSON stringified into the response body.\n */\nexport const createRequestListenerFromFunction =\n  (fn: (...args: unknown[]) => Promise<unknown>): http.RequestListener =>\n  async (req, res) => {\n    const writeResponse = (response: unknown) =>\n      new Promise<void>((resolve, reject) =>\n        response === undefined\n          ? res.end(resolve)\n          : res.write(response, 'utf8', (err) =>\n              err ? reject(err) : res.end(resolve),\n            ),\n      );\n\n    try {\n      const requestBody = await new Promise<string>((resolve, reject) => {\n        const data: Buffer[] = [];\n\n        req\n          .on('data', (chunk: Buffer) => data.push(chunk))\n          .on('end', () => resolve(Buffer.concat(data).toString()))\n          .on('error', (err) => reject(err));\n      });\n\n      // Treat an empty body as no arguments\n      const jsonRequest: unknown = requestBody ? JSON.parse(requestBody) : [];\n\n      // Pass a non-array request body as the first parameter\n      const args: unknown[] = Array.isArray(jsonRequest)\n        ? jsonRequest\n        : [jsonRequest];\n\n      const response: unknown = await fn(...args);\n\n      res.writeHead(200, { 'Content-Type': 'application/json' });\n\n      await writeResponse(JSON.stringify(response, null, 2));\n    } catch (err) {\n      res.writeHead(500);\n\n      await writeResponse(util.inspect(err));\n    }\n  };\n\n/**\n * Create a HTTP server based on the supplied `http.RequestListener`.\n *\n * This function resolves when the server is closed.\n */\nexport const serveRequestListener = (\n  requestListener: http.RequestListener,\n  port?: number,\n) => {\n  const server = http.createServer(requestListener);\n  return startServer(server, port);\n};\n\n/**\n * Returns a HTTP server wrapped in a promise\n *\n * This function resolves when the server is closed.\n */\nexport const startServer = (server: http.Server, port?: number) =>\n  new Promise<void>((resolve, reject) =>\n    server\n      .listen(port)\n      .on('close', resolve)\n      .on('error', reject)\n      .on('listening', () => {\n        const address = server.address() as AddressInfo;\n\n        log.ok('listening on port', log.bold(address.port));\n      }),\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,kBAAiB;AAEjB,qBAAoB;AAQb,MAAM,oCACX,CAAC,OACD,OAAO,KAAK,QAAQ;AAClB,QAAM,gBAAgB,CAAC,aACrB,IAAI;AAAA,IAAc,CAAC,SAAS,WAC1B,aAAa,SACT,IAAI,IAAI,OAAO,IACf,IAAI;AAAA,MAAM;AAAA,MAAU;AAAA,MAAQ,CAAC,QAC3B,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,OAAO;AAAA,IACrC;AAAA,EACN;AAEF,MAAI;AACF,UAAM,cAAc,MAAM,IAAI,QAAgB,CAAC,SAAS,WAAW;AACjE,YAAM,OAAiB,CAAC;AAExB,UACG,GAAG,QAAQ,CAAC,UAAkB,KAAK,KAAK,KAAK,CAAC,EAC9C,GAAG,OAAO,MAAM,QAAQ,OAAO,OAAO,IAAI,EAAE,SAAS,CAAC,CAAC,EACvD,GAAG,SAAS,CAAC,QAAQ,OAAO,GAAG,CAAC;AAAA,IACrC,CAAC;AAGD,UAAM,cAAuB,cAAc,KAAK,MAAM,WAAW,IAAI,CAAC;AAGtE,UAAM,OAAkB,MAAM,QAAQ,WAAW,IAC7C,cACA,CAAC,WAAW;AAEhB,UAAM,WAAoB,MAAM,GAAG,GAAG,IAAI;AAE1C,QAAI,UAAU,KAAK,EAAE,gBAAgB,mBAAmB,CAAC;AAEzD,UAAM,cAAc,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,EACvD,SAAS,KAAK;AACZ,QAAI,UAAU,GAAG;AAEjB,UAAM,cAAc,YAAAA,QAAK,QAAQ,GAAG,CAAC;AAAA,EACvC;AACF;AAOK,MAAM,uBAAuB,CAClC,iBACA,SACG;AACH,QAAM,SAAS,YAAAC,QAAK,aAAa,eAAe;AAChD,SAAO,YAAY,QAAQ,IAAI;AACjC;AAOO,MAAM,cAAc,CAAC,QAAqB,SAC/C,IAAI;AAAA,EAAc,CAAC,SAAS,WAC1B,OACG,OAAO,IAAI,EACX,GAAG,SAAS,OAAO,EACnB,GAAG,SAAS,MAAM,EAClB,GAAG,aAAa,MAAM;AACrB,UAAM,UAAU,OAAO,QAAQ;AAE/B,uBAAI,GAAG,qBAAqB,mBAAI,KAAK,QAAQ,IAAI,CAAC;AAAA,EACpD,CAAC;AACL;",
+  "names": ["util", "http"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.1.0",
+  "version": "9.2.0-main-20250115035914",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -73,7 +73,7 @@
     "function-arguments": "^1.0.9",
     "get-port": "^5.1.1",
     "golden-fleece": "^1.0.9",
-    "ignore": "^5.1.8",
+    "ignore": "^7.0.0",
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
@@ -85,11 +85,10 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.3.0",
+    "prettier": "~3.4.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
-    "serialize-error": "^8.0.1",
     "simple-git": "^3.5.0",
     "ts-dedent": "^2.2.0",
     "ts-jest": "^29.1.0",
@@ -97,13 +96,13 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
-    "typescript": "~5.6.0",
+    "typescript": "~5.7.0",
     "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0"
+    "eslint-config-skuba": "5.1.0-main-20250115035914"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.9",
+    "@changesets/cli": "2.27.11",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
@@ -117,15 +116,16 @@
     "@types/module-alias": "2.0.4",
     "@types/npm-which": "3.0.3",
     "@types/picomatch": "3.0.1",
+    "@types/semver": "7.5.8",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.17.1",
-    "express": "4.21.1",
-    "fastify": "5.0.0",
+    "enhanced-resolve": "5.18.0",
+    "express": "4.21.2",
+    "fastify": "5.2.0",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
     "koa": "2.15.3",
-    "memfs": "4.13.0",
+    "memfs": "4.15.1",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.0",
     "semver": "7.6.3",

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

@@ -9,7 +9,7 @@ configs:
           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.0: &docker-ecr-cache-defaults
+      seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
           - .npmrc
           - package.json#.packageManager
@@ -18,7 +18,7 @@ configs:
         secrets: id=npm,src=/tmp/.npmrc
 
     - &private-npm
-      seek-oss/private-npm#v1.2.0:
+      seek-oss/private-npm#v1.3.0:
         env: NPM_READ_TOKEN
         output-path: /tmp/
 
@@ -38,7 +38,7 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - seek-oss/docker-ecr-cache#v2.2.0:
+      - seek-oss/docker-ecr-cache#v2.2.1:
           <<: *docker-ecr-cache-defaults
           skip-pull-from-cache: true
 
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.4.1:
+      - docker-compose#v5.5.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

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

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

@@ -8,7 +8,4 @@ buildArgs:
   # https://github.com/seek-oss/docker-ecr-cache-buildkite-plugin#building-on-the-resulting-image
   BASE_IMAGE: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_IMAGE}}:{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_TAG}}'
 
-# SEEK-Jobs/gantry#1661
-failOnScanFindings: false
-
 cpuArchitecture: <%- platformName %>

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

@@ -20,15 +20,15 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
+    "@types/express": "^5.0.0",
     "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
-    "pino-pretty": "^11.0.0",
+    "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.15.3",
   "engines": {
     "node": ">=20"
   }

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

@@ -11,7 +11,7 @@ configs:
           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.0:
+      seek-oss/docker-ecr-cache#v2.2.1:
         cache-on:
           - .npmrc
           - package.json#.packageManager
@@ -19,7 +19,7 @@ configs:
         secrets: id=npm,src=/tmp/.npmrc
 
     - &private-npm
-      seek-oss/private-npm#v1.2.0:
+      seek-oss/private-npm#v1.3.0:
         env: NPM_READ_TOKEN
         output-path: /tmp/
 
@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.4.1:
+      - docker-compose#v5.5.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/Dockerfile

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

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "*"
+    "skuba": "9.2.0-main-20250115035914"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.15.3",
   "engines": {
     "node": ">=20"
   }

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

@@ -9,7 +9,7 @@ configs:
           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.0: &docker-ecr-cache-defaults
+      seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
           - .npmrc
           - package.json#.packageManager
@@ -18,7 +18,7 @@ configs:
         secrets: id=npm,src=/tmp/.npmrc
 
     - &private-npm
-      seek-oss/private-npm#v1.2.0:
+      seek-oss/private-npm#v1.3.0:
         env: NPM_READ_TOKEN
         output-path: /tmp/
 
@@ -38,7 +38,7 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - seek-oss/docker-ecr-cache#v2.2.0:
+      - seek-oss/docker-ecr-cache#v2.2.1:
           <<: *docker-ecr-cache-defaults
           skip-pull-from-cache: true
 
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.4.1:
+      - docker-compose#v5.5.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

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

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

@@ -8,7 +8,4 @@ buildArgs:
   # https://github.com/seek-oss/docker-ecr-cache-buildkite-plugin#building-on-the-resulting-image
   BASE_IMAGE: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_IMAGE}}:{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_TAG}}'
 
-# SEEK-Jobs/gantry#1661
-failOnScanFindings: false
-
 cpuArchitecture: <%- platformName %>

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

@@ -17,11 +17,11 @@
     "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
-    "@opentelemetry/instrumentation-http": "^0.53.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.57.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.49.0",
+    "@opentelemetry/instrumentation-http": "^0.57.0",
     "@opentelemetry/propagator-b3": "^1.25.0",
-    "@opentelemetry/sdk-node": "^0.53.0",
+    "@opentelemetry/sdk-node": "^0.57.0",
     "@seek/logger": "^9.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
@@ -40,11 +40,11 @@
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
-    "pino-pretty": "^11.0.0",
+    "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.15.3",
   "engines": {
     "node": ">=20"
   }

package/template/koa-rest-api/src/framework/server.test.ts

@@ -232,7 +232,6 @@ describe('createApp', () => {
     const err = chance.sentence();
 
     middleware.mockImplementation(() => {
-      // eslint-disable-next-line @typescript-eslint/only-throw-error
       throw err;
     });
 

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

@@ -9,7 +9,7 @@ configs:
           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.0: &docker-ecr-cache-defaults
+      seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
           - .npmrc
           - package.json#.packageManager
@@ -17,7 +17,7 @@ configs:
         secrets: id=npm,src=/tmp/.npmrc
 
     - &private-npm
-      seek-oss/private-npm#v1.2.0:
+      seek-oss/private-npm#v1.3.0:
         env: NPM_READ_TOKEN
         output-path: /tmp/
 
@@ -36,7 +36,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.4.1:
+        - docker-compose#v5.5.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.4.1:
+      - docker-compose#v5.5.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -82,7 +82,7 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - seek-oss/docker-ecr-cache#v2.2.0:
+      - seek-oss/docker-ecr-cache#v2.2.1:
           <<: *docker-ecr-cache-defaults
           skip-pull-from-cache: true
 

package/template/lambda-sqs-worker/Dockerfile

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

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

@@ -31,14 +31,14 @@
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
-    "pino-pretty": "^11.0.0",
+    "pino-pretty": "^13.0.0",
     "serverless": "^3.39.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
     "serverless-plugin-datadog": "^5.12.0",
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.15.3",
   "engines": {
     "node": ">=20"
   }

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

@@ -9,7 +9,7 @@ configs:
           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.0: &docker-ecr-cache-defaults
+      seek-oss/docker-ecr-cache#v2.2.1: &docker-ecr-cache-defaults
         cache-on:
           - .npmrc
           - package.json#.packageManager
@@ -17,7 +17,7 @@ configs:
         secrets: id=npm,src=/tmp/.npmrc
 
     - &private-npm
-      seek-oss/private-npm#v1.2.0:
+      seek-oss/private-npm#v1.3.0:
         env: NPM_READ_TOKEN
         output-path: /tmp/
 
@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.4.1:
+        - docker-compose#v5.5.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.4.1:
+      - docker-compose#v5.5.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -78,7 +78,7 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - seek-oss/docker-ecr-cache#v2.2.0:
+      - seek-oss/docker-ecr-cache#v2.2.1:
           <<: *docker-ecr-cache-defaults
           skip-pull-from-cache: true
 

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

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

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

@@ -14,9 +14,10 @@ Next steps:
 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 [infra/config.ts](infra/config.ts).
-5. [ ] Push local commits to the upstream GitHub branch.
-6. [ ] Configure [GitHub repository settings].
-7. [ ] Delete this checklist 😌.
+5. [ ] For the smoke test, make sure Lambda has permissions to publish SNS message and configure `sourceSnsTopicArn` in [infra/config.ts](infra/config.ts).
+6. [ ] Push local commits to the upstream GitHub branch.
+7. [ ] Configure [GitHub repository settings].
+8. [ ] Delete this checklist 😌.
 
 [Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
 [GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings

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

@@ -187,7 +187,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SITE": "datadoghq.com",
-            "DD_TAGS": "git.commit.sha:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,git.repository_url:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
             "DD_TRACE_ENABLED": "true",
             "DESTINATION_SNS_TOPIC_ARN": {
               "Ref": "destinationtopicDCE2E0B8",
@@ -604,6 +603,13 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
       "Properties": {
         "PolicyDocument": {
           "Statement": [
+            {
+              "Action": "sns:Publish",
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "destinationtopicDCE2E0B8",
+              },
+            },
             {
               "Action": [
                 "secretsmanager:GetSecretValue",
@@ -907,7 +913,6 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SITE": "datadoghq.com",
-            "DD_TAGS": "git.commit.sha:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,git.repository_url:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
             "DD_TRACE_ENABLED": "true",
             "DESTINATION_SNS_TOPIC_ARN": {
               "Ref": "destinationtopicDCE2E0B8",
@@ -1324,6 +1329,13 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
       "Properties": {
         "PolicyDocument": {
           "Statement": [
+            {
+              "Action": "sns:Publish",
+              "Effect": "Allow",
+              "Resource": {
+                "Ref": "destinationtopicDCE2E0B8",
+              },
+            },
             {
               "Action": [
                 "secretsmanager:GetSecretValue",

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

@@ -16,9 +16,11 @@ jest.useFakeTimers({
 });
 
 const originalEnv = process.env.ENVIRONMENT;
+const originalVersion = process.env.VERSION;
 
 afterAll(() => {
   process.env.ENVIRONMENT = originalEnv;
+  process.env.VERSION = originalVersion;
 });
 
 afterEach(() => {
@@ -29,6 +31,7 @@ it.each(['dev', 'prod'])(
   'returns expected CloudFormation stack for %s',
   async (env) => {
     process.env.ENVIRONMENT = env;
+    process.env.VERSION = 'local';
 
     const { AppStack } = await import('./appStack');
 
@@ -63,9 +66,8 @@ it.each(['dev', 'prod'])(
       )
       .replaceAll(/"Value":"v\d+\.\d+\.\d+"/g, (_) => `"Value": "vx.x.x"`)
       .replace(
-        /"DD_TAGS":"git.commit.sha:([0-9a-f]+),git.repository_url:([^\"]+)"/g,
-        (_, sha, url) =>
-          `"DD_TAGS":"git.commit.sha:${'x'.repeat(sha.length)},git.repository_url:${'x'.repeat(url.length)}"`,
+        /"DD_TAGS":"git.commit.sha:([0-9a-f]+),git.repository_url:([^\"]+)",/g,
+        '',
       )
       .replaceAll(
         /(layer:Datadog-Extension-.+?:)\d+/g,

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

@@ -109,6 +109,8 @@ export class AppStack extends Stack {
       reservedConcurrentExecutions: config.workerLambda.reservedConcurrency,
     });
 
+    destinationTopic.grantPublish(worker);
+
     const datadogSecret = aws_secretsmanager.Secret.fromSecretPartialArn(
       this,
       'datadog-api-key-secret',

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

@@ -8,6 +8,7 @@
     "deploy:watch": "pnpm --silent deploy:hotswap --watch",
     "format": "skuba format",
     "lint": "skuba lint",
+    "start": "skuba start --port <%- port %>",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",
     "test:watch": "skuba test --watch"
@@ -27,17 +28,17 @@
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
     "@types/node": "^20.16.5",
-    "aws-cdk": "^2.109.0",
-    "aws-cdk-lib": "^2.109.0",
+    "aws-cdk": "^2.167.1",
+    "aws-cdk-lib": "^2.167.1",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^1.18.0",
-    "pino-pretty": "^11.0.0",
-    "skuba": "*"
+    "pino-pretty": "^13.0.0",
+    "skuba": "9.2.0-main-20250115035914"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.15.3",
   "engines": {
     "node": ">=20"
   }