skuba 3.15.2 → 3.15.3-beta.0

package/lib/cli/lint/external.js

@@ -23,10 +23,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.externalLint = void 0;
+exports.externalLint = exports.StreamInterceptor = void 0;
 const stream_1 = __importDefault(require("stream"));
-const __1 = require("../..");
 const logging_1 = require("../../utils/logging");
+const annotate_1 = require("./annotate");
 const eslint_1 = require("./eslint");
 const prettier_1 = require("./prettier");
 const tsc_1 = require("./tsc");
@@ -43,6 +43,7 @@ class StreamInterceptor extends stream_1.default.Transform {
         callback(null, chunk);
     }
 }
+exports.StreamInterceptor = StreamInterceptor;
 const lintConcurrently = (_a) => __awaiter(void 0, void 0, void 0, function* () {
     var { tscOutputStream } = _a, input = __rest(_a, ["tscOutputStream"]);
     const [eslint, prettier, tscOk] = yield Promise.all([
@@ -86,48 +87,18 @@ const externalLint = (input) => __awaiter(void 0, void 0, void 0, function* () {
     const tscOutputStream = new StreamInterceptor();
     tscOutputStream.pipe((_c = input.tscOutputStream) !== null && _c !== void 0 ? _c : process.stdout);
     const { eslint, prettier, tscOk } = yield lint(Object.assign(Object.assign({}, input), { tscOutputStream }));
-    if (eslint.ok && prettier.ok && tscOk) {
-        return;
-    }
     const tools = [
         ...(eslint.ok ? [] : ['ESLint']),
         ...(prettier.ok ? [] : ['Prettier']),
         ...(tscOk ? [] : ['tsc']),
     ];
+    const summary = `${tools.join(', ')} found issues that require triage.`;
+    yield (0, annotate_1.createAnnotations)(eslint, prettier, tscOk, tscOutputStream, summary);
+    if (eslint.ok && prettier.ok && tscOk) {
+        return;
+    }
     logging_1.log.newline();
-    logging_1.log.err(tools.join(', '), 'found issues that require triage.');
-    const buildkiteOutput = [
-        '`skuba lint` found issues that require triage:',
-        ...(eslint.ok
-            ? []
-            : ['**ESLint**', __1.Buildkite.md.terminal(eslint.output.trim())]),
-        ...(prettier.ok
-            ? []
-            : [
-                '**Prettier**',
-                __1.Buildkite.md.terminal(prettier.result.errored
-                    .map(({ err, filepath }) => [filepath, ...(err ? [String(err)] : [])].join(' '))
-                    .join('\n')),
-            ]),
-        ...(tscOk
-            ? []
-            : [
-                '**tsc**',
-                __1.Buildkite.md.terminal(tscOutputStream
-                    .output()
-                    .split('\n')
-                    .filter(Boolean)
-                    .map((line) => line.replace(/^tsc\s+│ /, ''))
-                    .filter((line) => !line.startsWith('TSFILE: '))
-                    .join('\n')
-                    .trim()),
-            ]),
-    ].join('\n\n');
-    yield __1.Buildkite.annotate(buildkiteOutput, {
-        context: 'skuba-lint-external',
-        scopeContextToStep: true,
-        style: 'error',
-    });
+    logging_1.log.err(summary);
     process.exitCode = 1;
 });
 exports.externalLint = externalLint;

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

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

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

@@ -9,7 +9,7 @@ export interface Input {
     /**
      * Whether to disable parallelism to run linting operations serially.
      *
-     * This can be useful for executing in compute-constrained environments and
+     * This can be useful for executing in resource-constrained environments and
      * snapshotting deterministic output in tests.
      *
      * Defaults to `false`.

package/lib/index.d.ts

@@ -9,6 +9,7 @@
  * const { Net } = require('skuba');
  * ```
  */
+export * as GitHub from './api/github';
 export * as Buildkite from './api/buildkite';
 export * as Jest from './api/jest';
 export * as Net from './api/net';

package/lib/index.js

@@ -30,7 +30,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Net = exports.Jest = exports.Buildkite = void 0;
+exports.Net = exports.Jest = exports.Buildkite = exports.GitHub = void 0;
+exports.GitHub = __importStar(require("./api/github"));
 exports.Buildkite = __importStar(require("./api/buildkite"));
 exports.Jest = __importStar(require("./api/jest"));
 exports.Net = __importStar(require("./api/net"));

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAA6C;AAC7C,mDAAmC;AACnC,iDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;AAEH,uDAAuC;AACvC,6DAA6C;AAC7C,mDAAmC;AACnC,iDAAiC"}

package/lib/utils/args.d.ts

@@ -15,7 +15,7 @@ export declare const hasSerialFlag: (args?: string[], env?: NodeJS.ProcessEnv) =
  * ```
  */
 export declare const parseProcessArgs: (args?: string[]) => {
-    commandName: "format" | "node" | "test" | "version" | "build" | "build-package" | "configure" | "help" | "init" | "lint" | "release" | "start";
+    commandName: "test" | "release" | "format" | "node" | "version" | "build" | "build-package" | "configure" | "help" | "init" | "lint" | "start";
     args: string[];
 };
 interface RunArgs {

package/package.json

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

package/template/base/_.prettierignore

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

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

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

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

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

package/template/express-rest-api/Dockerfile

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

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

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

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

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

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

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

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

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

package/template/greeter/.nvmrc

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

package/template/greeter/Dockerfile

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

package/template/greeter/package.json

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

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

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

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

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

package/template/koa-rest-api/Dockerfile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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