diff --git a/modules/mesh-delivery-indexer/internal/index/kept_trunk_test.go b/modules/mesh-delivery-indexer/internal/index/kept_trunk_test.go index ab545752..0dd1eb1f 100644 --- a/modules/mesh-delivery-indexer/internal/index/kept_trunk_test.go +++ b/modules/mesh-delivery-indexer/internal/index/kept_trunk_test.go @@ -202,6 +202,10 @@ func TestTheKeptTrunkFailsWhenTheSameRevisionIsGoneTwice(t *testing.T) { for name, read := range map[string]func() error{ "kept trunk": func() error { return (&KeptTrunk{}).Reread(context.Background(), mem) }, "TrunkView": func() error { _, _, _, err := TrunkView(context.Background(), mem); return err }, + "Outdated": func() error { + _, err := outdatedOfAvahi(mem).Outdated(context.Background(), meshcatalog.OutdatedInput{}) + return err + }, } { if err := read(); !errors.Is(err, ErrNoObject) { t.Errorf("%s: %v, want the lost entry said (no such object)", name, err) @@ -268,6 +272,10 @@ func TestTheNewestRevisionReadersReadAgainWhenTheRevisionIsRemovedUnderThem(t *t } return tool != nil && tool["name"] == "trunk.2", nil }}, + "Outdated": {"", func(ix *Indexer) (bool, error) { + a, err := outdatedOfAvahi(ix.Revisions).Outdated(ctx, meshcatalog.OutdatedInput{}) + return len(a.Behind) == 1 && a.Behind[0].Kind == 5 && strings.Contains(a.Behind[0].Newest, "fp2"), err + }}, "Revision": {"", func(ix *Indexer) (bool, error) { a, err := Revision(ctx, ix.Revisions, nil, "avahi", "avahi", meshcatalog.RevisionInput{}) return a.Revision != nil && a.Revision.Revision == 2, err @@ -307,3 +315,11 @@ func TestTheNewestRevisionReadersReadAgainWhenTheRevisionIsRemovedUnderThem(t *t }) } } + +// outdatedOfAvahi is an indexer whose state versions holds avahi at a kind-5 edge, so Outdated reads the trunk's entry of avahi. +func outdatedOfAvahi(o Objects) *Indexer { + ix := &Indexer{Versions: MemoryStore(), Heard: MemoryStore(), Revisions: o} + data, _ := json.Marshal(meshcatalog.VersionEntry{V: 1, Module: "avahi", Version: "0.1.1", Edges: []meshcatalog.VersionEdge{{Kind: 5, Part: "actor:program"}}}) + _ = ix.Versions.Create(context.Background(), meshcatalog.VersionsByModuleVersionKey("avahi", "0.1.1"), data) + return ix +} diff --git a/modules/mesh-delivery-indexer/internal/index/versions_edges.go b/modules/mesh-delivery-indexer/internal/index/versions_edges.go index 430597b9..4865bb2e 100644 --- a/modules/mesh-delivery-indexer/internal/index/versions_edges.go +++ b/modules/mesh-delivery-indexer/internal/index/versions_edges.go @@ -194,7 +194,11 @@ func (ix *Indexer) Outdated(ctx context.Context, in meshcatalog.OutdatedInput) ( } trunk := map[string]meshcatalog.CatalogEntry{} // the newest trunk revision's entries, read where a kind needs them if ix.Revisions != nil { - if _, entries, found, err := readNewestOf(ctx, ix.Revisions, TrunkBranch); err == nil && found { + _, entries, found, err := readNewestOf(ctx, ix.Revisions, TrunkBranch) + if err != nil { + return out, fmt.Errorf("the trunk's entries, which the kinds 3 and 5 are told by, cannot be read: %w", err) + } + if found { for _, e := range entries { trunk[e.Module] = e }