Every caller composes through mesh-sdk's go/compose since issues 1386 to 1388; the controller's second copy of the composition is dead code. The parent of this commit isfb556d6b, whose try (build-1792493691274712799, 17m28s, 2026-10-20 11:12 UTC) ran the equality test green on the live facts: every machine was sent and compared both ways (ADR 0453, issue 1384). Deleted, 40 functions: in plan.go planFor, declarationWith, renderingFor, grantsFor, theRestOfTheMesh and their helpers (boundOfGrant, busCredentialIssued, carriedBuilds, carriedOn, composeBusUsers, engineJudgesRoot, engineReadsHealth, engineTakesHanded, takesHanded, givenUnderAnOldKey, issuedToHolder, keyFor, licencesFor, managerPublicKeyFor, movedProvider, providerMoved, providerModuleOf, sayLeftOut, seatsOn, wireBuilds, zonesInTheMesh); in network.go generators, whoResolves, namesInTheMesh, onThePrivateNetwork; composedAndValidated, adoptionFor, adoptionOf, engineOpensVaultBox, namedModules, localNetworksOf, keepRecorded, passSeatsOn, theMeshPassesSeatsOn, assignmentsOf. Choosing (Reading, Allocating, Foreseeing) is gone: coreBoxesFor and coreBoxesOf take a plain allocating flag. composeForPush no longer takes the private network it ignored. The seat pass of a send is performSeatPasses, over the passes the composition names. Measured: cmd/mesh-controller non-test code 67,643 -> 65,821 lines (-1,822), its tests 57,691 -> 57,286, with the integration part of the equality test removed here because it calls the deleted functions. Not the issue's 3,000: that counts all of plan.go (2,192 lines), of which the callers, the verbs, the perform step and the sends remain (sendable, recorded builds, the held-back and ready-node logic, the plan verb, the gate's trial); and the 37 functions a name walk lists as unreachable are called through interfaces and method sets and are kept. Tests dropped, each with the mesh-sdk go/compose test that holds its cases: - seat_pass_test.go TestACompositionWithTwoClaimantsRecordsNoneAndSaysSo, TestACompositionChangesNothingWhileTheHolderIsAssignedOrNobodyClaims, TestAHolderAssignedButNotOnTheShelfIsNotTakenForGone: rest_test.go TestNoSeatIsPassedForTwoClaimantsAnAssignedHolderOrNoClaimant, TestAHolderAssignedButNotOnTheShelfIsNotTakenForGone, TestASeatWhoseHolderIsAssignedNowhereGoesToItsOnlyClaimant. TestACompositionPassesTheSeatAndWritesOneHandActByTheController and TestALostPassWritesNoActAndAFailedOneLeavesTheRecord stay as tests of the send's step (performSeatPasses); TestAThrowawayMeshPassesTheSeatInMemoryAndWritesNothing stays as TestAThrowawayMeshWritesNoHandActForAPass. - seat_pass_test.go TestNoSeatIsPassedWhenAMachinesAssignmentsCouldNotBeRead: no counterpart, and none is needed: the adapter reads every machine's assignments for the Input and a machine whose read fails fails the Input, so no seat is passed on a partial read. - network_test.go TestOnlyAMachineOnThePrivateNetworkIsNamed: network_test.go TestANodeNotOnThePrivateNetworkGetsNoAddressAndNoNetwork. - held_back_test.go TestASendCarriesTheCurrentBuildsAndALeftOutModuleKeepsItsOwn: node_test.go TestAModuleLeftOutKeepsTheBuildItWasLastSent (and compose_sdk_test.go's table, now literal). - modules_wire_test.go TestTheBuildOfACarriedCommitIsTheAssignmentsOrTheOneBuiltFromIt: node_test.go TestTheBodyCarriesTheOrderTheInputGivesAndTheBuildsOnlyToAnEngineThatReadsThem. - compose_equal_integration_test.go: the old path it compares against is deleted; its last run is the parent's try. Rewritten against mesh-sdk, same cases: issued_test.go (needs now come from compose.Resolve: Needed.IssuedToHolder and ProviderMoved), module_health_test.go and merge_gate_handing tests (the contract in the Input), provisioner_account_integration_test.go (the composition's refusal), one_resolution_integration_test.go (sayFound). Every test of the send, perform, the adapter and the verbs is kept; the tests that used planFor, declarationWith, generators, renderingFor or grantsFor as setup use resolveNode, composeSend, composeQuestion, renderingOf and grantsOf. compose_callers_test.go now fails when any deleted name is declared or called again. Committed by copying the files of a staging branch (stage/r4b-1389 at198be8217c, built fromfb556d6bby patch commits and compared with the author's worktree), so that this commit's parent isfb556d6b.
129 lines
4.8 KiB
Go
129 lines
4.8 KiB
Go
package main
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"git.novox.be/novox/mesh-sdk/go/catalogue"
|
|
"github.com/novox/mesh-controller/internal/conditions"
|
|
"github.com/novox/mesh-controller/internal/inventory"
|
|
)
|
|
|
|
// Between `assign` and `push` a module's own secrets are not made yet: the push makes them. D1 composed
|
|
// the machine's declaration without making anything, failed on the missing secret, and raised an urgent
|
|
// "nothing can be sent to <machine>" — seen live on 2026-10-06, a desktop notification for a machine
|
|
// the next push sent to without a word (novox/hq issue 275). D1 now composes as the push would, with a
|
|
// stand-in for what the push makes: pending, not broken, and said only past a bound, as a warning.
|
|
|
|
// aKeeper is a module with an own secret the mesh makes — a backup repository's password.
|
|
func aKeeper() catalogue.Manifest {
|
|
return catalogue.Manifest{Module: "keeper", Version: "1",
|
|
OwnSecrets: catalogue.OwnSecrets{"repository": {Path: "/var/lib/mesh/keeper/repository"}},
|
|
Resources: []map[string]any{
|
|
{"id": "state", "type": "directory", "path": "/var/lib/mesh/keeper", "mode": "0700"},
|
|
}}
|
|
}
|
|
|
|
// pushedBy records a send to a machine as a push does — composed on the send path, so its own secrets
|
|
// are made — without a bus to carry it.
|
|
func pushedBy(t *testing.T, open *stores, node string) string {
|
|
t.Helper()
|
|
ctx := t.Context()
|
|
plan, settings, err := resolveNode(ctx, open, node)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
declared, err := declarationFor(ctx, open, node, plan, settings)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
body, err := declared.Body()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
record, err := open.inventory.NodeByName(ctx, node)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
digest := digestOf(body)
|
|
// A push records the build of each module it carries (plan.go, Allocating); a module is carried by a send only when it was
|
|
// built from a commit, for what a machine was sent is read from the commits its assignments name (issue 1109).
|
|
builds := declared.Builds
|
|
if builds == nil {
|
|
current, err := open.inventory.CurrentBuilds(ctx)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
builds = map[string]string{}
|
|
for _, m := range plan.Modules {
|
|
builds[m.Module] = current[m.Module].Commit
|
|
}
|
|
}
|
|
if err := open.inventory.RecordSent(ctx, record.ID, digest, builds); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return digest
|
|
}
|
|
|
|
// pushedAndApplied is pushedBy, and the machine reporting it applied that declaration.
|
|
func pushedAndApplied(t *testing.T, open *stores, node string) {
|
|
t.Helper()
|
|
digest := pushedBy(t, open, node)
|
|
record, err := open.inventory.NodeByName(t.Context(), node)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := open.inventory.RecordDoing(t.Context(), record.ID, inventory.Doing{
|
|
Outcome: inventory.OutcomeApplied, Declared: digest}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
// d1 runs D1 once.
|
|
func d1(t *testing.T, open *stores) []conditions.Observation {
|
|
t.Helper()
|
|
got, err := probeDeclarations(t.Context(), &doctor{open: open})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return got
|
|
}
|
|
|
|
// **THE WINDOW, REPRODUCED**: assigned and not pushed, a module whose own secret the push makes is
|
|
// waiting, not uncomposable; past the bound it is a warning naming what the push makes; pushed, nothing.
|
|
|
|
// **A REAL FAILURE IS STILL URGENT**: a secret the push would be refused on is not one it will make.
|
|
// A bus credential nobody issued (issue 203) fails the push, so D1 says it — urgent, in the push's words.
|
|
|
|
// A given secret sealed to a key the machine no longer has is not the mesh's to make again: the push is
|
|
// refused on it, so D1 is too.
|
|
|
|
// The bound is read from when the machine began waiting: the oldest assignment since its last send.
|
|
|
|
// **D3 AND D13 WAIT FOR THE SEND**: a holder is expected to answer on a machine once the machine was sent
|
|
// it and had time to report — never between assign and push.
|
|
func TestAHolderIsExpectedOnlyOnceSentAndReported(t *testing.T) {
|
|
now := time.Now()
|
|
sent := now.Add(-time.Minute)
|
|
long := now.Add(-time.Hour)
|
|
cases := []struct {
|
|
name string
|
|
send lastSend
|
|
want bool
|
|
}{
|
|
{"never sent", lastSend{}, false},
|
|
{"sent without it", lastSend{sent: &long, current: true, carried: map[string]string{"other": "c"}}, false},
|
|
{"sent with it, not reported yet", lastSend{sent: &sent, carried: map[string]string{"keeper": "c"}}, false},
|
|
{"sent with it and reported", lastSend{sent: &sent, current: true, carried: map[string]string{"keeper": "c"}}, true},
|
|
{"sent with it long ago, never reported", lastSend{sent: &long, carried: map[string]string{"keeper": "c"}}, true},
|
|
{"sent before builds were kept", lastSend{sent: &long, current: true}, true},
|
|
}
|
|
for _, c := range cases {
|
|
if got := c.send.settled("keeper", now); got != c.want {
|
|
t.Errorf("%s: settled %v, want %v", c.name, got, c.want)
|
|
}
|
|
}
|
|
}
|
|
|
|
// And through the stores: assigned, not in the last send; pushed and reported, carried and settled.
|