hammerkit 1.7.0 → 1.9.0

package/dist/planner/work-service.js

@@ -1,6 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContainerWorkService = void 0;
+exports.getHealthcheckCommand = exports.getServiceCommand = exports.getServiceWorkingDir = exports.isContainerWorkService = void 0;
 const isContainerWorkService = (svc) => 'image' in svc && svc.type === 'container-service';
 exports.isContainerWorkService = isContainerWorkService;
+// The container's working directory: the declared `workdir`, else the build
+// file's directory (the default every runtime applied before `workdir`).
+const getServiceWorkingDir = (service) => service.workdir ?? service.cwd;
+exports.getServiceWorkingDir = getServiceWorkingDir;
+// The container's entrypoint and command for a service: with a `shell`, its
+// `cmd` runs as `<shell> -c "<cmd>"` in place of the image entrypoint; without
+// one the tokenized `cmd` becomes the command and the image entrypoint stays.
+function getServiceCommand(service) {
+    if (!service.cmd) {
+        return { entrypoint: null, cmd: null };
+    }
+    if (service.shell) {
+        return { entrypoint: [service.shell, '-c'], cmd: [service.cmd.cmd] };
+    }
+    return { entrypoint: null, cmd: [service.cmd.parsed.command, ...service.cmd.parsed.args] };
+}
+exports.getServiceCommand = getServiceCommand;
+// The healthcheck as an exec command, through the service's `shell` if it has one.
+function getHealthcheckCommand(service) {
+    if (!service.healthcheck) {
+        return null;
+    }
+    const cmd = service.healthcheck.cmd;
+    return service.shell ? [service.shell, '-c', cmd.cmd] : [cmd.parsed.command, ...cmd.parsed.args];
+}
+exports.getHealthcheckCommand = getHealthcheckCommand;
 //# sourceMappingURL=work-service.js.map

package/dist/program.js

@@ -228,13 +228,13 @@ async function getProgram(environment, argv) {
                 if (validation.type === 'error') {
                     errors++;
                 }
-                for (const [buildFilename, errors] of Object.entries(fileErrors)) {
-                    environment.stdout.write(`${colors_1.default.underline(colors_1.default.gray(buildFilename))}\n`);
-                    for (const error of errors) {
-                        environment.stdout.write(` ${colors_1.default.underline(colors_1.default.blue(error.type))} at ${colors_1.default.gray(error.item.name)} ${error.message}\n`);
-                    }
-                    environment.stdout.write('\n');
+            }
+            for (const [buildFilename, errors] of Object.entries(fileErrors)) {
+                environment.stdout.write(`${colors_1.default.underline(colors_1.default.gray(buildFilename))}\n`);
+                for (const error of errors) {
+                    environment.stdout.write(` ${colors_1.default.underline(colors_1.default.blue(error.type))} at ${colors_1.default.gray(error.item.name)} ${error.message}\n`);
                 }
+                environment.stdout.write('\n');
             }
             if (errors !== 0) {
                 program.error('Detected errors in the hammerkit configuration', { exitCode: 1 });

package/dist/schema/build-file-container-service-schema.js

@@ -18,6 +18,14 @@ exports.buildFileContainerServiceSchema = (0, zod_1.object)({
     src: (0, zod_1.array)((0, zod_1.string)()).optional(),
     needs: (0, zod_1.array)(build_file_need_schema_1.buildFileNeedSchema).optional(),
     cmd: (0, zod_1.string)().optional(),
+    // Absolute path inside the container. Without it the service runs in the
+    // build file's directory, like a task; images whose entrypoint expects their
+    // own WORKDIR (relative `./dist/…` paths, `npm start`) need it.
+    workdir: (0, zod_1.string)().optional(),
+    // Runs `cmd` and the healthcheck as `<shell> -c "<cmd>"` (replacing the
+    // image entrypoint for `cmd`), like a task's `shell`. Without it both are
+    // split into exec-form arguments.
+    shell: (0, zod_1.string)().optional(),
     volumes: (0, zod_1.array)((0, zod_1.string)()).optional(),
     labels: labels_schema_1.labelsSchema.optional(),
     continuous: (0, zod_1.boolean)().optional(),

package/dist/schema/build-file-environment-schema-http-route.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildFileEnvironmentSchemaHttpRoute = void 0;
+const zod_1 = require("zod");
+// A Gateway API HTTPRoute exposing a service of the environment under a hostname.
+exports.buildFileEnvironmentSchemaHttpRoute = (0, zod_1.object)({
+    host: (0, zod_1.string)(),
+    service: (0, zod_1.string)(),
+    servicePort: (0, zod_1.number)().optional(),
+    path: (0, zod_1.string)().optional(),
+    // the parent Gateway the route attaches to
+    gateway: (0, zod_1.string)(),
+    gatewayNamespace: (0, zod_1.string)().optional(),
+}).strict();
+//# sourceMappingURL=build-file-environment-schema-http-route.js.map

package/dist/schema/build-file-environment-schema.js

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildFileEnvironmentSchema = exports.buildFileDockerEnvironmentSchema = exports.buildFileKubernetesEnvironmentSchema = void 0;
 const zod_1 = require("zod");
-const build_file_environment_schema_ingress_1 = require("./build-file-environment-schema-ingress");
+const build_file_environment_schema_http_route_1 = require("./build-file-environment-schema-http-route");
 exports.buildFileKubernetesEnvironmentSchema = (0, zod_1.object)({
     namespace: (0, zod_1.string)().optional(),
     context: (0, zod_1.string)(),
     kubeconfig: (0, zod_1.string)().optional(),
-    ingresses: (0, zod_1.array)(build_file_environment_schema_ingress_1.buildFileEnvironmentSchemaIngress).optional(),
+    httpRoutes: (0, zod_1.array)(build_file_environment_schema_http_route_1.buildFileEnvironmentSchemaHttpRoute).optional(),
+    // Ingress support was removed in 1.8.0. Fail instead of dropping the routes.
+    ingresses: (0, zod_1.never)({
+        errorMap: () => ({
+            message: 'ingresses were removed in 1.8.0: declare Gateway API routes under httpRoutes, each with a gateway',
+        }),
+    }).optional(),
 });
 exports.buildFileDockerEnvironmentSchema = (0, zod_1.object)({
     host: (0, zod_1.string)().optional(),

package/dist/schema/build-file-schema.js

@@ -19,5 +19,5 @@ exports.buildFileSchema = (0, zod_1.object)({
     labels: labels_schema_1.labelsSchema.optional(),
 })
     .strict()
-    .describe('Build file with support for containerization\nhttps://no0dles.gitbook.io/hammerkit/build-file');
+    .describe('Build file with support for containerization\nhttps://hammerkit.dev/docs/build-file');
 //# sourceMappingURL=build-file-schema.js.map

package/dist/schema/build-file-service-container-healthcheck.js

@@ -2,7 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildFileServiceContainerHealthcheck = void 0;
 const zod_1 = require("zod");
+const duration_schema_1 = require("./duration-schema");
 exports.buildFileServiceContainerHealthcheck = (0, zod_1.object)({
     cmd: (0, zod_1.string)(),
+    // How long the service may take to pass `cmd` once its container runs
+    // (default 20s, HAMMERKIT_HEALTHCHECK_TIMEOUT changes the default).
+    timeout: duration_schema_1.durationSchema.optional(),
 });
 //# sourceMappingURL=build-file-service-container-healthcheck.js.map

package/dist/schema/envs-schema.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.envsSchema = void 0;
 const zod_1 = require("zod");
-exports.envsSchema = (0, zod_1.record)((0, zod_1.union)([(0, zod_1.string)(), (0, zod_1.number)()])).describe('Environment values for the current build task\nhttps://no0dles.gitbook.io/hammerkit/build-file/environment-variables');
+exports.envsSchema = (0, zod_1.record)((0, zod_1.union)([(0, zod_1.string)(), (0, zod_1.number)()])).describe('Environment values for the current build task\nhttps://hammerkit.dev/docs/build-file/environment-variables');
 //# sourceMappingURL=envs-schema.js.map

package/dist/utils/abort-on-signals.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.abortOnSignals = exports.ABORT_SIGNALS = void 0;
+// Ctrl-C (SIGINT), a CI job being cancelled or a supervisor stopping hammerkit
+// (SIGTERM) and a closed terminal (SIGHUP) all stop the run the same way: abort,
+// so services are removed and local tasks' process groups are killed. Without a
+// handler Node exits on SIGTERM/SIGHUP at once and leaves both behind.
+exports.ABORT_SIGNALS = ['SIGINT', 'SIGTERM', 'SIGHUP'];
+function abortOnSignals(source, abortCtrl) {
+    for (const signal of exports.ABORT_SIGNALS) {
+        source.on(signal, () => {
+            abortCtrl.abort();
+        });
+    }
+}
+exports.abortOnSignals = abortOnSignals;
+//# sourceMappingURL=abort-on-signals.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hammerkit",
   "description": "Containerized build tool with incremental caching that runs the same build file locally, in Docker and on Kubernetes.",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "keywords": [
     "build",
     "build-tool",
@@ -12,7 +12,7 @@
     "monorepo",
     "task-runner"
   ],
-  "homepage": "https://no0dles.gitbook.io/hammerkit/",
+  "homepage": "https://hammerkit.dev",
   "bin": "dist/index.js",
   "files": [
     "dist",
@@ -47,15 +47,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.470.0",
-    "@kubernetes/client-node": "^0.20.0",
-    "chokidar": "^3.5.3",
+    "@kubernetes/client-node": "^2.0.0",
+    "chokidar": "^3.6.0",
     "colors": "^1.4.0",
     "commander": "^11.1.0",
-    "dockerode": "^4.0.2",
+    "dockerode": "^4.0.12",
     "find-process": "^1.4.7",
-    "minimatch": "^6.1.5",
-    "tar": "^6.2.0",
-    "yaml": "^2.3.4",
+    "minimatch": "^6.2.3",
+    "tar": "^7.5.22",
+    "yaml": "^2.9.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
@@ -64,7 +64,7 @@
     "@types/dockerode": "^3.3.23",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^24.0.0",
-    "@types/tar": "^6.1.3",
+    "@types/ws": "^8.18.2",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "@vitest/coverage-istanbul": "^2.1.8",

package/dist/kubernetes/ensure-ingress.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureIngress = void 0;
-const apply_1 = require("./apply");
-const resources_1 = require("./resources");
-async function ensureIngress(instance, env, ingress, service) {
-    const resource = {
-        kind: 'Ingress',
-        apiVersion: 'networking.k8s.io/v1',
-        metadata: {
-            name: ingress.host,
-            namespace: env.namespace,
-            annotations: {
-                'cert-manager.io/cluster-issuer': 'hammerkit-issuer',
-            },
-            labels: {
-                'hammerkit.dev/id': service.id(),
-            },
-        },
-        spec: {
-            ingressClassName: 'nginx',
-            rules: [
-                {
-                    host: ingress.host,
-                    http: {
-                        paths: [
-                            {
-                                path: ingress.path ?? '/',
-                                pathType: 'Prefix',
-                                backend: {
-                                    service: {
-                                        name: (0, resources_1.getResourceName)(service),
-                                        port: {
-                                            number: ingress.servicePort ?? service.data.ports[0].containerPort,
-                                        },
-                                    },
-                                },
-                            },
-                        ],
-                    },
-                },
-            ],
-            tls: [
-                {
-                    secretName: `${ingress.host}-tls`,
-                    hosts: [ingress.host],
-                },
-            ],
-        },
-    };
-    return await (0, apply_1.apply)(instance, resource);
-}
-exports.ensureIngress = ensureIngress;
-//# sourceMappingURL=ensure-ingress.js.map

package/dist/schema/build-file-environment-schema-ingress.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFileEnvironmentSchemaIngress = void 0;
-const zod_1 = require("zod");
-exports.buildFileEnvironmentSchemaIngress = (0, zod_1.object)({
-    kind: zod_1.z.enum(['ingress', 'httproute']).optional(),
-    host: (0, zod_1.string)(),
-    service: (0, zod_1.string)(),
-    servicePort: (0, zod_1.number)().optional(),
-    path: (0, zod_1.string)().optional(),
-    gateway: (0, zod_1.string)().optional(),
-    gatewayNamespace: (0, zod_1.string)().optional(),
-}).strict();
-//# sourceMappingURL=build-file-environment-schema-ingress.js.map