From 84e50beb65e72b9b5446bc33fd89703a363fb332 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 5 Nov 2026 14:45:43 +0100 Subject: [PATCH] =?UTF-8?q?Node-engine:=20the=20private=20network's=20name?= =?UTF-8?q?s=20and=20generator=20come=20from=20mesh-wireguard's=20overlay?= =?UTF-8?q?=20package;=20the=20host's=20internal/overlay=20is=20deleted,?= =?UTF-8?q?=20mesh-sdk's=20go/overlay=20has=20no=20importer=20left=20here;?= =?UTF-8?q?=20contracts=20imports=20follow=20the=20domain=20folders=20(ADR?= =?UTF-8?q?=200636=20=C2=A76,=20ADR=200634;=20issue=201966)=20Claude-Sessi?= =?UTF-8?q?on:=20https://claude.ai/code/session=5F01NcbgfFSnn24M3GcqttoU7i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/mesh-compose/main_test.go | 5 +++-- cmd/mesh-host/authority_test.go | 4 ++-- cmd/mesh-host/engineseat.go | 2 +- cmd/mesh-host/libraries_test.go | 4 ++-- cmd/mesh-host/nodeagent.go | 2 +- cmd/mesh-host/trust.go | 4 ++-- cmd/mesh-host/whatruns_test.go | 2 +- go.mod | 9 ++++----- internal/compose/composed.go | 2 +- internal/compose/composed_test.go | 2 +- internal/compose/credentials_test.go | 2 +- internal/compose/fixture_test.go | 2 +- internal/compose/frombus/answer_rows_test.go | 2 +- internal/compose/frombus/frombus.go | 2 +- internal/compose/frombus/frombus_test.go | 2 +- internal/compose/network.go | 2 +- internal/compose/network_test.go | 2 +- internal/compose/node_test.go | 2 +- internal/compose/one_machine_alone_test.go | 2 +- internal/compose/rendering.go | 2 +- internal/compose/rendering_test.go | 2 +- internal/compose/resolve_test.go | 2 +- internal/compose/rest_test.go | 2 +- internal/selfcompose/selfcompose.go | 2 +- internal/selfcompose/selfcompose_test.go | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/mesh-compose/main_test.go b/cmd/mesh-compose/main_test.go index 83a5faf..0b7de35 100644 --- a/cmd/mesh-compose/main_test.go +++ b/cmd/mesh-compose/main_test.go @@ -280,7 +280,8 @@ func ownPackages(t *testing.T) map[string][]string { } // 1621/AC2 and AC4: the command imports, through every package of this repository it reaches, only the standard -// library, mesh-sdk and this repository's own packages, and none that reaches a bus, a store, a network service or +// library, mesh-sdk, the private network's overlay package (mesh-wireguard's own pure package: names, graph and +// generator, no bus) and this repository's own packages, and none that reaches a bus, a store, a network service or // another process. func TestTheCommandImportsNoBusStoreNetworkOrProcess(t *testing.T) { forbidden := []string{"net/http", "net/rpc", "net/smtp", "os/exec", "database/sql", "plugin", "syscall"} @@ -291,7 +292,7 @@ func TestTheCommandImportsNoBusStoreNetworkOrProcess(t *testing.T) { for path, imports := range own { for _, imp := range imports { std := !strings.Contains(strings.SplitN(imp, "/", 2)[0], ".") - if !std && !strings.HasPrefix(imp, "git.novox.be/novox/mesh-sdk/go") && !strings.HasPrefix(imp, "github.com/novox/mesh-host/") { + if !std && !strings.HasPrefix(imp, "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay") && !strings.HasPrefix(imp, "git.novox.be/novox/mesh-sdk/go") && !strings.HasPrefix(imp, "github.com/novox/mesh-host/") { t.Errorf("%s imports %s, which is neither the standard library, mesh-sdk nor this repository", path, imp) } for _, f := range forbidden { diff --git a/cmd/mesh-host/authority_test.go b/cmd/mesh-host/authority_test.go index 0ff93a1..7ff84f8 100644 --- a/cmd/mesh-host/authority_test.go +++ b/cmd/mesh-host/authority_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-contracts/go/seats/meshvault" + "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-host/internal/identity" ) diff --git a/cmd/mesh-host/engineseat.go b/cmd/mesh-host/engineseat.go index 9d1f309..31c7731 100644 --- a/cmd/mesh-host/engineseat.go +++ b/cmd/mesh-host/engineseat.go @@ -14,8 +14,8 @@ import ( "time" nec "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" - occ "git.novox.be/novox/mesh-contracts/go/clients/operatorchannelclient" "git.novox.be/novox/mesh-contracts/go/seats/nodeengine" + occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" stdio "git.novox.be/novox/mesh-sdk/go" "github.com/novox/mesh-host/internal/accounts" "github.com/novox/mesh-host/internal/apply" diff --git a/cmd/mesh-host/libraries_test.go b/cmd/mesh-host/libraries_test.go index da6902a..ddb3d07 100644 --- a/cmd/mesh-host/libraries_test.go +++ b/cmd/mesh-host/libraries_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - occ "git.novox.be/novox/mesh-contracts/go/clients/operatorchannelclient" - oc "git.novox.be/novox/mesh-contracts/go/seats/operatorchannel" + occ "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient" + oc "git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel" "git.novox.be/novox/mesh-sdk/go/declaration" "github.com/novox/mesh-host/internal/apply" "github.com/novox/mesh-host/internal/link" diff --git a/cmd/mesh-host/nodeagent.go b/cmd/mesh-host/nodeagent.go index 66af382..98d2e11 100644 --- a/cmd/mesh-host/nodeagent.go +++ b/cmd/mesh-host/nodeagent.go @@ -14,9 +14,9 @@ import ( "sync/atomic" "time" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/declaration" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-host/internal/agent" "github.com/novox/mesh-host/internal/apply" "github.com/novox/mesh-host/internal/compose/frombus" diff --git a/cmd/mesh-host/trust.go b/cmd/mesh-host/trust.go index 3d3b963..7ee9f2a 100644 --- a/cmd/mesh-host/trust.go +++ b/cmd/mesh-host/trust.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "git.novox.be/novox/mesh-contracts/go/seats/meshvault" + "git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-host/internal/identity" "github.com/novox/mesh-host/internal/link" diff --git a/cmd/mesh-host/whatruns_test.go b/cmd/mesh-host/whatruns_test.go index 05d809f..c756df7 100644 --- a/cmd/mesh-host/whatruns_test.go +++ b/cmd/mesh-host/whatruns_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/declaration" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-host/internal/agent" "github.com/novox/mesh-host/internal/liveness" diff --git a/go.mod b/go.mod index 17392cf..17ac313 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/novox/mesh-host go 1.26.0 require ( + git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261104174359-05b3e2e1b94f github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 @@ -10,16 +11,14 @@ require ( golang.org/x/sys v0.48.0 ) -require git.novox.be/novox/mesh-contracts/go v0.0.0-20261104174344-ae5266e77639 // indirect - require ( git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-contracts/health-and-repair/go/seats/meshconditions v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient v0.0.0-20261104174344-ae5266e77639 - git.novox.be/novox/mesh-contracts/go/clients/operatorchannelclient v0.0.0-20261104174344-ae5266e77639 - git.novox.be/novox/mesh-contracts/go/seats/meshvault v0.0.0-20261104174344-ae5266e77639 + git.novox.be/novox/mesh-contracts/operator-and-conversation/go/clients/operatorchannelclient v0.0.0-20261105000000-000000000000 + git.novox.be/novox/mesh-contracts/identity-and-access/go/seats/meshvault v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-contracts/go/seats/nodeengine v0.0.0-20261104174344-ae5266e77639 - git.novox.be/novox/mesh-contracts/go/seats/operatorchannel v0.0.0-20261104174344-ae5266e77639 + git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-20261105000000-000000000000 github.com/antithesishq/antithesis-sdk-go v0.8.0-default-no-op // indirect github.com/google/go-tpm v0.9.8 // indirect github.com/klauspost/compress v1.20.1 // indirect diff --git a/internal/compose/composed.go b/internal/compose/composed.go index 5d5df71..024f287 100644 --- a/internal/compose/composed.go +++ b/internal/compose/composed.go @@ -8,11 +8,11 @@ import ( "sort" "strings" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/declaration" "git.novox.be/novox/mesh-sdk/go/delivery" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // Compositions is one node's compositions (novox/hq ADR 0539 clauses 1 and 2): its declaration composed over in, as diff --git a/internal/compose/composed_test.go b/internal/compose/composed_test.go index c66878b..09dacb5 100644 --- a/internal/compose/composed_test.go +++ b/internal/compose/composed_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/delivery" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) func fpFor(c byte) string { return delivery.SourcePrefix2 + strings.Repeat(string(c), 64) } diff --git a/internal/compose/credentials_test.go b/internal/compose/credentials_test.go index 0ab188b..50ddfc6 100644 --- a/internal/compose/credentials_test.go +++ b/internal/compose/credentials_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) // secretValue is a value the Input carries that must never appear in anything the composition says. diff --git a/internal/compose/fixture_test.go b/internal/compose/fixture_test.go index 1766852..69a0ec7 100644 --- a/internal/compose/fixture_test.go +++ b/internal/compose/fixture_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) // aPublicKey is a key a machine could have reported, made as mesh-controller's mesh_for_test.go aPublicKey makes it. diff --git a/internal/compose/frombus/answer_rows_test.go b/internal/compose/frombus/answer_rows_test.go index 05a7fe9..113c4f0 100644 --- a/internal/compose/frombus/answer_rows_test.go +++ b/internal/compose/frombus/answer_rows_test.go @@ -10,11 +10,11 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/delivery" "github.com/novox/mesh-host/internal/compose" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // Issue 1126 (the seed's shadow, round 2): a node's answer names every module it cannot compose, not the first only; diff --git a/internal/compose/frombus/frombus.go b/internal/compose/frombus/frombus.go index a7e887c..aafa499 100644 --- a/internal/compose/frombus/frombus.go +++ b/internal/compose/frombus/frombus.go @@ -41,12 +41,12 @@ import ( "sort" "strings" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/declaration" "git.novox.be/novox/mesh-sdk/go/delivery" "github.com/novox/mesh-host/internal/compose" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" "github.com/novox/mesh-host/internal/takein" ) diff --git a/internal/compose/frombus/frombus_test.go b/internal/compose/frombus/frombus_test.go index 3f4e889..f9e8467 100644 --- a/internal/compose/frombus/frombus_test.go +++ b/internal/compose/frombus/frombus_test.go @@ -18,10 +18,10 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/delivery" "github.com/novox/mesh-host/internal/compose" - "github.com/novox/mesh-host/internal/overlay" ) // bus is a Reader over values held in memory, counting whose config values were read. diff --git a/internal/compose/network.go b/internal/compose/network.go index 4e11abf..1ba2dfd 100644 --- a/internal/compose/network.go +++ b/internal/compose/network.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // The private network: who is on it, where, and what they are called. Ported from mesh-controller diff --git a/internal/compose/network_test.go b/internal/compose/network_test.go index 2f924f9..3b1ca59 100644 --- a/internal/compose/network_test.go +++ b/internal/compose/network_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) // onTheTunnel makes the hub of an Input what mesh-controller's network_test.go makes of anchor in diff --git a/internal/compose/node_test.go b/internal/compose/node_test.go index 1d2c67b..6735f95 100644 --- a/internal/compose/node_test.go +++ b/internal/compose/node_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) func resourceIDs(d Declared) []string { diff --git a/internal/compose/one_machine_alone_test.go b/internal/compose/one_machine_alone_test.go index 3c49abb..f05accb 100644 --- a/internal/compose/one_machine_alone_test.go +++ b/internal/compose/one_machine_alone_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) // fourOnTheNetwork is aMesh and two more machines on the private network at the site `there`: `ace`, dialled at diff --git a/internal/compose/rendering.go b/internal/compose/rendering.go index 7d06652..d0b2afe 100644 --- a/internal/compose/rendering.go +++ b/internal/compose/rendering.go @@ -7,9 +7,9 @@ import ( "sort" "strings" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // The contracts of the node-engine's statement that gate what a machine is sent, as the controller's link package names them diff --git a/internal/compose/rendering_test.go b/internal/compose/rendering_test.go index 8c50b5b..78d7a79 100644 --- a/internal/compose/rendering_test.go +++ b/internal/compose/rendering_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" - "github.com/novox/mesh-host/internal/overlay" ) // aWebModule publishes one port in the short form, which the mesh is free to move (MachineSide). diff --git a/internal/compose/resolve_test.go b/internal/compose/resolve_test.go index 0696afb..d361b8c 100644 --- a/internal/compose/resolve_test.go +++ b/internal/compose/resolve_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // storeManifests is mesh-controller's bindings_test.go storeManifests (cmd/mesh-controller at 6c2a8d62): a store holding the diff --git a/internal/compose/rest_test.go b/internal/compose/rest_test.go index f771c10..d0b0d2b 100644 --- a/internal/compose/rest_test.go +++ b/internal/compose/rest_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-host/internal/compose/resolution" - "github.com/novox/mesh-host/internal/overlay" ) // objects and files are the provider and consumer of mesh-controller's facts_test.go aMeshWithSecrets (cmd/mesh-controller at diff --git a/internal/selfcompose/selfcompose.go b/internal/selfcompose/selfcompose.go index 0bc5d21..109ef20 100644 --- a/internal/selfcompose/selfcompose.go +++ b/internal/selfcompose/selfcompose.go @@ -28,9 +28,9 @@ import ( "sync/atomic" "time" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-host/internal/compose" "github.com/novox/mesh-host/internal/compose/frombus" "github.com/novox/mesh-host/internal/compose/resolution" diff --git a/internal/selfcompose/selfcompose_test.go b/internal/selfcompose/selfcompose_test.go index 542667a..dfb90a8 100644 --- a/internal/selfcompose/selfcompose_test.go +++ b/internal/selfcompose/selfcompose_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" + "git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go/overlay" "git.novox.be/novox/mesh-sdk/go/delivery" - "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/nats-io/nats.go" "github.com/novox/mesh-host/internal/compose" "github.com/novox/mesh-host/internal/compose/frombus"