From 39b3ce3c73daeb53b5eef5b847de0b11a0b4e674 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 3 Nov 2026 16:20:46 +0100 Subject: [PATCH] builder_builds_since names the operator's command nox builds as its reader, not mesh-catalog (ADR 0604) --- .../cmd/mesh-delivery-builder-tools/main.go | 2 +- modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go | 2 +- modules/mesh-delivery-builder/internal/build/run.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go index c8a31c31..56516c70 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder-tools/main.go @@ -98,7 +98,7 @@ func Tools(r build.StuckReader, askAgain func(key string, value []byte) error, q Description: "Every build that ended since a time, oldest first, from the builder's log build-log (kept 30 days): per build its module, " + "fingerprint, source revision, repository, directory, commit and ref, the build node, when it ended, its outcome (done, failed or " + "queued), the manifest built, the bases it was built against and each artifact made with its digest and reference. more says the " + - "log held more than one answer carries: ask again from the last build's time. What mesh-catalog registers a build from. Read-only.", + "log held more than one answer carries: ask again from the last build's time. What the operator's command nox builds reads. Read-only.", Input: map[string]any{"type": "object", "required": []string{"since"}, "properties": map[string]any{ "since": map[string]any{"type": "string", "description": "RFC 3339 time; the builds that ended at or after it"}}}, Run: func(args map[string]any) (any, error) { diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go index 2c118885..bdfdb4a3 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go @@ -131,7 +131,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro trunks.start() b.Trunk = trunks.head // The builder's log (ADR 0571 ยง1): each build's start and end in its module log `build-log`, read by the view, the - // indexer and the assigner through their reads, and by mesh-catalog through the tool builder_builds_since. + // indexer and the assigner through their reads, and by the operator's command nox builds through the tool builder_builds_since. b.Log = func(e delivery.BuildLogEntry) { if err := appendLog(context.WithoutCancel(ctx), js, cred, e); err != nil { logger.Printf("%v", err) diff --git a/modules/mesh-delivery-builder/internal/build/run.go b/modules/mesh-delivery-builder/internal/build/run.go index 6cae6942..106916cf 100644 --- a/modules/mesh-delivery-builder/internal/build/run.go +++ b/modules/mesh-delivery-builder/internal/build/run.go @@ -944,7 +944,7 @@ func LogStarted(module string, m delivery.Module, ref, by string, at time.Time) } // LogEnded is the log's entry of that build ending: the outcome (done, failed or queued), the manifest built, the bases it -// was built against and each artifact made, as the done key has them: what mesh-catalog registers a build from. +// was built against and each artifact made, as the done key has them: what the operator's command nox builds shows of a build. func LogEnded(module string, m delivery.Module, ref, by string, at time.Time, result delivery.BuilderBuild) delivery.BuildLogEntry { e := LogStarted(module, m, ref, by, at) e.Event, e.Outcome, e.Manifest = delivery.BuildEndedEvent, result.State, m.Manifest