mesh-tools
2111b78fc5
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.
96 lines
3.2 KiB
Go
96 lines
3.2 KiB
Go
//go:build integration
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
"git.novox.be/novox/mesh-sdk/go/compose"
|
|
)
|
|
|
|
func TestAnUnassignThatLeavesItsNodeUnresolvedSaysSoOnceInItsAnswer(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
twoRivalsAndANote(t, open)
|
|
// Straight into the store, as a node that came to this before the act.
|
|
for _, m := range []string{"rival-one", "rival-two", "notes"} {
|
|
if _, err := open.inventory.Assign(ctx, "laptop", m); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
said := answered(t, func() error { return assignCommand(ctx, "unassign", []string{"laptop", "notes"}) })
|
|
|
|
if _, _, err := resolveNode(ctx, open, "laptop"); err == nil || !unresolvable(err) {
|
|
t.Fatalf("laptop resolves with two claimants of one seat: %v", err)
|
|
}
|
|
if n := strings.Count(said, "laptop does not resolve now"); n != 1 {
|
|
t.Errorf("the answer says laptop does not resolve %d times, want once:\n%s", n, said)
|
|
}
|
|
if strings.Contains(said, "is left out of the rest of the mesh") {
|
|
t.Errorf("the answer carries a line from a read that is not its resolution:\n%s", said)
|
|
}
|
|
}
|
|
|
|
func TestAnUnassignThatLeavesItsNodeResolvedSaysNothingOfIt(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
aProviderAndItsConsumer(t, open)
|
|
if _, err := assign(ctx, open, "laptop", "db", "app"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
said, err := unassign(ctx, open, "laptop", "app")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, _, err := resolveNode(ctx, open, "laptop"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if strings.Contains(said, "does not resolve") || strings.Contains(said, "could not be read") {
|
|
t.Errorf("a node that resolves is said not to:\n%s", said)
|
|
}
|
|
}
|
|
|
|
func TestAnAssignThatLeavesItsNodeUnresolvedSaysOnlyThePlansRefusal(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
twoRivalsAndANote(t, open)
|
|
if _, err := assign(ctx, open, "laptop", "rival-one"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// Kept and not resolvable: a second claimant of the seat, which assignment keeps.
|
|
said, err := assign(ctx, open, "laptop", "rival-two")
|
|
if err == nil {
|
|
t.Fatalf("two claimants of one node seat resolved:\n%s", said)
|
|
}
|
|
_, _, planErr := resolveNode(ctx, open, "laptop")
|
|
if planErr == nil || planErr.Error() != err.Error() {
|
|
t.Errorf("the act's refusal is not the plan's right after:\nact: %v\nplan: %v", err, planErr)
|
|
}
|
|
if strings.Contains(said, "now has") {
|
|
t.Errorf("the answer says a seat is now held on a node that does not resolve:\n%s", said)
|
|
}
|
|
}
|
|
|
|
// The other readers of the whole mesh still say a machine they leave out, on standard error (novox/hq
|
|
// issue 188); an act sends it elsewhere. The line is mesh-sdk's (compose.Declared.Said); where it goes is the context's.
|
|
func TestAMachineLeftOutIsSaidWhereTheContextSays(t *testing.T) {
|
|
line := "laptop is left out of the rest of the mesh: it does not resolve: why"
|
|
var buf bytes.Buffer
|
|
sayFound(leftOutSaidBy(context.Background(), &buf), compose.Declared{Said: []string{line}})
|
|
if buf.String() != line+"\n" {
|
|
t.Errorf("said %q", buf.String())
|
|
}
|
|
got := answered(t, func() error {
|
|
sayFound(context.Background(), compose.Declared{Said: []string{line}})
|
|
return nil
|
|
})
|
|
if !strings.Contains(got, "laptop is left out") {
|
|
t.Errorf("without an act's writer the line did not reach standard error: %q", got)
|
|
}
|
|
}
|