Archived
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
404b4409e7 | ||
|
|
e658a14296 |
@@ -0,0 +1,71 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/novox/mesh-controller/internal/catalogue"
|
||||||
|
"github.com/novox/mesh-controller/internal/inventory"
|
||||||
|
)
|
||||||
|
|
||||||
|
// **A new SDK plans the toolchain, and then every bundle compiled in it** (novox/hq issue 614), reasoned
|
||||||
|
// as `mesh-controller.delivery-plan` reasons it: the modules registered as a build registers them —
|
||||||
|
// resolved, so carrying no `build` — their builds recorded with what they stood on and what they made,
|
||||||
|
// the graph read by theGraph and the change scoped by pullScope. On 2026-10-13 mesh-sdk 0.1.14 planned
|
||||||
|
// "builds mesh-sdk, sent nowhere": mesh-tools' `build.on` naming the SDK's package and the providers'
|
||||||
|
// TypeScript bundles were edges only while their manifests were unbuilt.
|
||||||
|
//
|
||||||
|
// **The replay of issue 614** (mesh-lab R614): written only with what the controller had before its fix — a
|
||||||
|
// store, modules registered and builds recorded, theGraph and pullScope — so it is laid over the commit before
|
||||||
|
// and fails there with the plan of that day, [[mesh-sdk]]. Needs a store: MESH_TEST_POSTGRES.
|
||||||
|
func TestReplay614ANewSDKPlansTheToolchainAndThenItsBundles(t *testing.T) {
|
||||||
|
inv := inventory.ForTest(t)
|
||||||
|
ctx := t.Context()
|
||||||
|
asked := time.Now().Add(-time.Hour)
|
||||||
|
digest := func(c string) string { return "@sha256:" + strings.Repeat(c, 64) }
|
||||||
|
register := func(m catalogue.Manifest, repository, path string, against []string, made []inventory.Artifact) {
|
||||||
|
t.Helper()
|
||||||
|
if err := inv.RegisterModule(ctx, m, inventory.Source{Repository: repository, Seat: "git", Path: path,
|
||||||
|
Ref: "main", BuiltFrom: "old", Asked: asked}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := inv.RecordBuild(ctx, inventory.Build{ID: "build-" + m.Module, Repository: repository, Ref: "main",
|
||||||
|
Module: m.Module, Commit: "old", On: "builder", Path: path, Against: against, Made: made, Asked: asked}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bundle := func(module, language string) catalogue.Manifest {
|
||||||
|
return catalogue.Manifest{Module: module, Version: "1", Bundles: []catalogue.Bundle{{
|
||||||
|
Name: "code", Language: language, Source: catalogue.ArtifactStoreScheme + module + "/code" + digest("2"),
|
||||||
|
Entrypoints: []string{"tools/index.js"}}}}
|
||||||
|
}
|
||||||
|
register(catalogue.Manifest{Module: "build-agent", Version: "1",
|
||||||
|
Claims: []catalogue.Claim{{Name: "node-build-agent", Scope: catalogue.ScopeNode}}},
|
||||||
|
"novox/mesh-catalog", "modules/build-agent", nil, nil)
|
||||||
|
register(catalogue.Manifest{Module: "mesh-sdk", Version: "1"}, "novox/mesh-sdk", "", nil,
|
||||||
|
[]inventory.Artifact{{Name: "lib", Kind: "package", Reference: "@novox/mesh-sdk@0.1.13"}})
|
||||||
|
register(catalogue.Manifest{Module: "mesh-tools", Version: "1"}, "novox/mesh-tools", "",
|
||||||
|
[]string{"@novox/mesh-sdk@0.1.13", catalogue.ArtifactStoreScheme + "upstream/docker.io/library/node" + digest("0")},
|
||||||
|
[]inventory.Artifact{{Name: "build", Kind: "image", Reference: catalogue.ArtifactStoreScheme + "mesh-tools/build" + digest("1")}})
|
||||||
|
register(catalogue.Manifest{Module: "mesh-tools-go", Version: "1"}, "novox/mesh-tools", "go", nil, nil)
|
||||||
|
register(bundle("minio", "typescript"), "novox/mesh-catalog", "modules/minio", nil, nil)
|
||||||
|
register(bundle("umami", "typescript"), "novox/mesh-catalog", "modules/umami", nil, nil)
|
||||||
|
register(bundle("dnsmasq", "go"), "novox/mesh-catalog", "modules/dnsmasq", nil, nil)
|
||||||
|
|
||||||
|
entries, read, edges, err := theGraph(ctx, inv)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
m := orderMember{ID: "novox/mesh-sdk@new", Repository: "novox/mesh-sdk", Head: "new",
|
||||||
|
Paths: []string{"src/provisioner/index.ts", "package.json"}}
|
||||||
|
s := pullScope(m.pull(), entries, read, edges)
|
||||||
|
want := [][]string{{"mesh-sdk"}, {"mesh-tools"}, {"minio", "umami"}}
|
||||||
|
if !reflect.DeepEqual(s.Reach.Plan.Tiers, want) {
|
||||||
|
t.Fatalf("a new SDK plans %v, want %v (edges %v)", s.Reach.Plan.Tiers, want, edges)
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(s.Dependents, []string{"mesh-tools", "minio", "umami"}) {
|
||||||
|
t.Errorf("dependents %v", s.Dependents)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -322,9 +322,6 @@ var defaultSeats = append([]Seat{
|
|||||||
// node-mounts writes a mount and an automount unit per share on a machine that asks (shares.go).
|
// node-mounts writes a mount and an automount unit per share on a machine that asks (shares.go).
|
||||||
{Name: NFSServerSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0263", Serves: nfsServerVerbs()},
|
{Name: NFSServerSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0263", Serves: nfsServerVerbs()},
|
||||||
{Name: MountsSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0263", Serves: mountsVerbs()},
|
{Name: MountsSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0263", Serves: mountsVerbs()},
|
||||||
// A machine's SMB shares for the devices on its own network (novox/hq ADR 0341, smb.go): its holder
|
|
||||||
// writes the SMB configuration, serves 445 alone and maps every client to the shared folder's owner.
|
|
||||||
{Name: SMBServerSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0341", Serves: smbServerVerbs()},
|
|
||||||
// A node's files and accounts, read (novox/hq ADR 0310, reads.go): by an account of the holder's own that holds
|
// A node's files and accounts, read (novox/hq ADR 0310, reads.go): by an account of the holder's own that holds
|
||||||
// no secret, on every node, so the reads ADR 0268 §5 takes over from the login shell's execute have a tool.
|
// no secret, on every node, so the reads ADR 0268 §5 takes over from the login shell's execute have a tool.
|
||||||
{Name: ReadsSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0310", Serves: readsVerbs()},
|
{Name: ReadsSeat, Scope: ScopeNode, Decision: "novox/hq ADR 0310", Serves: readsVerbs()},
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ func TestTheSeatsAreAClosedSetAndEachNamesItsDecision(t *testing.T) {
|
|||||||
delivered[s.Delivers] = s.Name
|
delivered[s.Delivers] = s.Name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Forty-two with node-smb-server (novox/hq ADR 0341); forty-one with node-reads (novox/hq ADR 0310); forty with node-nfs-server and node-mounts (novox/hq ADR 0263); thirty-eight with node-resolver (novox/hq ADR 0247); thirty-seven with mesh-delivery (novox/hq ADR 0239); thirty-six since node-resolver-config retired
|
// Forty-one with node-reads (novox/hq ADR 0310); forty with node-nfs-server and node-mounts (novox/hq ADR 0263); thirty-eight with node-resolver (novox/hq ADR 0247); thirty-seven with mesh-delivery (novox/hq ADR 0239); thirty-six since node-resolver-config retired
|
||||||
// into node-uplink (novox/hq ADR 0223); thirty-seven
|
// into node-uplink (novox/hq ADR 0223); thirty-seven
|
||||||
// since the retired node-dns-resolver went (novox/hq ADR 0220); thirty-eight with
|
// since the retired node-dns-resolver went (novox/hq ADR 0220); thirty-eight with
|
||||||
// node-backup (novox/hq ADR 0214); thirty-seven with node-message-bus (novox/hq ADR 0215);
|
// node-backup (novox/hq ADR 0214); thirty-seven with node-message-bus (novox/hq ADR 0215);
|
||||||
@@ -59,8 +59,8 @@ func TestTheSeatsAreAClosedSetAndEachNamesItsDecision(t *testing.T) {
|
|||||||
// node-container-runtime (ADR 0207); nineteen with node-environment and node-login-shell (ADR 0203,
|
// node-container-runtime (ADR 0207); nineteen with node-environment and node-login-shell (ADR 0203,
|
||||||
// ADR 0204); seventeen with node-build-agent (ADR 0190). One fewer once the retired
|
// ADR 0204); seventeen with node-build-agent (ADR 0190). One fewer once the retired
|
||||||
// mesh-build-machine row goes, when no registered manifest claims it.
|
// mesh-build-machine row goes, when no registered manifest claims it.
|
||||||
if len(Seats()) != 42 {
|
if len(Seats()) != 41 {
|
||||||
t.Errorf("the mesh defines %d seats rather than 42; the set is closed, so a change here is "+
|
t.Errorf("the mesh defines %d seats rather than 41; the set is closed, so a change here is "+
|
||||||
"a decision (novox/hq ADR 0110): %s", len(Seats()), seatNames())
|
"a decision (novox/hq ADR 0110): %s", len(Seats()), seatNames())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,10 +31,9 @@ func nfsServerVerbs() []Verb {
|
|||||||
{Name: "exports", Description: "Every share this machine exports: its name, its path, read-write or " +
|
{Name: "exports", Description: "Every share this machine exports: its name, its path, read-write or " +
|
||||||
"read-only, the owner every client is mapped to (uid and gid), each node it is exported to with that " +
|
"read-only, the owner every client is mapped to (uid and gid), each node it is exported to with that " +
|
||||||
"node's private address and access (only the nodes the server grants it to and that ask for it), " +
|
"node's private address and access (only the nodes the server grants it to and that ask for it), " +
|
||||||
"the subnets of this machine's local network it is exported to when the server grants it " +
|
"what is granted and not asked for or asked for and not granted, and whether the kernel holds it " +
|
||||||
"local-network (novox/hq ADR 0341), what is granted and not asked for or asked for and not " +
|
"now. Also the exports found that are not the mesh's: a dataset's sharenfs property, a line in " +
|
||||||
"granted, and whether the kernel holds it now. Also the exports found that are not the mesh's: a " +
|
"/etc/exports.",
|
||||||
"dataset's sharenfs property, a line in /etc/exports.",
|
|
||||||
Input: schema(map[string]string{}, nil),
|
Input: schema(map[string]string{}, nil),
|
||||||
Replaces: []string{"exportfs -v", "cat /etc/exports", "zfs get sharenfs"}},
|
Replaces: []string{"exportfs -v", "cat /etc/exports", "zfs get sharenfs"}},
|
||||||
{Name: "clients", Description: "Which machines have mounted which share now, as the NFS server " +
|
{Name: "clients", Description: "Which machines have mounted which share now, as the NFS server " +
|
||||||
@@ -56,10 +55,8 @@ func nfsServerVerbs() []Verb {
|
|||||||
Input: schema(map[string]string{}, nil),
|
Input: schema(map[string]string{}, nil),
|
||||||
Replaces: []string{"exportfs -ra"}},
|
Replaces: []string{"exportfs -ra"}},
|
||||||
{Name: "adopt", Description: "Take over an export a person made by hand: clear a dataset's sharenfs " +
|
{Name: "adopt", Description: "Take over an export a person made by hand: clear a dataset's sharenfs " +
|
||||||
"property for a path the mesh's own export now serves — only when that export is live and covers " +
|
"property for a path the mesh's own export now serves — only when that export is live. Without " +
|
||||||
"every client the property exported to: for a property exporting to the local network, the " +
|
"confirm, says what it would do and changes nothing.",
|
||||||
"mesh's local-network export of the path (novox/hq ADR 0341). Without confirm, says what it " +
|
|
||||||
"would do and changes nothing.",
|
|
||||||
Input: schema(map[string]string{
|
Input: schema(map[string]string{
|
||||||
"path": "the shared path whose hand-made export is taken over",
|
"path": "the shared path whose hand-made export is taken over",
|
||||||
"confirm": "\"true\": change it (needs why); anything else is a dry run",
|
"confirm": "\"true\": change it (needs why); anything else is a dry run",
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
package catalogue
|
|
||||||
|
|
||||||
// A machine's SMB shares, served to the devices on its own network that are not nodes (novox/hq
|
|
||||||
// ADR 0341).
|
|
||||||
//
|
|
||||||
// **One holder per machine.** Two modules writing one machine's Samba configuration is the conflict a
|
|
||||||
// seat exists to refuse, so the role is a node seat. It delivers nothing: its clients are devices that
|
|
||||||
// are not nodes, and a node that wants the same files mounts the NFS share (ADR 0263), so no provision
|
|
||||||
// is answered through it.
|
|
||||||
//
|
|
||||||
// **The data is the operator's** (ADR 0051). The holder never creates, chowns or removes anything under
|
|
||||||
// a shared path, and every client acts as the shared folder's owner. Its verbs read, and the one that
|
|
||||||
// takes over the configuration a person wrote by hand does it only on a person's word, keeping a dated
|
|
||||||
// copy of what it replaces.
|
|
||||||
|
|
||||||
// SMBServerSeat is the role of the machine that shares folders over SMB with its local network
|
|
||||||
// (novox/hq ADR 0341).
|
|
||||||
const SMBServerSeat = "node-smb-server"
|
|
||||||
|
|
||||||
// smbServerVerbs is the contract every holder of node-smb-server serves (novox/hq ADR 0341).
|
|
||||||
func smbServerVerbs() []Verb {
|
|
||||||
return []Verb{
|
|
||||||
{Name: "shares", Description: "Every SMB share this machine serves: its name, its path, read-write " +
|
|
||||||
"or read-only, the owner every client acts as (uid and gid), the logins allowed and whether each " +
|
|
||||||
"login's password was given or is kept as found, and whether the service serves it now. Also " +
|
|
||||||
"whether the configuration is the mesh's or still the hand-written one, and each hand-written " +
|
|
||||||
"share with whether the settings name it. A password is never shown.",
|
|
||||||
Input: schema(map[string]string{}, nil),
|
|
||||||
Replaces: []string{"testparm -s", "cat /etc/samba/smb.conf", "pdbedit -L"}},
|
|
||||||
{Name: "sessions", Description: "Which devices are connected to which share now, with the login and " +
|
|
||||||
"the protocol version each uses, as the SMB service knows them.",
|
|
||||||
Input: schema(map[string]string{}, nil),
|
|
||||||
Replaces: []string{"smbstatus"}},
|
|
||||||
{Name: "test", Description: "Whether this machine serves one share now and whether its SMB service " +
|
|
||||||
"is up and listening on 445: what a device on the local network is answered.",
|
|
||||||
Input: schema(map[string]string{"share": "the share, by its name"}, []string{"share"}),
|
|
||||||
Replaces: []string{"smbclient -L"}},
|
|
||||||
{Name: "reload", Description: "Have the SMB service read its configuration again now (smbcontrol " +
|
|
||||||
"reload-config) and answer the shares as it then serves them. The module's own process writes the " +
|
|
||||||
"configuration; this is for after a change made outside it. Changes no shared path.",
|
|
||||||
Input: schema(map[string]string{}, nil),
|
|
||||||
Replaces: []string{"smbcontrol smbd reload-config", "systemctl reload smb"}},
|
|
||||||
{Name: "adopt", Description: "Take over the SMB configuration a person wrote by hand: keep a dated " +
|
|
||||||
"copy of it beside it and write the mesh's own in its place — only when every hand-written share " +
|
|
||||||
"has its counterpart in the settings, so no share disappears. Without confirm, says what it would " +
|
|
||||||
"do and changes nothing: each hand-written share beside the mesh's rendering of it.",
|
|
||||||
Input: schema(map[string]string{
|
|
||||||
"confirm": "\"true\": change it (needs why); anything else is a dry run",
|
|
||||||
"why": "why, for the record",
|
|
||||||
}, nil, "confirm"),
|
|
||||||
Replaces: []string{"edit /etc/samba/smb.conf"}},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
package catalogue
|
|
||||||
|
|
||||||
import (
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Defends novox/hq ADR 0341: a machine's SMB shares are one node seat, node-smb-server, with its verbs
|
|
||||||
// required of every holder, delivering nothing — its clients are devices that are not nodes.
|
|
||||||
|
|
||||||
func TestTheSMBServerIsANodeSeatWithItsVerbs(t *testing.T) {
|
|
||||||
s, ok := SeatNamed(SMBServerSeat)
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("%s is not in the mesh's set", SMBServerSeat)
|
|
||||||
}
|
|
||||||
if s.Scope != ScopeNode || s.Decision != "novox/hq ADR 0341" || s.Delivers != "" || s.Replicated {
|
|
||||||
t.Errorf("%s is %+v; a node seat under ADR 0341 that delivers nothing", SMBServerSeat, s)
|
|
||||||
}
|
|
||||||
var got []string
|
|
||||||
for _, v := range s.Serves {
|
|
||||||
got = append(got, v.Name)
|
|
||||||
if v.Optional {
|
|
||||||
t.Errorf("%s.%s is optional; its first holder serves it", SMBServerSeat, v.Name)
|
|
||||||
}
|
|
||||||
if v.Description == "" || v.Input["type"] != "object" || len(v.Replaces) == 0 {
|
|
||||||
t.Errorf("%s.%s has no description, no object schema or says it replaces nothing", SMBServerSeat, v.Name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if strings.Join(got, " ") != "shares sessions test reload adopt" {
|
|
||||||
t.Errorf("%s serves %v", SMBServerSeat, got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Taking over the hand-written configuration is a person's act (ADR 0341 clause 7): a dry run unless the
|
|
||||||
// string switch says "true", and it says it keeps a dated copy and refuses to drop a share.
|
|
||||||
func TestTheSMBAdoptIsADryRunUnlessConfirmed(t *testing.T) {
|
|
||||||
s, _ := SeatNamed(SMBServerSeat)
|
|
||||||
for _, v := range s.Serves {
|
|
||||||
if v.Name != "adopt" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
props, _ := v.Input["properties"].(map[string]any)
|
|
||||||
confirm, _ := props["confirm"].(map[string]any)
|
|
||||||
if confirm == nil || confirm["enum"] == nil || confirm["type"] != "string" {
|
|
||||||
t.Errorf("adopt has no string confirm switch: %v", v.Input)
|
|
||||||
}
|
|
||||||
for _, says := range []string{"Without confirm, says what it would do and changes nothing", "dated copy", "no share disappears"} {
|
|
||||||
if !strings.Contains(v.Description, says) {
|
|
||||||
t.Errorf("adopt does not say %q: %s", says, v.Description)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
t.Error("node-smb-server has no adopt")
|
|
||||||
}
|
|
||||||
|
|
||||||
// A holder serving every verb holds the seat; a verb too many, one too few or the mesh's scope is refused,
|
|
||||||
// as the catalogue's smb-server module claims it.
|
|
||||||
func TestAHolderOfTheSMBSeatServesEveryVerbAndNothingElse(t *testing.T) {
|
|
||||||
seat, _ := SeatNamed(SMBServerSeat)
|
|
||||||
verbs := []string{"shares", "sessions", "test", "reload", "adopt"}
|
|
||||||
holder := Manifest{Module: "smb-server", Version: "1",
|
|
||||||
Claims: []Claim{{Name: SMBServerSeat, Scope: ScopeNode, Serves: verbs}}}
|
|
||||||
if err := CanHold(holder, seat); err != nil {
|
|
||||||
t.Errorf("smb-server serving every verb is refused: %v", err)
|
|
||||||
}
|
|
||||||
short := holder
|
|
||||||
short.Claims = []Claim{{Name: SMBServerSeat, Scope: ScopeNode, Serves: verbs[:4]}}
|
|
||||||
if err := CanHold(short, seat); err == nil || !strings.Contains(err.Error(), "adopt") {
|
|
||||||
t.Errorf("leaving adopt out was accepted: %v", err)
|
|
||||||
}
|
|
||||||
mesh := holder
|
|
||||||
mesh.Claims = []Claim{{Name: SMBServerSeat, Scope: ScopeMesh, Serves: verbs}}
|
|
||||||
if err := CanHold(mesh, seat); err == nil {
|
|
||||||
t.Error("claiming a node seat at the mesh's scope was accepted")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// node-nfs-server's adopt clears sharenfs only once the mesh's export covers every client the property
|
|
||||||
// exported to, the local network included (ADR 0341 clause 10), and exports names the local-network grant.
|
|
||||||
func TestTheNFSVerbsSayTheLocalNetworkGrant(t *testing.T) {
|
|
||||||
s, _ := SeatNamed(NFSServerSeat)
|
|
||||||
for _, v := range s.Serves {
|
|
||||||
switch v.Name {
|
|
||||||
case "adopt":
|
|
||||||
if !strings.Contains(v.Description, "covers every client the property exported to") {
|
|
||||||
t.Errorf("nfs adopt does not wait for the export to cover every client: %s", v.Description)
|
|
||||||
}
|
|
||||||
case "exports":
|
|
||||||
if !strings.Contains(v.Description, "local-network") {
|
|
||||||
t.Errorf("nfs exports does not say the local-network grant: %s", v.Description)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -58,7 +58,42 @@ func (i *Inventory) Dependencies(ctx context.Context) ([]Edge, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return dependenciesOf(entries, against, nil), nil
|
held, err := i.Held(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return dependenciesWith(entries, against, held), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// packagesHeld is, by package name, the module whose artifact the mesh holds as that package: a
|
||||||
|
// `package` artifact's reference is `<name>@<version>` (the builder's publishPackage), never an
|
||||||
|
// artifact-store reference, so a build that stood on it recorded the package's name and version.
|
||||||
|
func packagesHeld(held map[string]string) map[string]string {
|
||||||
|
out := map[string]string{}
|
||||||
|
for key, reference := range held {
|
||||||
|
module, _, ok := strings.Cut(key, "/")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if name := packageName(reference); name != "" {
|
||||||
|
out[name] = module
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// packageName is the name of a `<name>@<version>` package reference, or "" for anything else: a
|
||||||
|
// kept or pinned image (`…@sha256:…`), a URL, or a reference with no version.
|
||||||
|
func packageName(reference string) string {
|
||||||
|
if strings.HasPrefix(reference, catalogue.ArtifactStoreScheme) || strings.Contains(reference, "@sha256:") ||
|
||||||
|
strings.Contains(reference, "://") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
at := strings.LastIndex(reference, "@")
|
||||||
|
if at <= 0 || at == len(reference)-1 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return reference[:at]
|
||||||
}
|
}
|
||||||
|
|
||||||
// dependenciesOf is Dependencies over what was read, so a test can hand it a catalogue.
|
// dependenciesOf is Dependencies over what was read, so a test can hand it a catalogue.
|
||||||
@@ -66,6 +101,20 @@ func (i *Inventory) Dependencies(ctx context.Context) ([]Edge, error) {
|
|||||||
// `read` draws no edge (novox/hq ADR 0267 rule 4): what a build read moves it through its build source, in
|
// `read` draws no edge (novox/hq ADR 0267 rule 4): what a build read moves it through its build source, in
|
||||||
// the planner, never through the relation.
|
// the planner, never through the relation.
|
||||||
func dependenciesOf(entries []Entry, against map[string][]string, _ map[string][]ReadRepository) []Edge {
|
func dependenciesOf(entries []Entry, against map[string][]string, _ map[string][]ReadRepository) []Edge {
|
||||||
|
return dependenciesWith(entries, against, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dependenciesWith is the relation with the artifacts the mesh holds, "<module>/<artifact>" to its
|
||||||
|
// reference (Held), so a package a build stood on is read as its module's.
|
||||||
|
//
|
||||||
|
// **A built manifest carries no `build`** (catalogue.Resolve drops it), so what a module declared it
|
||||||
|
// is built on is read from what is kept of it once it is built (novox/hq issue 614): the bases its
|
||||||
|
// newest build was handed (`against`) — an artifact-store reference, or a package's `<name>@<version>`
|
||||||
|
// — and the language of every bundle it compiled (`Bundles`). Read only from records the mesh already
|
||||||
|
// keeps, so it holds for every module built before it, and a controller rolled back to one without it
|
||||||
|
// reads the same records as before.
|
||||||
|
func dependenciesWith(entries []Entry, against map[string][]string, held map[string]string) []Edge {
|
||||||
|
packages := packagesHeld(held)
|
||||||
known := map[string]bool{}
|
known := map[string]bool{}
|
||||||
var builders []string
|
var builders []string
|
||||||
for _, e := range entries {
|
for _, e := range entries {
|
||||||
@@ -111,6 +160,13 @@ func dependenciesOf(entries []Entry, against map[string][]string, _ map[string][
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// **And once it is built**, from the bundles its resolved manifest keeps (novox/hq issue 614): the
|
||||||
|
// `build` it was declared with is gone by then, and a toolchain that moved rebuilt none of them.
|
||||||
|
for _, b := range e.Manifest.Bundles {
|
||||||
|
if chain, err := builder.ToolchainFor(b.Language); err == nil {
|
||||||
|
add(name, chain.Base, EdgeStandsOn)
|
||||||
|
}
|
||||||
|
}
|
||||||
for _, ref := range against[name] {
|
for _, ref := range against[name] {
|
||||||
if rest, ok := strings.CutPrefix(ref, catalogue.ArtifactStoreScheme); ok {
|
if rest, ok := strings.CutPrefix(ref, catalogue.ArtifactStoreScheme); ok {
|
||||||
// A copy of an upstream image is no module's artifact (novox/hq ADR 0257): its
|
// A copy of an upstream image is no module's artifact (novox/hq ADR 0257): its
|
||||||
@@ -121,6 +177,13 @@ func dependenciesOf(entries []Entry, against map[string][]string, _ map[string][
|
|||||||
if base, _, found := strings.Cut(rest, "/"); found {
|
if base, _, found := strings.Cut(rest, "/"); found {
|
||||||
add(name, base, EdgeStandsOn)
|
add(name, base, EdgeStandsOn)
|
||||||
}
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// A package base (`build.on` naming a module's `package` artifact) is recorded as the
|
||||||
|
// package's name and version (novox/hq issue 614): the module that publishes that package
|
||||||
|
// is what it stood on, whichever version the mesh holds now.
|
||||||
|
if base, ok := packages[packageName(ref)]; ok {
|
||||||
|
add(name, base, EdgeStandsOn)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if e.Source.Repository != "" {
|
if e.Source.Repository != "" {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package inventory
|
package inventory
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/novox/mesh-controller/internal/catalogue"
|
"github.com/novox/mesh-controller/internal/catalogue"
|
||||||
@@ -174,3 +175,74 @@ func TestACopyOfAnUpstreamImageIsNoEdge(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// **A built module keeps its build edges** (novox/hq issue 614). A manifest the mesh registers from a
|
||||||
|
// build carries no `build` (catalogue.Resolve drops it), so mesh-tools' `build.on` naming mesh-sdk's
|
||||||
|
// `lib` package and a provider's TypeScript bundle drew no edge once built, and a new SDK rebuilt
|
||||||
|
// neither. The package base is read from what the build was handed (`@novox/mesh-sdk@0.1.13`, the
|
||||||
|
// package's name whichever version the mesh holds now), the toolchain from the bundles it keeps.
|
||||||
|
func TestABuiltModuleKeepsItsBuildEdges(t *testing.T) {
|
||||||
|
built := func(name string, bundles ...catalogue.Bundle) Entry {
|
||||||
|
return Entry{Manifest: catalogue.Manifest{Module: name, Bundles: bundles},
|
||||||
|
Source: Source{Repository: "http://forge/novox/" + name + ".git"}}
|
||||||
|
}
|
||||||
|
entries := []Entry{
|
||||||
|
built("mesh-sdk"),
|
||||||
|
built("mesh-tools"),
|
||||||
|
built("mesh-tools-go"),
|
||||||
|
built("minio", catalogue.Bundle{Name: "code", Language: "typescript"}),
|
||||||
|
built("umami", catalogue.Bundle{Name: "code", Language: "TypeScript"}),
|
||||||
|
built("dnsmasq", catalogue.Bundle{Name: "tools", Language: "go"}),
|
||||||
|
built("plain"),
|
||||||
|
}
|
||||||
|
against := map[string][]string{
|
||||||
|
"mesh-tools": {"@novox/mesh-sdk@0.1.13",
|
||||||
|
catalogue.ArtifactStoreScheme + "upstream/docker.io/library/node@sha256:" + strings.Repeat("0", 64)},
|
||||||
|
// A package nobody in the mesh publishes is no edge.
|
||||||
|
"plain": {"left-pad@1.3.0"},
|
||||||
|
}
|
||||||
|
held := map[string]string{
|
||||||
|
"mesh-sdk/lib": "@novox/mesh-sdk@0.1.14",
|
||||||
|
"mesh-tools/runtime": catalogue.ArtifactStoreScheme + "mesh-tools/runtime@sha256:" + strings.Repeat("1", 64),
|
||||||
|
}
|
||||||
|
got := dependenciesWith(entries, against, held)
|
||||||
|
has := func(from, to string) bool {
|
||||||
|
for _, e := range got {
|
||||||
|
if e.From == from && e.To == to && e.Kind == EdgeStandsOn {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, want := range [][2]string{
|
||||||
|
{"mesh-tools", "mesh-sdk"},
|
||||||
|
{"minio", "mesh-tools"},
|
||||||
|
{"umami", "mesh-tools"},
|
||||||
|
{"dnsmasq", "mesh-tools-go"},
|
||||||
|
} {
|
||||||
|
if !has(want[0], want[1]) {
|
||||||
|
t.Errorf("no %s stands-on %s: %+v", want[0], want[1], got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, e := range got {
|
||||||
|
if e.From == "plain" && e.Kind != EdgeBuiltBy {
|
||||||
|
t.Errorf("an unknown package drew an edge: %+v", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAPackageNameIsReadOnlyFromAPackageReference(t *testing.T) {
|
||||||
|
for ref, want := range map[string]string{
|
||||||
|
"@novox/mesh-sdk@0.1.14": "@novox/mesh-sdk",
|
||||||
|
"left-pad@1.3.0": "left-pad",
|
||||||
|
"@novox/mesh-sdk": "",
|
||||||
|
"novox.internal:5100/mesh-tools/build@sha256:" + strings.Repeat("0", 64): "",
|
||||||
|
catalogue.ArtifactStoreScheme + "mesh-tools/build@sha256:0": "",
|
||||||
|
"http://store/v2/x/blobs/sha256:0": "",
|
||||||
|
"": "",
|
||||||
|
} {
|
||||||
|
if got := packageName(ref); got != want {
|
||||||
|
t.Errorf("packageName(%q) = %q, want %q", ref, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Vendored
+1
@@ -45,3 +45,4 @@
|
|||||||
./cmd/mesh-controller TestReplay348AFaultFromBeforeTheSendFailsNoGate
|
./cmd/mesh-controller TestReplay348AFaultFromBeforeTheSendFailsNoGate
|
||||||
./cmd/mesh-controller TestReplay239AModuleNameIsNotTakenOverByAnotherRepository
|
./cmd/mesh-controller TestReplay239AModuleNameIsNotTakenOverByAnotherRepository
|
||||||
./cmd/mesh-controller TestAWalkThatMovedNothingSaysWhichModulesMatchedWhatRuns
|
./cmd/mesh-controller TestAWalkThatMovedNothingSaysWhichModulesMatchedWhatRuns
|
||||||
|
./cmd/mesh-controller TestReplay614ANewSDKPlansTheToolchainAndThenItsBundles
|
||||||
|
|||||||
Reference in New Issue
Block a user