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.
71 lines
2.4 KiB
Go
71 lines
2.4 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"git.novox.be/novox/mesh-sdk/go/validate"
|
|
)
|
|
|
|
// The module of each resource and the build of each module (novox/hq issue 1145, design 47 release 1-2). The
|
|
// composer's owner of an id and the module's build go on the wire only to a machine whose node-engine said it reads
|
|
// them: an older one decodes strictly and refuses a key it does not know, whole.
|
|
|
|
func modulesDeclaration(reads bool) sendable {
|
|
return sendable{
|
|
Resources: []map[string]any{
|
|
{"id": "web.app.conf", "type": "file", "path": "/etc/app.conf", "content": "x\n"},
|
|
{"id": "web.app.data", "type": "file", "path": "/etc/data", "content": "d\n"},
|
|
{"id": "mesh.guard", "type": "file", "path": "/etc/guard", "content": "g\n"}},
|
|
moduleOf: map[string]string{"web.app.conf": "web.app", "web.app.data": "web.app"},
|
|
buildIDs: map[string]string{"web.app": "build-7"},
|
|
ReadsModules: reads,
|
|
}
|
|
}
|
|
|
|
// 1145/AC1
|
|
func TestAMachineThatReadsModulesIsSentEachResourcesModuleAndEachModulesBuild(t *testing.T) {
|
|
keys := bodyKeys(t, modulesDeclaration(true))
|
|
builds, _ := keys["builds"].(map[string]any)
|
|
if len(builds) != 1 || builds["web.app"] != "build-7" {
|
|
t.Fatalf("1145/AC1: the body carries builds %v", keys["builds"])
|
|
}
|
|
want := map[string]any{"web.app.conf": "web.app", "web.app.data": "web.app", "mesh.guard": nil}
|
|
for _, r := range keys["resources"].([]any) {
|
|
r := r.(map[string]any)
|
|
if r["module"] != want[r["id"].(string)] {
|
|
t.Errorf("1145/AC1: resource %v carries module %v, want %v", r["id"], r["module"], want[r["id"].(string)])
|
|
}
|
|
}
|
|
}
|
|
|
|
// 1145/AC2: the body is byte for byte what it is today.
|
|
func TestAMachineThatDoesNotReadModulesIsSentTheBodyItWasSentBefore(t *testing.T) {
|
|
d := modulesDeclaration(false)
|
|
got, err := d.Body()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
before := sendable{Resources: d.Resources}
|
|
want, _ := before.Body()
|
|
if string(got) != string(want) {
|
|
t.Fatalf("1145/AC2: the body changed:\n%s\nwas\n%s", got, want)
|
|
}
|
|
}
|
|
|
|
// 1145/AC4: the node-engine's own validator, as the gate runs it, takes the two words.
|
|
func TestTheNodeEnginesValidatorTakesAModulePerResourceAndABuildPerModule(t *testing.T) {
|
|
raw, err := modulesDeclaration(true).Body()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var generic map[string]any
|
|
if err := json.Unmarshal(raw, &generic); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if problems := validate.Declaration(raw); len(problems) != 0 {
|
|
t.Fatalf("1145/AC4: refused: %q\n%s", problems, fmt.Sprint(generic))
|
|
}
|
|
}
|