hammerkit 1.9.2 → 1.11.0

package/dist/schema/reference-parser.js

@@ -73,6 +73,7 @@ async function parseReferences(ctx, mainScope, environment) {
                     scope: file,
                     needs: [],
                     deps: [],
+                    init: null,
                     envs: serviceEnvs,
                 };
             }
@@ -86,6 +87,7 @@ async function parseReferences(ctx, mainScope, environment) {
     for (const service of Object.values(reference.services)) {
         resolveDeps(reference, service, service.scope, service.schema);
         resolveNeeds(reference, service, service.scope, service.schema);
+        resolveInit(reference, service);
     }
     reference.caches = (0, resolve_cache_1.withBuiltinCaches)(declaredCaches);
     return reference;
@@ -142,6 +144,18 @@ function resolveDeps(reference, taskOrService, scope, schema) {
         });
     }
 }
+function resolveInit(reference, service) {
+    if ((0, build_file_service_schema_1.isBuildFileKubernetesServiceSchema)(service.schema) || !service.schema.init) {
+        return;
+    }
+    const initTask = findTask(reference, service.scope, service.schema.init, null);
+    service.init = {
+        task: initTask.task,
+        type: initTask.type,
+        cwd: initTask.type === 'include' ? service.cwd : initTask.task.cwd,
+        relativeName: service.schema.init,
+    };
+}
 function resolveNeeds(reference, taskOrService, scope, schema) {
     if ((0, build_file_service_schema_1.isBuildFileKubernetesServiceSchema)(schema)) {
         return;

package/dist/schema/work-scope-parser.js

@@ -37,22 +37,42 @@ function getWorkContext(context, scope, environment) {
             workTree.environment = filteredWorkTree.environment;
         }
     }
-    for (const task of Object.values(context.tasks)) {
-        const item = (0, append_work_task_1.appendWorkTask)(workTree, task.cwd, task, environment, context);
+    // everything is planned before the run is narrowed: planning a service adds
+    // its init task's need on it, which narrowing follows
+    const tasks = Object.values(context.tasks).map((task) => (0, append_work_task_1.appendWorkTask)(workTree, task.cwd, task, environment, context));
+    const services = Object.values(context.services).map((service) => (0, append_work_service_1.appendWorkService)(workTree, service, environment, context));
+    for (const item of tasks) {
         if (matchesTaskWorkScope(item, scope)) {
             requested.push(item.name);
             applyTask(filteredWorkTree, item);
         }
     }
-    for (const service of Object.values(context.services)) {
-        const item = (0, append_work_service_1.appendWorkService)(workTree, service, environment, context);
+    for (const item of services) {
         if (matchesServiceWorkScope(item.data, scope)) {
             applyService(filteredWorkTree, item);
         }
     }
+    keepRequirersInScope(filteredWorkTree);
     return filteredWorkTree;
 }
 exports.getWorkContext = getWorkContext;
+// The whole build file is planned first, so a shared service lists every task
+// and service that needs it. Those outside this run never start or end, and a
+// service waiting for them to finish would keep the run open forever.
+function keepRequirersInScope(workTree) {
+    const inScope = new Set([
+        ...Object.values(workTree.tasks),
+        ...Object.values(workTree.services),
+    ]);
+    for (const service of Object.values(workTree.services)) {
+        service.requiredBy = service.requiredBy.filter((required) => inScope.has(required));
+        // an init task asked for alone is what its service starts for
+        const init = service.data.type === 'container-service' ? service.data.init : null;
+        if (init && workTree.requested?.length === 1 && workTree.requested[0] === init.task.name) {
+            service.requiredBy.push(init.task);
+        }
+    }
+}
 function applyTask(workTree, item) {
     if (workTree.tasks[item.name]) {
         return;
@@ -60,12 +80,17 @@ function applyTask(workTree, item) {
     workTree.tasks[item.name] = item;
     applyNeedsAndDeps(workTree, item);
 }
-function applyService(workTree, item) {
+function applyService(workTree, need) {
+    const item = (0, append_work_service_1.getPlannedService)(need);
     if (workTree.services[item.name]) {
         return;
     }
     workTree.services[item.name] = item;
     applyNeedsAndDeps(workTree, item);
+    // a service in the run brings its init task, which runs once it is healthy
+    if (item.data.type === 'container-service' && item.data.init) {
+        applyTask(workTree, item.data.init.task);
+    }
 }
 function applyNeedsAndDeps(workTree, item) {
     for (const dep of item.deps) {

package/dist/utils/redact.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redact = exports.registerSecretValue = void 0;
+// Secret values hammerkit has read, masked in everything it logs, including the
+// output it streams from a task or service. Logs are per line, so each line of
+// a multi-line value (a key file) is masked on its own. Values shorter than
+// MIN_LENGTH are left alone: masking them would mangle unrelated output.
+const MIN_LENGTH = 4;
+const MASK = '***';
+const values = new Set();
+function registerSecretValue(value) {
+    for (const candidate of [value, ...value.split(/\r?\n/)]) {
+        const trimmed = candidate.trim();
+        if (trimmed.length >= MIN_LENGTH) {
+            values.add(trimmed);
+        }
+    }
+}
+exports.registerSecretValue = registerSecretValue;
+function redact(message) {
+    if (values.size === 0) {
+        return message;
+    }
+    // longest first, so a value containing another is masked as a whole
+    const sorted = [...values].sort((a, b) => b.length - a.length);
+    return sorted.reduce((result, value) => result.split(value).join(MASK), message);
+}
+exports.redact = redact;
+//# sourceMappingURL=redact.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.9.2",
+  "version": "1.11.0",
   "keywords": [
     "build",
     "build-tool",