From 16f9ad295009a011e6c849e764bdff735abc875a Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 17:23:19 +0100 Subject: [PATCH] builder: a published of other bytes leaves a kept versions entry as it is MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The reservation's published of nodeengine 0.1.4 (9724da7a) was taken into the state versions' entry 0.1.4, numbered for an older fingerprint, which turned published and kept the old digest c0ef9a3d. Builds: design 47 H H-A-159, G §369, A-415; ADR 0605 §4 --- modules/mesh-delivery-builder/internal/versions/heard.go | 5 +++++ .../internal/versions/versions_test.go | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/modules/mesh-delivery-builder/internal/versions/heard.go b/modules/mesh-delivery-builder/internal/versions/heard.go index 6352849d..12dc34c6 100644 --- a/modules/mesh-delivery-builder/internal/versions/heard.go +++ b/modules/mesh-delivery-builder/internal/versions/heard.go @@ -43,6 +43,11 @@ func (n *Numberer) Heard(ctx context.Context, seat, event, id string, o Outcome) var change func(*Entry) switch event { case HeardPublished: + // A published of other bytes than an entry records under its number is no publish of that entry: the reservation + // numbered it and takes it in (design 47 H H-A-159, G §369, A-415; ADR 0605 §4), and the entry stays as it is. + if e, ok, _, err := n.Versions.Recorded(ctx, o.Name, o.Version, o.Digest); err == nil && !ok && e.Digest != "" && o.Digest != "" && e.Digest != o.Digest { + return wake, fmt.Errorf("%s@%s is recorded with digest %s, so %s's published of %s is %w", o.Name, o.Version, e.Digest, seat, o.Digest, ErrNotNumbered) + } change = func(e *Entry) { e.State, e.Reason = Published, "" if e.Digest == "" { diff --git a/modules/mesh-delivery-builder/internal/versions/versions_test.go b/modules/mesh-delivery-builder/internal/versions/versions_test.go index 6b04ce65..c099156b 100644 --- a/modules/mesh-delivery-builder/internal/versions/versions_test.go +++ b/modules/mesh-delivery-builder/internal/versions/versions_test.go @@ -440,6 +440,13 @@ func TestTheBuildersVersions(t *testing.T) { if wake, _ := n.Heard(ctx, SeatGoPackages, HeardPublished, "e2", Outcome{Name: "m/x", Digest: "sha256:dd"}); !reflect.DeepEqual(wake, []string{"m/lib"}) { t.Fatalf("a published on the Go seat woke %v, want m/lib, whose seat was silent", wake) } + // Design 47 G §369, A-415; ADR 0605 §4: a published of other bytes under the number is the reservation's, never this entry's. + if _, err := n.Heard(ctx, SeatArtifacts, HeardPublished, "e5", Outcome{Name: "m/program", Version: "0.1.14", Digest: "sha256:new"}); !errors.Is(err, ErrNotNumbered) { + t.Fatalf("a published of other bytes under 0.1.14: %v, want ErrNotNumbered", err) + } + if all, _ := n.Versions.Of(ctx, "m/program"); all[0].State != Numbered || all[0].Digest != "sha256:aa" { + t.Fatalf("after a published of other bytes: %+v, want it numbered with sha256:aa", all[0]) + } for _, h := range []struct{ event, state, reason string }{{HeardRefused, Refused, "bytes differ"}, {HeardPublished, Published, ""}, {HeardRefused, Published, ""}, {HeardRemoved, Removed, "retention"}} { if _, err := n.Heard(ctx, SeatArtifacts, h.event, "e3", Outcome{Name: "m/program", Version: "0.1.14", Digest: "sha256:aa", Reason: h.reason}); err != nil { t.Fatal(err)