diff --git a/cmd/mesh-controller/addresses_integration_test.go b/cmd/mesh-controller/addresses_integration_test.go index 1420e0f6..e2143496 100644 --- a/cmd/mesh-controller/addresses_integration_test.go +++ b/cmd/mesh-controller/addresses_integration_test.go @@ -78,6 +78,8 @@ func TestTheRegistryTrustAndEveryImageFollowThePortTheNodeGaveTheStore(t *testin func TestTheControlPlaneIsToldWhereTheNodePutTheStoreAndTheBroker(t *testing.T) { open := aMesh(t) + // Issue 1126: the placement export over this fresh mesh, before anything below changes it. + placementExportIsEachNodesPlacementFromTheStore(t, open) ctx := t.Context() raw, err := os.ReadFile("../../module.json") if err != nil { diff --git a/cmd/mesh-controller/nodes.go b/cmd/mesh-controller/nodes.go index f1ae066f..cfd0aeb0 100644 --- a/cmd/mesh-controller/nodes.go +++ b/cmd/mesh-controller/nodes.go @@ -133,9 +133,14 @@ func nodeCommand(ctx context.Context, args []string) error { // refuse (novox/hq issue 358). Read-only on the node and here, so a verb may run it too. return nodeJudgeDirectories(ctx, open, args[1:]) + case "placement-export": + // Each node's placement as the catalogue's placement file says it (novox/hq ADR 0555 §6): read-only, so a verb + // may run it. + return placementExport(ctx, open, args[1:]) + default: return fmt.Errorf("node has no %q; it has add, list, show, public-domain, account, agent-account, hand-over, "+ - "setuid-search and judge-directories", args[0]) + "setuid-search, judge-directories and placement-export", args[0]) } } diff --git a/cmd/mesh-controller/placement_export.go b/cmd/mesh-controller/placement_export.go new file mode 100644 index 00000000..0f5a7e7e --- /dev/null +++ b/cmd/mesh-controller/placement_export.go @@ -0,0 +1,50 @@ +package main + +import ( + "context" + "errors" + "sort" + + "git.novox.be/novox/mesh-sdk/go/compose/frombus" + "git.novox.be/novox/mesh-sdk/go/delivery" +) + +// placementExport prints each node's placement as the catalogue's placement file says it (novox/hq ADR 0555 §6, issue +// 1126): what a person decided of the node and where its modules run, read by this controller's own code from its own +// store, as JSON keyed by node. The one verb the controller gains for its exit (the operator, 2026-10-26 19:06:40, ADR +// 0547 §1's one exception besides §5's grant): read once by the seed of the placement files, whose pull request merges +// only when its composition check composes every node equal to what it runs. It reads the same Input every composition +// of this controller reads (readMeshAndNodes, readSettings) and writes nothing. +// +// It moves a piece of the research "The controller, NATS-native": the controller's last node data (node rows, placement, +// ports, pins, bindings, config placement) leaves it for the catalogue, before its exit at ADR 0547's third milestone. +func placementExport(ctx context.Context, open *stores, args []string) error { + if len(args) > 1 { + return errors.New("node placement-export []") + } + in, _, err := readMeshAndNodes(ctx, open) + if err != nil { + return err + } + if _, err := readSettings(ctx, open, &in); err != nil { + return err + } + var names []string + if len(args) == 1 { + names = []string{args[0]} + } else { + for _, n := range in.Nodes { + names = append(names, n.Name) + } + sort.Strings(names) + } + out := make(map[string]delivery.Placement, len(names)) + for _, name := range names { + p, err := frombus.Export(in, name) + if err != nil { + return err + } + out[name] = p + } + return printJSON(out) +} diff --git a/cmd/mesh-controller/placement_export_integration_test.go b/cmd/mesh-controller/placement_export_integration_test.go new file mode 100644 index 00000000..35eb57e0 --- /dev/null +++ b/cmd/mesh-controller/placement_export_integration_test.go @@ -0,0 +1,71 @@ +//go:build integration + +package main + +import ( + "encoding/json" + "strings" + "testing" + + "git.novox.be/novox/mesh-sdk/go/compose/frombus" + sdkdelivery "git.novox.be/novox/mesh-sdk/go/delivery" + "git.novox.be/novox/mesh-sdk/go/overlay" +) + +// Issue 1126 (novox/hq ADR 0555 §6, the operator's one export verb of 2026-10-26 19:06:40): `node placement-export` +// answers, from the real store, each node's placement as the catalogue's placement file says it: what a person decided +// of the node (its endpoint, site, hub and address on the private network) and its modules in the order the composition +// reads them, exactly frombus.Export of the input this controller composes from; one node when named; a node the store +// lacks is refused. Checked within TestTheControlPlaneIsToldWhereTheNodePutTheStoreAndTheBroker, over the same fresh +// mesh, so the export adds no integration test of its own (the test budget). +func placementExportIsEachNodesPlacementFromTheStore(t *testing.T, open *stores) { + t.Helper() + ctx := t.Context() + in, _, err := readMeshAndNodes(ctx, open) + if err != nil { + t.Fatal(err) + } + if _, err := readSettings(ctx, open, &in); err != nil { + t.Fatal(err) + } + var all map[string]sdkdelivery.Placement + if err := json.Unmarshal([]byte(stdoutOf(t, func() error { return placementExport(ctx, open, nil) })), &all); err != nil { + t.Fatal(err) + } + if len(all) != 2 { + t.Fatalf("exported %d nodes, want anchor and laptop", len(all)) + } + for i, name := range []string{"anchor", "laptop"} { + got := all[name] + d := got.Decided + if d.Endpoint != name+".example:51820" || d.Site != "here" || d.Hub != (name == "anchor") || d.Address != []string{"10.77.0.1", "10.77.0.2"}[i] { + t.Errorf("%s's decided facts are %+v", name, d) + } + if a := got.Assigned(); len(a) == 0 || !strings.Contains(strings.Join(a, ","), overlay.Name) { + t.Errorf("%s's modules are %v, want the private network among them", name, a) + } + // What it prints is the file the seed writes: at the placement file's version, read back by its reader. + if raw, _ := json.Marshal(got); got.V != sdkdelivery.Version { + t.Errorf("%s is exported at version %d: %s", name, got.V, raw) + } else if _, err := sdkdelivery.DecodePlacement(raw); err != nil { + t.Errorf("%s's export does not read as a placement file: %v", name, err) + } + want, err := frombus.Export(in, name) + if err != nil { + t.Fatal(err) + } + if !sdkdelivery.SamePlacement(got, want) { + t.Errorf("%s's export differs from frombus.Export of the controller's own input:\n%+v\n%+v", name, got, want) + } + } + var one map[string]sdkdelivery.Placement + if err := json.Unmarshal([]byte(stdoutOf(t, func() error { return placementExport(ctx, open, []string{"laptop"}) })), &one); err != nil { + t.Fatal(err) + } + if _, ok := one["laptop"]; !ok || len(one) != 1 { + t.Errorf("one node named exported %v", one) + } + if err := placementExport(ctx, open, []string{"stranger"}); err == nil { + t.Error("a node the store lacks was exported") + } +} diff --git a/cmd/mesh-controller/seatverbs.go b/cmd/mesh-controller/seatverbs.go index ae2e4643..819f528a 100644 --- a/cmd/mesh-controller/seatverbs.go +++ b/cmd/mesh-controller/seatverbs.go @@ -349,6 +349,11 @@ func (a *verbArguments) commandLine() ([]string, error) { return nil, err } return []string{"node", "judge-directories", str("node")}, nil + case "placement-export": + if node := str("node"); node != "" { + return []string{"node", "placement-export", node}, nil + } + return []string{"node", "placement-export"}, nil case "modules": return []string{"module", "list", "--json"}, nil case "seats": @@ -1400,7 +1405,9 @@ func seatAnnouncement(handlers map[string]link.ToolHandler) micro.Info { // nodeReads are the `node` subcommands a verb may run: the ones that only read. var nodeReads = map[string]bool{"list": true, "show": true, // Read-only on the node too: the engine judges its directories and changes nothing (novox/hq issue 358). - "judge-directories": true} + "judge-directories": true, + // Each node's placement as the catalogue's placement file says it, read from the store (novox/hq ADR 0555 §6). + "placement-export": true} // flagsOnly says a command line's rest names no subcommand: empty, or beginning with a flag. For a command // with no subcommands every word is a flag, its value or a name it reads. diff --git a/go.mod b/go.mod index 5b8386cc..c655ea69 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/novox/mesh-controller go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026144731-a7a1fbd34e1d + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026210326-979644420117 github.com/jackc/pgx/v5 v5.10.0 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 diff --git a/go.sum b/go.sum index 1b598142..265a697a 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ git.novox.be/novox/mesh-host v0.0.0-20261018171808-9d9e3a46c4f5 h1:E5stfIeCN6uYgA9TCv+4K8JgaURg3zQppvUgJLaDMP4= git.novox.be/novox/mesh-host v0.0.0-20261018171808-9d9e3a46c4f5/go.mod h1:4wyoCr6IIIIarEUuROThWDj7DAvJvIidqMjWcpSnOwE= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026144731-a7a1fbd34e1d h1:saIO27B0lDKx2VCS9om2RWQdB9epRDCUigGps5J3Miw= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026144731-a7a1fbd34e1d/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026210326-979644420117 h1:88CNZOoQgu7YPYKW16qkWT8Gw9Ucg07aTrIImA2nYUk= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026210326-979644420117/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op h1:Z/MZK75wC/NSrkgqeNIa7jexam9uWzhLmFTSCPI/kn0= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op/go.mod h1:FQyySiasQQM8735Ddel3MRojmy4dA1IqCeyJ5jmPMbI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/module.json b/module.json index eb6ee64c..2fce1341 100644 --- a/module.json +++ b/module.json @@ -82,6 +82,7 @@ "dead-letters", "root-free", "judge-directories", + "placement-export", "data", "build", "artifacts", diff --git a/testdata/beside/CAPTURED b/testdata/beside/CAPTURED index 814716c5..d9d8f55a 100644 --- a/testdata/beside/CAPTURED +++ b/testdata/beside/CAPTURED @@ -9,7 +9,7 @@ a second place to clean besides the catalogue itself. mesh-catalog 3a1017f5594217092a654dd1e2d72226766bc16a modules/*/module.json, modules/*/files, modules/*/templates, predefined.json mesh-host 9d9e3a46c4f5943cfffb413d962ce48b75e2fd39 examples/foundation-first-node.lock -mesh-sdk a7a1fbd34e1d858df6e483580bdb4910fffa8b8c conformance/events/module-event.json +mesh-sdk 979644420117d8d48c7228fc06a51a92a1dc5279 conformance/events/module-event.json To move them, from this repository's root, with the two repositories checked out beside it: