Implements novox/hq ADR 0110 and 0111. The seat set lives in internal/catalogue/seats.go: fourteen seats, each with a scope, what occupying it delivers, and the record that made it one. A test asserts the count and a decision per entry, so changing the set means finding the argument, as the host's vocabulary test does. The first set is every seat already claimed — including the-private-network, which the network module claims from a manifest composed in this repository's code, not from any module.json — plus npm-package-registry (ADR 0109) and git (ADR 0111). A test parses every catalogue manifest and this repository's own and fails on any refused claim, so closing the set refuses nothing in use. ParseManifest now refuses a claim on a seat the mesh does not define, a seat claimed at another scope, and a delivering seat claimed by a module that does not provide what it delivers. A malformed claim is refused once, for being malformed. Resolution: among several providers of a mesh provision, a pin still wins; then the holder of the seat that delivers it; then the only provider; otherwise refused as before. ADR 0009's "never guessed" holds — the seat is the choice made once, mesh-wide, rather than a pin per consumer node. A provider now carries the module it came from, because a provider is a (node, module) pair and the pair is what tells a holder from a neighbour on the same machine. The planner's second pass is now given the first pass's holdings. Without them, a node consuming a seat-delivered provision was refused there, and a refused node's own claims dropped out of what the mesh holds — letting a second holder of one of its seats pass unrefused. `seats [--json]` lists every seat, what it delivers, and each holder, derived from assignments every time and never stored. Unheld seats are listed. A stored claim outside the set — possible for a manifest registered before the set closed, since stored manifests are not re-validated — is shown rather than hidden. `build --self <owner>/<repo>` builds from a repository on the git seat's holder. The clone URL is composed at build time from the holder's node and what it serves for git; the recorded source is the path and the seat (migration 0032), never an address, so a moved forge changes nothing recorded. Nobody holding the seat refuses self-hosted builds and says so; external URLs are unchanged. An address passed with --self is refused rather than recorded as a path. Replaces three foundation tests that defended the builder's carried package binding. The catalogue removed that binding when the builder began requiring the registry through a real grant, so the tests were already failing on main; they now assert the builder requires what the npm seat delivers and carries no copy of its own, and that the forge holds the npm and git seats. Verified: go vet clean; the whole suite passes against a throwaway Postgres (make postgres), the new inventory tests included; gofmt clean apart from cmd/mesh-builder/stdout_test.go, which fails on main too.
151 lines
4.3 KiB
Go
151 lines
4.3 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"sort"
|
|
"strings"
|
|
"text/tabwriter"
|
|
|
|
"github.com/novox/mesh-controller/internal/catalogue"
|
|
)
|
|
|
|
// What this mesh can have one of, and who fills each (novox/hq ADR 0110).
|
|
//
|
|
// **Derived every time, never stored.** A seat is held by a module assignment, so the answer is
|
|
// computed from assignments by the same resolution that decides what every machine runs. A table
|
|
// of holders kept beside the assignments would be a second copy of one fact, and the first thing
|
|
// to be wrong about it.
|
|
|
|
// seatHolder is one assignment holding a seat.
|
|
type seatHolder struct {
|
|
Node string `json:"node"`
|
|
Module string `json:"module"`
|
|
}
|
|
|
|
// seatRow is one seat and who holds it. Unheld is an answer — "this mesh has no X" — not a fault.
|
|
type seatRow struct {
|
|
Seat string `json:"seat"`
|
|
Scope string `json:"scope"`
|
|
Delivers string `json:"delivers,omitempty"`
|
|
Decision string `json:"decision"`
|
|
Holders []seatHolder `json:"holders"`
|
|
}
|
|
|
|
// seatsHeld is every seat the mesh defines with its holders, and every claim held that names no
|
|
// seat in the set.
|
|
//
|
|
// **The second list is not empty by construction.** Manifests are held to the set when they are
|
|
// registered, and a mesh can hold one registered before the set closed. Leaving its claim out of the
|
|
// overview would make the one thing the overview is for — what does this mesh have — quietly
|
|
// incomplete.
|
|
func seatsHeld(seats []catalogue.Seat, held []catalogue.Held) ([]seatRow, []catalogue.Held) {
|
|
defined := map[string]bool{}
|
|
rows := make([]seatRow, 0, len(seats))
|
|
for _, s := range seats {
|
|
defined[s.Name] = true
|
|
row := seatRow{Seat: s.Name, Scope: s.Scope, Delivers: s.Delivers, Decision: s.Decision,
|
|
Holders: []seatHolder{}}
|
|
seen := map[seatHolder]bool{}
|
|
for _, h := range held {
|
|
if h.Claim != s.Name || h.Scope != s.Scope {
|
|
continue
|
|
}
|
|
holder := seatHolder{Node: h.Node, Module: h.Module}
|
|
if !seen[holder] {
|
|
seen[holder] = true
|
|
row.Holders = append(row.Holders, holder)
|
|
}
|
|
}
|
|
sort.Slice(row.Holders, func(i, j int) bool {
|
|
if row.Holders[i].Node != row.Holders[j].Node {
|
|
return row.Holders[i].Node < row.Holders[j].Node
|
|
}
|
|
return row.Holders[i].Module < row.Holders[j].Module
|
|
})
|
|
rows = append(rows, row)
|
|
}
|
|
var outside []catalogue.Held
|
|
for _, h := range held {
|
|
if !defined[h.Claim] {
|
|
outside = append(outside, h)
|
|
}
|
|
}
|
|
sort.Slice(outside, func(i, j int) bool {
|
|
if outside[i].Claim != outside[j].Claim {
|
|
return outside[i].Claim < outside[j].Claim
|
|
}
|
|
return outside[i].Node < outside[j].Node
|
|
})
|
|
return rows, outside
|
|
}
|
|
|
|
func seatsCommand(ctx context.Context, args []string) error {
|
|
set := flag.NewFlagSet("seats", flag.ContinueOnError)
|
|
asJSON := set.Bool("json", false, "the same, as JSON")
|
|
if err := set.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
open, err := openStores(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer open.Close()
|
|
inv := open.inventory
|
|
shelf, err := inv.Catalogue(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Every node, none excluded: the same view of what each machine holds that planning uses.
|
|
world, err := theRestOfTheMesh(ctx, inv, shelf, "")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
rows, outside := seatsHeld(catalogue.Seats(), world.Held)
|
|
|
|
if *asJSON {
|
|
out := struct {
|
|
Seats []seatRow `json:"seats"`
|
|
Outside []catalogue.Held `json:"outside,omitempty"`
|
|
}{rows, outside}
|
|
body, err := json.MarshalIndent(out, "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fmt.Println(string(body))
|
|
return nil
|
|
}
|
|
|
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
|
fmt.Fprintln(w, "SEAT\tSCOPE\tDELIVERS\tHELD BY")
|
|
for _, r := range rows {
|
|
delivers := r.Delivers
|
|
if delivers == "" {
|
|
delivers = "—"
|
|
}
|
|
holders := "unheld"
|
|
if len(r.Holders) > 0 {
|
|
parts := make([]string, 0, len(r.Holders))
|
|
for _, h := range r.Holders {
|
|
parts = append(parts, h.Module+" on "+h.Node)
|
|
}
|
|
holders = strings.Join(parts, ", ")
|
|
}
|
|
fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", r.Seat, r.Scope, delivers, holders)
|
|
}
|
|
if err := w.Flush(); err != nil {
|
|
return err
|
|
}
|
|
if len(outside) > 0 {
|
|
fmt.Println("\nheld, and not a seat this mesh defines (registered before the set closed — novox/hq ADR 0110):")
|
|
for _, h := range outside {
|
|
fmt.Printf(" %s %s on %s\n", h.Claim, h.Module, h.Node)
|
|
}
|
|
}
|
|
return nil
|
|
}
|