From c1a1efa62ab3caf90afac16e3f090d1e73b4eef2 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 5 Nov 2026 15:52:24 +0100 Subject: [PATCH] =?UTF-8?q?Node-engine:=20provisions=20come=20from=20the?= =?UTF-8?q?=20provisioner's=20client,=20the=20catalogue's=20state=20addres?= =?UTF-8?q?ses=20from=20its=20client=20and=20the=20builder's=20module;=20t?= =?UTF-8?q?he=20health=20answer=20and=20the=20bus=20principal=20stay=20mes?= =?UTF-8?q?h-sdk's=20(ADR=200634=20=C2=A71,=20=C2=A75;=20issue=201966)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Claude-Session: https://claude.ai/code/session_01NcbgfFSnn24M3GcqttoU7i --- cmd/mesh-host/filling.go | 2 +- cmd/mesh-host/filling_test.go | 2 +- cmd/mesh-host/provision_secrets.go | 2 +- go.mod | 1 + internal/buckets/buckets.go | 3 ++- internal/compose/frombus/states.go | 6 +++--- internal/compose/resolution/proofs_test.go | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/mesh-host/filling.go b/cmd/mesh-host/filling.go index fa241e8..c874f08 100644 --- a/cmd/mesh-host/filling.go +++ b/cmd/mesh-host/filling.go @@ -9,8 +9,8 @@ import ( "path/filepath" "sync/atomic" + provisions "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "git.novox.be/novox/mesh-sdk/go/declaration" - "git.novox.be/novox/mesh-sdk/go/provisions" "github.com/novox/mesh-host/internal/apply" "github.com/novox/mesh-host/internal/filling" "github.com/novox/mesh-host/internal/link" diff --git a/cmd/mesh-host/filling_test.go b/cmd/mesh-host/filling_test.go index 7885eb7..c679076 100644 --- a/cmd/mesh-host/filling_test.go +++ b/cmd/mesh-host/filling_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "git.novox.be/novox/mesh-sdk/go/provisions" + provisions "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "github.com/novox/mesh-host/internal/filling" "github.com/novox/mesh-host/internal/store" diff --git a/cmd/mesh-host/provision_secrets.go b/cmd/mesh-host/provision_secrets.go index a99fca0..8d77c21 100644 --- a/cmd/mesh-host/provision_secrets.go +++ b/cmd/mesh-host/provision_secrets.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + provisions "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/provisions" ) // provisionSecrets fills a provision's value into a file the provisioner's client hands the node-engine to write diff --git a/go.mod b/go.mod index 4165d0b..1b86060 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( git.novox.be/novox/mesh-contracts/placement/go/seats/meshmoduleassigner v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-contracts/placement/go/seats/meshwants v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-contracts/identity-and-access/go/clients/meshvaultclient v0.0.0-20261105000000-000000000000 + git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-20261105000000-000000000000 git.novox.be/novox/mesh-networking/modules/mesh-wireguard/go v0.0.0-20261105000000-000000000000 diff --git a/internal/buckets/buckets.go b/internal/buckets/buckets.go index 13f551a..0cfa161 100644 --- a/internal/buckets/buckets.go +++ b/internal/buckets/buckets.go @@ -10,6 +10,7 @@ import ( assigner "git.novox.be/novox/mesh-contracts/placement/go/clients/meshmoduleassignerclient" seat "git.novox.be/novox/mesh-contracts/placement/go/seats/meshmoduleassigner" wants "git.novox.be/novox/mesh-contracts/placement/go/seats/meshwants" + catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "git.novox.be/novox/mesh-sdk/go/keys" ) @@ -47,7 +48,7 @@ const ( Verdicts = catalogHolder + "_verdicts" Candidates = catalogHolder + "_candidates" - catalogHolder = "mesh-delivery-indexer" + catalogHolder = catalogclient.Module ) // CandidateKey is the key of a group's candidate in Candidates: the group as a key part, a branch such as `fix/1.2` diff --git a/internal/compose/frombus/states.go b/internal/compose/frombus/states.go index 2ae2480..d59d302 100644 --- a/internal/compose/frombus/states.go +++ b/internal/compose/frombus/states.go @@ -30,9 +30,9 @@ const ( // The holders' names are kept here, in the engine's own code, as the names of the states a manifest's reads use // (ADR 0634 ยง1, finding F4); a seat's contract names a state locally, not the module that holds it. PlacementRead = meshmoduleassignerclient.PlacementRead - ModulesRead = "mesh-delivery-indexer.modules" - ManifestsRead = "mesh-delivery-indexer.manifests" - BuildsRead = "mesh-delivery-builder.builds" + ModulesRead = meshcatalogclient.ModulesRead + ManifestsRead = meshcatalogclient.ManifestsRead + BuildsRead = builds.BuilderModule + ".builds" HaveRead = "node-engine.have" ResolvedRead = "mesh-config.resolved" ) diff --git a/internal/compose/resolution/proofs_test.go b/internal/compose/resolution/proofs_test.go index 892f382..76d3686 100644 --- a/internal/compose/resolution/proofs_test.go +++ b/internal/compose/resolution/proofs_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + provisions "git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient" mcat "git.novox.be/novox/mesh-sdk/go/catalogue" - "git.novox.be/novox/mesh-sdk/go/provisions" "github.com/novox/mesh-host/internal/beside" )