From 1241ee70411664c0031645f1c9862d675296a6bb Mon Sep 17 00:00:00 2001 From: jochen Date: Mon, 26 Oct 2026 19:14:38 +0100 Subject: [PATCH] Pin mesh-sdk 4d5f430: the node's wants say it composes them (Self) (issue 1126) --- cmd/mesh-host/nodeagent_integration_test.go | 2 +- go.mod | 2 +- go.sum | 2 ++ internal/agent/agent_test.go | 2 +- internal/selfcompose/selfcompose_test.go | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/mesh-host/nodeagent_integration_test.go b/cmd/mesh-host/nodeagent_integration_test.go index 7f0e1d1..4d299a8 100644 --- a/cmd/mesh-host/nodeagent_integration_test.go +++ b/cmd/mesh-host/nodeagent_integration_test.go @@ -351,7 +351,7 @@ func TestNatsANodeThePlacementNamesComposesAndAppliesItsOwn(t *testing.T) { t.Fatal(err) } } - want, _ := delivery.EncodeWant(delivery.Want{FP: fp}) + want, _ := delivery.EncodeWant(delivery.Want{FP: fp, Self: true}) wkey, _ := delivery.WantKey(itNode, "web") if _, err := b.wants.Put(wkey, want); err != nil { t.Fatal(err) diff --git a/go.mod b/go.mod index 9570a41..02c9fd5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/novox/mesh-host go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026180300-f1d7c7377dc4 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026181356-4d5f43022453 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 golang.org/x/crypto v0.57.0 diff --git a/go.sum b/go.sum index 6679278..08e500b 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026174406-6df0dfe208c6 h1:sIagBHev git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026174406-6df0dfe208c6/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026180300-f1d7c7377dc4 h1:rKDfp+IHnv903jcCujf5IdTrWd3mnudpNCfKaKvqp3w= git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026180300-f1d7c7377dc4/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026181356-4d5f43022453 h1:TemVEm3xcXHA1OWzrO0+cnuWsUpDUsnNE7yIlMaxMBA= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026181356-4d5f43022453/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/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo= diff --git a/internal/agent/agent_test.go b/internal/agent/agent_test.go index 7b29c9b..50d3341 100644 --- a/internal/agent/agent_test.go +++ b/internal/agent/agent_test.go @@ -983,7 +983,7 @@ func TestTheNodesOwnCompositionIsAppliedWhenItDiffersAndARecordMoveWaitsForAYes( } want := func(module, fp, yes string) { key, _ := delivery.WantKey(node, module) - raw, err := delivery.EncodeWant(delivery.Want{FP: fp, Yes: yes}) + raw, err := delivery.EncodeWant(delivery.Want{FP: fp, Yes: yes, Self: true}) if err != nil { t.Fatal(err) } diff --git a/internal/selfcompose/selfcompose_test.go b/internal/selfcompose/selfcompose_test.go index b928394..44bba67 100644 --- a/internal/selfcompose/selfcompose_test.go +++ b/internal/selfcompose/selfcompose_test.go @@ -105,8 +105,8 @@ func TestTheNodeComposesItsWantsFromTheBus(t *testing.T) { Modules: []delivery.PlacedModule{{Module: "lemurs"}}}) have, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: "n1", TunnelKey: "k", SealingKey: "sk", Capabilities: []string{"systemd"}}}) mod, _ := delivery.EncodeModule(delivery.Module{FP2: fp, Manifest: digest, Repository: "novox/x", Commit: "c"}) - want, _ := delivery.EncodeWant(delivery.Want{FP: fp}) - nodeWant, _ := delivery.EncodeNodeWant(delivery.NodeWant{}) + want, _ := delivery.EncodeWant(delivery.Want{FP: fp, Self: true}) + nodeWant, _ := delivery.EncodeNodeWant(delivery.NodeWant{Self: true}) b.put(t, delivery.PlacementBucket, "placement.n1", place) b.put(t, delivery.HaveBucket, "n1.node", have) b.put(t, delivery.ModulesBucket, "lemurs", mod) @@ -152,7 +152,7 @@ func TestTheNodeComposesItsWantsFromTheBus(t *testing.T) { // A want of a module whose manifest cannot be read: said once, nothing handed, what was handed stands. gone := delivery.SourcePrefix2 + strings.Repeat("b", 64) - missing, _ := delivery.EncodeWant(delivery.Want{FP: gone}) + missing, _ := delivery.EncodeWant(delivery.Want{FP: gone, Self: true}) b.put(t, delivery.AssignerWantsBucket, "want.n1.lemurs", missing) quiet(t, out) b.put(t, delivery.AssignerWantsBucket, "want.n1.lemurs", missing)