From efee30e243edab868f05123d00ad675652f695ea Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 12 Nov 2026 02:26:55 +0100 Subject: [PATCH] Fix 10: the compositions read 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) --- go.mod | 1 - internal/compositions/composed.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d40e3f1a..0f641d6a 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient 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/clients/meshdeliveryclient v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000 git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog v0.0.0-00010101000000-000000000000 diff --git a/internal/compositions/composed.go b/internal/compositions/composed.go index c1cac11c..924a0eeb 100644 --- a/internal/compositions/composed.go +++ b/internal/compositions/composed.go @@ -7,7 +7,7 @@ import ( "git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient" "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" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/declaration" "git.novox.be/novox/mesh-sdk/go/keys" @@ -135,7 +135,7 @@ func Same(a, b Composed) bool { // Key is the key of a module's composition for a node at a fingerprint: `..`. func Key(node, module, fingerprint string) (string, error) { - part, err := meshcatalogkey.KeyPart(fingerprint) + part, err := catalogkey.KeyPart(fingerprint) if err != nil { return "", err }