Register a new module from the builder's first done key and ask no first build; its condition reads the key and names a manifest word this controller does not read (issue 1851, A5a, A5b)

cmd/mesh-controller/first_builds_integration_test.go

@@ -5,71 +5,48 @@ package main
 import (
 	"context"
 	"encoding/json"
-	"slices"
-	"sync"
 	"testing"
 	"time"
 
 	"github.com/nats-io/nats.go/jetstream"
 
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
+	sdkdelivery "git.novox.be/novox/mesh-sdk/go/delivery"
 	"github.com/novox/mesh-controller/internal/broker"
 	"github.com/novox/mesh-controller/internal/inventory"
 	"github.com/novox/mesh-controller/internal/link"
-	"github.com/novox/mesh-controller/internal/testbus"
 )
 
-// 1146/AC7, whole against a real bus and the store, in both orders of the two events (novox/hq ADR 0432, issue 1146):
-// mesh-delivery #7 merged on the operator's Approve into a repository the mesh builds nothing from. The forge's merge,
-// heard as the controller hears it (SourceMoved), and mesh-delivery's word, published on the subject the controller
-// consumes with the router's record of the ask in its bucket, come in either order; each way the first build of the
-// module the merge commit holds is asked exactly once, its outcome registers the module, and it is in the catalogue.
-// Without the Approve in the record nothing is asked. Store-backed: skips without one.
-func TestAMergeOnTheApproveIntoANewRepositoryAsksTheFirstBuildAndItsOutcomeRegistersTheModule(t *testing.T) {
+// 1146/AC7 on keys (ADR 0501 §3, §6; issue 1851, A5), whole against a real bus and the store, in both orders of the two
+// events: mesh-delivery #7 merged on the operator's Approve into a repository the mesh builds nothing from. The forge's
+// merge, heard as the controller hears it (SourceMoved), and mesh-delivery's word, published on the subject the
+// controller consumes with the router's record of the ask in its bucket, come in either order; each way the module the
+// merge commit holds is registered from the builder's done key of it, and nothing asks a build. Without the Approve in
+// the record it is not registered. Store-backed: skips without one.
+func TestAMergeOnTheApproveIntoANewRepositoryRegistersItsModuleFromItsKey(t *testing.T) {
 	const head, commit = "a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1", "0177ea7a00000000"
 	for _, c := range []struct {
-		what        string
-		wordFirst   bool
-		approved    bool // the router's record holds the operator's Approve of the merged head
-		wantRegiter bool
+		what         string
+		wordFirst    bool
+		approved     bool // the router's record holds the operator's Approve of the merged head
+		wantRegister bool
 	}{
-		{what: "the forge's merge before mesh-delivery's word", approved: true, wantRegiter: true},
-		{what: "mesh-delivery's word before the forge's merge", wordFirst: true, approved: true, wantRegiter: true},
+		{what: "the forge's merge before mesh-delivery's word", approved: true, wantRegister: true},
+		{what: "mesh-delivery's word before the forge's merge", wordFirst: true, approved: true, wantRegister: true},
 		{what: "a word whose record holds no Approve", wordFirst: true},
 	} {
 		t.Run(c.what, func(t *testing.T) {
 			open := aMesh(t)
 			ctx := t.Context()
 			inv := open.inventory
-			// The real ask, guard and queue included: only its answers are kept, so the build's outcome can be matched.
-			aForgeAndABuildSeat(t, open)
-			// Written by the controller's merge path on its own goroutine, read by the test: under one lock.
-			var mu sync.Mutex
-			var asks [][3]string
-			var ids []string
-			asked := func() [][3]string { mu.Lock(); defer mu.Unlock(); return slices.Clone(asks) }
-			realAsk := askABuild
-			askABuild = func(c context.Context, source buildSource, path, ref string) (string, error) {
-				id, err := realAsk(c, source, path, ref)
-				if err == nil {
-					mu.Lock()
-					asks = append(asks, [3]string{source.Repository, path, ref})
-					ids = append(ids, id)
-					mu.Unlock()
-				}
-				return id, err
-			}
-			t.Cleanup(func() { askABuild = realAsk })
+			noBuildAsked(t)
+			b := aBuilderOnTheBus(t)
+			js := b.js
 			if err := inv.RegisterModule(ctx, catalogue.Manifest{Module: "operator-channel", Version: "1",
 				DefinesSeats: []catalogue.SeatDeclaration{{Name: broker.AsksSeat, Records: []string{"asks"}}}},
 				inventory.Source{Repository: "novox/mesh-catalog", Seat: "git", Path: "modules/operator-channel", BuiltFrom: "c0ffee"}); err != nil {
 				t.Fatal(err)
 			}
-			js, err := broker.Dial(testbus.URL(t))
-			if err != nil {
-				t.Fatal(err)
-			}
-			t.Cleanup(js.Close)
 			if err := broker.AssertMeshStreams(js); err != nil {
 				t.Fatal(err)
 			}
@@ -91,6 +68,10 @@ func TestAMergeOnTheApproveIntoANewRepositoryAsksTheFirstBuildAndItsOutcomeRegis
 					t.Fatal(err)
 				}
 			}
+			// The indexer's value and the builder's done key of the module the merge commit holds.
+			fp := fpOf('9')
+			manifest := b.indexed(t, "mesh-delivery-view", "1", "novox/mesh-delivery", ".", commit, fp)
+			b.built(t, "mesh-delivery-view", "1", fp, manifest, sdkdelivery.BuildDone)
 
 			following := following{open: open}
 			server := link.ConnectNats(js, nil, noListener{})
@@ -104,8 +85,6 @@ func TestAMergeOnTheApproveIntoANewRepositoryAsksTheFirstBuildAndItsOutcomeRegis
 			done := make(chan struct{})
 			go func() { defer close(done); _ = server.Serve(serving) }()
 			t.Cleanup(func() { stop(); <-done })
-			servingBus.Store(js)
-			t.Cleanup(func() { servingBus.Store(nil) })
 
 			word := func() {
 				t.Helper()
@@ -133,37 +112,27 @@ func TestAMergeOnTheApproveIntoANewRepositoryAsksTheFirstBuildAndItsOutcomeRegis
 				forge()
 			} else {
 				forge()
-				if len(asked()) != 0 {
-					t.Fatalf("1146/AC7: the merge asked %v before mesh-delivery's word was kept", asked())
+				time.Sleep(300 * time.Millisecond)
+				if _, known := inventoryHolds(t, inv, "mesh-delivery-view"); known {
+					t.Fatal("1146/AC7: registered before mesh-delivery's word was kept")
 				}
 				word()
 			}
-			if !c.wantRegiter {
-				if len(asked()) != 0 {
-					t.Fatalf("1146/AC7: a merge whose record holds no Approve asked %v", asked())
+			if !c.wantRegister {
+				time.Sleep(time.Second)
+				if _, known := inventoryHolds(t, inv, "mesh-delivery-view"); known {
+					t.Fatal("1146/AC7: a merge whose record holds no Approve registered its module")
 				}
 				return
 			}
-			want := [3]string{"novox/mesh-delivery", "", "main"}
-			becomes(t, 10*time.Second, "the first build asked", func() bool { return len(asked()) >= 1 })
-			if got := asked(); len(got) != 1 || got[0] != want {
-				t.Fatalf("1146/AC7: the merge asked %v, want %v once", got, want)
-			}
-			mu.Lock()
-			first := ids[0]
-			mu.Unlock()
-			build := onTrunk(first, "novox/mesh-delivery", "git", "", map[string]any{"module": "mesh-delivery-view", "version": "1"})
-			build.Commit = commit
-			if _, _, err := takeIn(ctx, inv, build); err != nil {
-				t.Fatalf("1146/AC7: the outcome of the first build was refused: %v", err)
-			}
+			becomes(t, 10*time.Second, "the module registered", func() bool {
+				_, known := inventoryHolds(t, inv, "mesh-delivery-view")
+				return known
+			})
 			src, err := inv.SourceOf(ctx, "mesh-delivery-view")
 			if err != nil || src.Repository != "novox/mesh-delivery" {
 				t.Fatalf("1146/AC7: the module is built from %q (%v)", src.Repository, err)
 			}
-			if _, known := inventoryHolds(t, inv, "mesh-delivery-view"); !known {
-				t.Fatal("1146/AC7: the module is not in the catalogue")
-			}
 		})
 	}
 }