The builder builds the fingerprints a candidate carries, once each, from the head merged onto the trunk (issue 1684)

modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go

@@ -56,6 +56,7 @@ type fakeBuildModules struct {
 	failBuild atomic.Bool
 	mu        sync.Mutex
 	calls     map[string]int // by `<module>.<tool>`
+	fetches   []map[string]any
 }
 
 func (f *fakeBuildModules) count(tool string) int {
@@ -83,6 +84,11 @@ func (f *fakeBuildModules) serve(t *testing.T, nc *nats.Conn, module string) {
 		f.mu.Unlock()
 		var args map[string]any
 		_ = json.Unmarshal(m.Data, &args)
+		if strings.HasSuffix(tool, "_fetch") {
+			f.mu.Lock()
+			f.fetches = append(f.fetches, args)
+			f.mu.Unlock()
+		}
 		id := fmt.Sprintf("s%d", f.n.Add(1))
 		key, _ := delivery.StepKey(node, id)
 		put := func(s delivery.Step) {
@@ -119,16 +125,17 @@ func (f *fakeBuildModules) serve(t *testing.T, nc *nats.Conn, module string) {
 }
 
 type bed struct {
-	ctx      context.Context
-	js       jetstream.JetStream
-	modules  jetstream.KeyValue
-	builds   jetstream.KeyValue
-	tools    map[string]jetstream.KeyValue
-	presence jetstream.KeyValue
-	have     jetstream.KeyValue
-	fake     *fakeBuildModules
-	srvURL   string
-	dir      string
+	ctx        context.Context
+	js         jetstream.JetStream
+	modules    jetstream.KeyValue
+	candidates jetstream.KeyValue
+	builds     jetstream.KeyValue
+	tools      map[string]jetstream.KeyValue
+	presence   jetstream.KeyValue
+	have       jetstream.KeyValue
+	fake       *fakeBuildModules
+	srvURL     string
+	dir        string
 }
 
 // startBed starts the bus, the buckets the controller makes from the builder's and the build modules' manifests, the
@@ -193,6 +200,7 @@ func startBed(t *testing.T) *bed {
 		return kv
 	}
 	b.modules = mk(delivery.ModulesBucket, delivery.ModulesHistory)
+	b.candidates = mk(delivery.CandidatesBucket, delivery.CandidatesHistory)
 	mk(delivery.ManifestsBucket, delivery.ManifestsHistory)
 	b.builds = mk(delivery.BuilderBuildsBucket, delivery.BuilderBuildsHistory)
 	presence := mk(delivery.PresenceBucket, delivery.PresenceHistory)
@@ -522,3 +530,47 @@ func TestAKeyLeftBuildingForAModuleThatIsGoneIsClosedAtStart(t *testing.T) {
 		t.Errorf("build = %+v, want it closed naming who left it", v)
 	}
 }
+
+// TestBuilderBuildsACandidatesFingerprintFromTheHeadMergedOntoTheTrunk: the trunk's record of netcheck carries a fingerprint of its
+// own; a candidate the indexer wrote gives netcheck the fingerprint fp at a pull request's head; the program writes
+// builds.netcheck.<fp> done, its fetch given the head, the ref that carries it and the trunk commit (issue 1684).
+func TestBuilderBuildsACandidatesFingerprintFromTheHeadMergedOntoTheTrunk(t *testing.T) { // N7/AC1
+	b := startBed(t)
+	other := "src2:" + strings.Repeat("e", 64)
+	digest := b.module(t, "netcheck", "catalogue-a67f0196-netcheck.module.json", "modules/netcheck")
+	data, err := delivery.EncodeModule(delivery.Module{Repository: "novox/mesh-catalog", Commit: commit, FP: "src1:" + strings.Repeat("f", 64), FP2: other,
+		Manifest: digest, Path: "modules/netcheck", Toolchains: map[string]delivery.ToolchainUsed{"go": {Version: "go1.27.1", Recipe: "1"}, "typescript": {Version: "tsc5", Recipe: "1"}}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := b.modules.Put(b.ctx, "netcheck", data); err != nil {
+		t.Fatal(err)
+	}
+	const head = "1111111111111111111111111111111111111111"
+	pulls := []delivery.CandidatePull{{Head: delivery.Head{Repository: "novox/mesh-catalog", Number: 7, Head: head}, Modules: []string{"netcheck"},
+		Fps: map[string]delivery.CandidateModule{"netcheck": {FP2: fp, Manifest: digest}}}}
+	hash, _ := delivery.HeadsHash([]delivery.Head{pulls[0].Head})
+	cand, err := delivery.EncodeCandidate(delivery.Candidate{V: delivery.Version, Group: "feat/x", HeadsHash: hash, Pulls: pulls, FPSet: delivery.FingerprintSet(pulls)})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := b.candidates.Put(b.ctx, "feat%2Fx", cand); err != nil {
+		t.Fatal(err)
+	}
+	b.start(t, "n1", nil)
+	v := b.await(t, "netcheck", isState(delivery.BuildDone))
+	if len(v.Artifacts) != 2 {
+		t.Fatalf("build = %+v", v)
+	}
+	b.fake.mu.Lock()
+	defer b.fake.mu.Unlock()
+	found := false
+	for _, f := range b.fake.fetches {
+		if f["commit"] == head && f["ref"] == "refs/pull/7/head" && f["base"] == commit {
+			found = true
+		}
+	}
+	if !found {
+		t.Errorf("fetches = %v, want one of the candidate's head with its ref and the trunk commit", b.fake.fetches)
+	}
+}

modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go

@@ -141,6 +141,10 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro
 	if err != nil {
 		return err
 	}
+	candidates, err := bucket(delivery.CandidatesBucket)
+	if err != nil {
+		return err
+	}
 	// Calls to the build modules go out as this module's own account, naming the machine (mesh-sdk process.CallOn); the
 	// buckets are read and written on the connection above.
 	account, err := process.ReadAccount(path)
@@ -256,9 +260,22 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro
 	if err := b.Sweep(ctx); err != nil {
 		return err
 	}
+	// The fingerprints the indexer gives the candidates' modules are built too (issue 1684), once the trunk's modules are known.
+	eachCandidate := func(e jetstream.KeyValueEntry) {
+		if opOf(e) {
+			b.Candidate(ctx, e.Key(), e.Value())
+		} else {
+			b.ForgetCandidate(e.Key())
+		}
+	}
+	cw, err := settle(ctx, candidates, eachCandidate)
+	if err != nil {
+		return err
+	}
 	logger.Printf("started on %s", cred.Node)
-	errs := make(chan error, 1)
+	errs := make(chan error, 2)
 	go func() { errs <- follow(ctx, w, each) }()
+	go func() { errs <- follow(ctx, cw, eachCandidate) }()
 	select {
 	case <-ctx.Done():
 		b.Wait()