diff --git a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go index e1958d7a1..f6de5f2d1 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/composed_test.go @@ -16,6 +16,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" catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "os" "slices" @@ -274,7 +275,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 := catalogclient.KeyPart(fp) + part, err := meshcatalogkey.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 bd7519586..3ab411822 100644 --- a/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go +++ b/modules/mesh-provisioner/cmd/mesh-provisioner/holder.go @@ -35,6 +35,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" catalog "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "slices" @@ -1624,7 +1625,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 := catalogclient.KeyPart(fp) + part, err := meshcatalogkey.KeyPart(fp) if err != nil { return "" } diff --git a/modules/mesh-provisioner/go.mod b/modules/mesh-provisioner/go.mod index d4c7efcf3..00b8dd54e 100644 --- a/modules/mesh-provisioner/go.mod +++ b/modules/mesh-provisioner/go.mod @@ -12,6 +12,7 @@ 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-delivery/modules/mesh-delivery-builder/builds v0.0.0-00010101000000-000000000000