diff --git a/modules/mesh-delivery-builder/internal/build/revisionwait.go b/modules/mesh-delivery-builder/internal/build/revisionwait.go index 9e166228..651d6f30 100644 --- a/modules/mesh-delivery-builder/internal/build/revisionwait.go +++ b/modules/mesh-delivery-builder/internal/build/revisionwait.go @@ -89,13 +89,20 @@ func (b *Builder) keptRevisionHolds(ctx context.Context, run meshbuilds.StepRun, if b.KeptRevision == nil || run.Revision <= 0 { return meshbuilds.StepEndedOutcomeFailed, below + ", and the ask names no catalog revision to read it by" } - _, fps, err := b.KeptRevision(ctx, run.Branch, run.Revision) + source, fps, err := b.KeptRevision(ctx, run.Branch, run.Revision) if err != nil { b.logf("%s: %s, and the catalog's revision %d cannot be read: %v", run.Pipeline, below, run.Revision, err) return meshbuilds.StepEndedOutcomeCouldNotRun, fmt.Sprintf("%s, and the catalog's revision %d cannot be read: %v", below, run.Revision, err) } + // An ask names the revision and the source of one revision (H-A-218, H-A-219): a kept revision of another source is + // not the ask's. + if source != run.Source { + b.logf("%s: %s, and the catalog's revision %d is of source revision %d, the ask names %d: the step fails, nothing is built", run.Pipeline, below, run.Revision, source, run.Source) + return meshbuilds.StepEndedOutcomeFailed, fmt.Sprintf("%s, and the catalog's revision %d is of source revision %d, the ask names %d", below, run.Revision, source, run.Source) + } for _, e := range run.Entries { if fps[e.Module] != e.Fingerprint { + b.logf("%s: %s, and the catalog's revision %d names %s at %q, not %s: the step fails, nothing is built", run.Pipeline, below, run.Revision, e.Module, fps[e.Module], e.Fingerprint) return meshbuilds.StepEndedOutcomeFailed, fmt.Sprintf("%s, and the catalog's revision %d names %s at %q, not %s", below, run.Revision, e.Module, fps[e.Module], e.Fingerprint) } } @@ -124,10 +131,12 @@ func (b *Builder) awaitRevision(ctx context.Context, run meshbuilds.StepRun) (ou } if held, ok := b.Picture(run.Branch); !b.holdsRevision(run.Branch, run.Source, run.Entries) { below := ok && run.Source < held - if run.Revision > 0 || below { - // By its number (H-A-222), whatever the source; for an ask naming none, only below the picture (H-A-205). + if (run.Revision > 0 && b.KeptRevision != nil) || below { + // By its number (H-A-222), whatever the source the picture holds; for an ask naming none, only below the + // picture (H-A-205). A kept revision of another source or naming other fingerprints is a mismatch the wait + // cannot mend: it fails at once; only a revision the catalog does not answer is waited for. outcome, said := b.keptRevisionHolds(ctx, run, held) - if outcome == "" || below { + if outcome == "" || below || outcome == meshbuilds.StepEndedOutcomeFailed { return outcome, said } } diff --git a/modules/mesh-delivery-builder/internal/build/step_test.go b/modules/mesh-delivery-builder/internal/build/step_test.go index 0eaee147..f69d1aaf 100644 --- a/modules/mesh-delivery-builder/internal/build/step_test.go +++ b/modules/mesh-delivery-builder/internal/build/step_test.go @@ -442,6 +442,28 @@ func anOlderKeptRevisionIsReadByNumber(t *testing.T) { if end3.Outcome != meshbuilds.StepEndedOutcomePassed || !slices.Equal(read3, []string{"main 48"}) || len(res3.sources) != 1 || res3.sources[0].CatalogRevision != 48 { t.Errorf("end = %+v, kept revisions read %v, reserved %+v; want passed, revision 48 of main read once and reserved at it", end3, read3, res3.sources) } + // H-A-218, H-A-222: a kept revision of another source than the ask names, or naming another fingerprint, is a mismatch: + // the step fails at once naming it, never waiting out its bound (the bound here is long, the ask is not below the picture). + for _, c := range []struct { + name string + source int64 + fp string + said string + }{ + {"another source", 45, fp1, "the catalog's revision 48 is of source revision 45, the ask names 46"}, + {"another fingerprint", 46, "src2:other", "names m at \"src2:other\""}, + } { + rc, resc, _ := revisionRig(t, &held, make(chan struct{}, 1)) + rc.b.RevisionWait = time.Hour + rc.b.KeptRevision = func(context.Context, string, int64) (int64, map[string]string, error) { + return c.source, map[string]string{"m": c.fp}, nil + } + end := rc.b.BuildStep(t.Context(), same) + rc.b.Wait() + if end.Outcome != meshbuilds.StepEndedOutcomeFailed || !strings.Contains(end.Said, c.said) || len(resc.sources) != 0 { + t.Errorf("%s: end = %+v, reserved %+v; want failed at once saying %q, nothing reserved", c.name, end, resc.sources, c.said) + } + } } func aStepAskPastItsRevisionBoundFails(t *testing.T) {