From 033ff2540b7e91aa52b41cf4fa6a5201f000e42e Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 12 Nov 2026 02:26:55 +0100 Subject: [PATCH] Fix 10: the provisioner reads the catalog key codec from mesh-delivery's sdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Builds: design 47 G §614, §670 (ADR 0625 §4; lead answer A-144) --- .../mesh-provisioner/cmd/mesh-provisioner/composed_test.go | 4 ++-- modules/mesh-provisioner/cmd/mesh-provisioner/holder.go | 4 ++-- modules/mesh-provisioner/go.mod | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go index 88f10a6d5..2f6179c43 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go @@ -21,7 +21,7 @@ import ( assignerclient "git.novox.be/novox/mesh-contracts/go/clients/meshmoduleassignerclient" engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogkey" + "git.novox.be/novox/mesh-delivery/sdk/catalogkey" "git.novox.be/novox/mesh-sdk/go/catalogue" ) @@ -264,7 +264,7 @@ func valueOf(e *Entry) string { // composedKey is a module's key in the node-engine's composed state, from the fingerprint the test names it by. func composedKey(node, module, fp string) (string, error) { - part, err := meshcatalogkey.KeyPart(fp) + part, err := catalogkey.KeyPart(fp) if err != nil { return "", err } diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go b/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go index bb6b48e3d..1bfd1e3c8 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go @@ -41,7 +41,7 @@ import ( engineclient "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" meshseat "git.novox.be/novox/mesh-contracts/go/seats/meshmoduleassigner" catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogkey" + "git.novox.be/novox/mesh-delivery/sdk/catalogkey" 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" @@ -1592,7 +1592,7 @@ type publishedPlan struct { // composedAt is a module's key in its node's compositions, or "" for a fingerprint no key can name. func composedAt(node, module, fp string) string { - part, err := meshcatalogkey.KeyPart(fp) + part, err := catalogkey.KeyPart(fp) if err != nil { return "" } diff --git a/modules/mesh-provisioner/go.mod b/modules/mesh-provisioner/go.mod index 447165d42..08c2906d9 100644 --- a/modules/mesh-provisioner/go.mod +++ b/modules/mesh-provisioner/go.mod @@ -11,7 +11,6 @@ require ( git.novox.be/novox/mesh-contracts/operator-and-conversation/go/seats/operatorchannel v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient v0.0.0-00010101000000-000000000000 - git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogkey v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/seats/meshwants v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-sdk/go v0.0.0-00010101000000-000000000000 @@ -39,7 +38,7 @@ require ( git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 // indirect git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry v0.0.0-00010101000000-000000000000 // indirect - git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 // indirect + git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000 ) require git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdelivery v0.0.0-00010101000000-000000000000