skuba 8.1.0-configure-stdin-20240509055640 → 8.1.0-main-20240625003658

package/lib/utils/template.d.ts

@@ -47,9 +47,9 @@ export declare const templateConfigSchema: z.ZodObject<{
         validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
     }[];
     packageManager: "yarn" | "pnpm";
+    type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;
     noSkip?: boolean | undefined;
-    type?: "package" | "application" | undefined;
 }, {
     fields: {
         message: string;
@@ -57,10 +57,10 @@ export declare const templateConfigSchema: z.ZodObject<{
         initial: string;
         validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
     }[];
+    type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;
-    noSkip?: boolean | undefined;
     packageManager?: "yarn" | "pnpm" | undefined;
-    type?: "package" | "application" | undefined;
+    noSkip?: boolean | undefined;
 }>;
 export declare const TEMPLATE_CONFIG_FILENAME = "skuba.template.js";
 export declare const TEMPLATE_DIR: string;

package/lib/wrapper/http.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import http from 'http';
 /**
  * Create an HTTP request listener based on the supplied function.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.1.0-configure-stdin-20240509055640",
+  "version": "8.1.0-main-20240625003658",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -63,7 +63,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.20.0",
+    "esbuild": "~0.21.0",
     "eslint": "^8.56.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -84,7 +84,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.2.5",
+    "prettier": "~3.3.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
@@ -97,20 +97,20 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "typescript": "~5.4.0",
+    "typescript": "~5.5.0",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "4.0.0"
+    "eslint-config-skuba": "4.1.0-main-20240625003658"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.1",
+    "@changesets/cli": "2.27.5",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
     "@types/ejs": "3.1.5",
     "@types/express": "4.17.21",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "2.14.0",
+    "@types/koa": "2.15.0",
     "@types/libnpmsearch": "2.0.7",
     "@types/lodash.mergewith": "4.6.9",
     "@types/module-alias": "2.0.4",
@@ -118,17 +118,17 @@
     "@types/picomatch": "2.3.3",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.15.0",
+    "enhanced-resolve": "5.17.0",
     "express": "4.19.2",
-    "fastify": "4.26.1",
+    "fastify": "4.28.0",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.0",
-    "memfs": "4.6.0",
-    "remark-cli": "12.0.0",
-    "remark-preset-lint-recommended": "6.1.3",
-    "semver": "7.6.0",
-    "supertest": "6.3.4",
+    "koa": "2.15.3",
+    "memfs": "4.9.3",
+    "remark-cli": "12.0.1",
+    "remark-preset-lint-recommended": "7.0.0",
+    "semver": "7.6.2",
+    "supertest": "7.0.0",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {

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

@@ -1,6 +1,4 @@
 environment: dev
-env:
-  SOME_ENVIRONMENT_VARIABLE: dev-value
 
 maxInstanceCount: 1
 minInstanceCount: 1

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

@@ -1,6 +1,4 @@
 environment: prod
-env:
-  SOME_ENVIRONMENT_VARIABLE: prod-value
 
 maxInstanceCount: 10
 minInstanceCount: 3

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

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

@@ -9,16 +9,9 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-  AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
-
   ENVIRONMENT: '{{values "environment"}}'
   SERVICE: '{{values "service"}}'
 
-  {{range $key, $value := .Values.env}}
-  {{$key}}: {{$value}}
-  {{end}}
-
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}

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

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -14,6 +15,8 @@
   "dependencies": {
     "@seek/logger": "^6.0.0",
     "express": "^4.17.1",
+    "hot-shots": "^10.0.0",
+    "seek-datadog-custom-metrics": "^4.6.3",
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
@@ -23,9 +26,9 @@
     "mime": "^4.0.1",
     "pino-pretty": "^11.0.0",
     "skuba": "*",
-    "supertest": "^6.1.6"
+    "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }

package/template/express-rest-api/src/config.ts

@@ -7,8 +7,8 @@ interface Config {
   name: string;
   version: string;
 
-  metricsServer?: string;
-  port?: number;
+  metricsServer: string | null;
+  port: number | null;
 }
 
 type Environment = (typeof environments)[number];
@@ -26,19 +26,27 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
     logLevel: 'debug',
     name: '<%- serviceName %>',
     version: 'local',
+
+    metricsServer: null,
+    port: null,
   }),
 
   test: () => ({
-    ...configs.local(),
-
     logLevel: Env.string('LOG_LEVEL', { default: 'silent' }),
+    name: '<%- serviceName %>',
     version: 'test',
+
+    metricsServer: null,
+    port: null,
   }),
 
   [dev]: () => ({
-    ...configs[prod](),
-
     logLevel: 'debug',
+    name: Env.string('SERVICE'),
+    version: Env.string('VERSION'),
+
+    metricsServer: 'localhost',
+    port: Env.nonNegativeInteger('PORT'),
   }),
 
   [prod]: () => ({

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

@@ -2,7 +2,7 @@ import createLogger from '@seek/logger';
 
 import { config } from 'src/config';
 
-export const rootLogger = createLogger({
+export const logger = createLogger({
   base: {
     environment: config.environment,
     version: config.version,

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

@@ -0,0 +1,11 @@
+import { StatsD } from 'hot-shots';
+import { createStatsDClient } from 'seek-datadog-custom-metrics';
+
+import { config } from 'src/config';
+
+import { logger } from './logging';
+
+/* istanbul ignore next: StatsD client is not our responsibility */
+export const metricsClient = createStatsDClient(StatsD, config, (err) =>
+  logger.error({ err }, 'StatsD error'),
+);

package/template/express-rest-api/src/listen.ts

@@ -2,7 +2,7 @@ import './register';
 
 import app from './app';
 import { config } from './config';
-import { rootLogger } from './framework/logging';
+import { logger } from './framework/logging';
 
 // If your application is deployed with more than 1 vCPU you can delete this
 // file and use a clustering utility to run `lib/app`.
@@ -11,7 +11,7 @@ const listener = app.listen(config.port, () => {
   const address = listener.address();
 
   if (typeof address === 'object' && address) {
-    rootLogger.debug(`listening on port ${address.port}`);
+    logger.debug(`listening on port ${address.port}`);
   }
 });
 

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

package/template/greeter/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

package/template/greeter/package.json

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/greeter",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -16,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "*"
+    "skuba": "8.1.0-main-20240625003658"
   },
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -1,6 +1,4 @@
 environment: dev
-env:
-  SOME_ENVIRONMENT_VARIABLE: dev-value
 
 maxInstanceCount: 1
 minInstanceCount: 1

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

@@ -1,6 +1,4 @@
 environment: prod
-env:
-  SOME_ENVIRONMENT_VARIABLE: prod-value
 
 maxInstanceCount: 10
 minInstanceCount: 3

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

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

@@ -9,17 +9,10 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-  AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
-
   ENVIRONMENT: '{{values "environment"}}'
   OPENTELEMETRY_ENABLED: '{{.Values.openTelemetry.enabled | default false}}'
   SERVICE: '{{values "service"}}'
 
-  {{range $key, $value := .Values.env}}
-  {{$key}}: {{$value}}
-  {{end}}
-
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}

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

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -13,20 +14,19 @@
   },
   "dependencies": {
     "@koa/router": "^12.0.0",
-    "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/core": "^1.18.1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.50.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.40.0",
-    "@opentelemetry/instrumentation-http": "^0.50.0",
-    "@opentelemetry/propagator-b3": "^1.18.1",
-    "@opentelemetry/sdk-node": "^0.50.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^1.25.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.52.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.42.0",
+    "@opentelemetry/instrumentation-http": "^0.52.0",
+    "@opentelemetry/propagator-b3": "^1.25.0",
+    "@opentelemetry/sdk-node": "^0.52.0",
     "@seek/logger": "^6.0.0",
-    "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
-    "koa-compose": "^4.2.0",
-    "seek-datadog-custom-metrics": "^4.2.1",
+    "koa-compose": "^4.1.0",
+    "seek-datadog-custom-metrics": "^4.6.3",
     "seek-koala": "^7.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -42,9 +42,9 @@
     "mime": "^4.0.1",
     "pino-pretty": "^11.0.0",
     "skuba": "*",
-    "supertest": "^6.1.6"
+    "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }

package/template/koa-rest-api/src/config.ts

@@ -7,8 +7,8 @@ interface Config {
   name: string;
   version: string;
 
-  metricsServer?: string;
-  port?: number;
+  metricsServer: string | null;
+  port: number | null;
 }
 
 type Environment = (typeof environments)[number];
@@ -26,19 +26,29 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
     logLevel: 'debug',
     name: '<%- serviceName %>',
     version: 'local',
+
+    metricsServer: null,
+    port: null,
   }),
 
   test: () => ({
-    ...configs.local(),
-
     logLevel: Env.string('LOG_LEVEL', { default: 'silent' }),
+    name: '<%- serviceName %>',
     version: 'test',
+
+    metricsServer: null,
+    port: null,
   }),
 
   [dev]: () => ({
     ...configs[prod](),
 
     logLevel: 'debug',
+    name: Env.string('SERVICE'),
+    version: Env.string('VERSION'),
+
+    metricsServer: 'localhost',
+    port: Env.nonNegativeInteger('PORT'),
   }),
 
   [prod]: () => ({

package/template/lambda-sqs-worker/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

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

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -31,13 +32,13 @@
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "pino-pretty": "^11.0.0",
-    "serverless": "^3.37.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.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }

package/template/lambda-sqs-worker/src/config.ts

@@ -29,16 +29,21 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
   }),
 
   test: () => ({
-    ...configs.local(),
-
     logLevel: Env.string('LOG_LEVEL', { default: 'silent' }),
+    metrics: false,
+    name: '<%- serviceName %>',
     version: 'test',
+
+    destinationSnsTopicArn: 'arn:aws:sns:us-east-2:123456789012:destination',
   }),
 
   dev: () => ({
-    ...configs.prod(),
-
     logLevel: 'debug',
+    metrics: true,
+    name: Env.string('SERVICE'),
+    version: Env.string('VERSION'),
+
+    destinationSnsTopicArn: Env.string('DESTINATION_SNS_TOPIC_ARN'),
   }),
 
   prod: () => ({

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

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

@@ -451,6 +451,8 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "ENVIRONMENT": "dev",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName",
@@ -644,6 +646,8 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName-post-hook",
@@ -796,6 +800,8 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName-pre-hook",
@@ -1493,6 +1499,8 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "ENVIRONMENT": "prod",
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName",
@@ -1686,6 +1694,8 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName-post-hook",
@@ -1838,6 +1848,8 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             },
             "NODE_ENV": "production",
             "NODE_OPTIONS": "--enable-source-maps",
+            "SERVICE": "serviceName",
+            "VERSION": "local",
           },
         },
         "FunctionName": "serviceName-pre-hook",

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

@@ -1,27 +1,33 @@
-import { z } from 'zod';
+import { Env } from 'skuba-dive';
 
-const environment = z.enum(['dev', 'prod']).parse(process.env.ENVIRONMENT);
+const ENVIRONMENTS = ['dev', 'prod'] as const;
 
-type Environment = typeof environment;
+type Environment = (typeof ENVIRONMENTS)[number];
 
-export interface Config {
+const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
+
+interface Config {
   appName: string;
   workerLambda: {
     reservedConcurrency: number;
     environment: {
       ENVIRONMENT: Environment;
+      SERVICE: string;
+      VERSION: string;
     };
   };
   sourceSnsTopicArn: string;
 }
 
-export const configs: Record<Environment, Config> = {
+const configs: Record<Environment, Config> = {
   dev: {
     appName: '<%- serviceName %>',
     workerLambda: {
       reservedConcurrency: 2,
       environment: {
         ENVIRONMENT: 'dev',
+        SERVICE: '<%- serviceName %>',
+        VERSION: Env.string('VERSION', { default: 'local' }),
       },
     },
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
@@ -32,10 +38,12 @@ export const configs: Record<Environment, Config> = {
       reservedConcurrency: 20,
       environment: {
         ENVIRONMENT: 'prod',
+        SERVICE: '<%- serviceName %>',
+        VERSION: Env.string('VERSION', { default: 'local' }),
       },
     },
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
 };
 
-export const config = configs[environment];
+export const config: Config = configs[environment];

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

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -16,6 +17,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/logger": "^6.0.0",
+    "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },
   "devDependencies": {
@@ -24,9 +26,10 @@
     "aws-cdk": "^2.109.0",
     "aws-cdk-lib": "^2.109.0",
     "constructs": "^10.0.17",
-    "skuba": "*"
+    "pino-pretty": "^11.0.0",
+    "skuba": "8.1.0-main-20240625003658"
   },
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }