From 013dad46882f580509ccc7750df3a41362c2b3c9 Mon Sep 17 00:00:00 2001 From: mesh-tools Date: Tue, 20 Oct 2026 08:22:07 +0000 Subject: [PATCH] Take the catalogue, overlay and validator from mesh-sdk in cmd/mesh-builder and cmd/mesh-controller, a to g (issue 1381, 1 of 6 import swaps) Swaps three import paths for mesh-sdk's go/catalogue, go/overlay and go/validate (the same packages, copied from this repository at 6c2a8d62) and lets gofmt order the groups. The six swap commits compile together once the pin commit (go.mod, modules.txt) is on the branch; each alone does not, because a file on the SDK's types cannot call one still on the old package. --- cmd/mesh-builder/holder.go | 2 +- cmd/mesh-controller/accept_outside.go | 2 +- cmd/mesh-controller/acts.go | 2 +- cmd/mesh-controller/acts_test.go | 2 +- cmd/mesh-controller/addresses_integration_test.go | 2 +- cmd/mesh-controller/addresses_test.go | 2 +- cmd/mesh-controller/adopting_test.go | 4 ++-- cmd/mesh-controller/adoption.go | 4 ++-- cmd/mesh-controller/agent_account_test.go | 2 +- cmd/mesh-controller/asker_wire.go | 2 +- cmd/mesh-controller/awaiting_push_integration_test.go | 4 ++-- cmd/mesh-controller/awaiting_push_test.go | 2 +- cmd/mesh-controller/away_integration_test.go | 2 +- cmd/mesh-controller/backups_before_send_integration_test.go | 2 +- cmd/mesh-controller/batches_integration_test.go | 2 +- cmd/mesh-controller/batches_test.go | 2 +- cmd/mesh-controller/bindings.go | 2 +- cmd/mesh-controller/bindings_integration_test.go | 2 +- cmd/mesh-controller/bindings_test.go | 2 +- cmd/mesh-controller/build.go | 2 +- cmd/mesh-controller/build_seat_test.go | 2 +- cmd/mesh-controller/build_source.go | 2 +- cmd/mesh-controller/bus_step.go | 2 +- cmd/mesh-controller/busobjects_test.go | 2 +- cmd/mesh-controller/busy_test.go | 2 +- cmd/mesh-controller/chain_integration_test.go | 2 +- cmd/mesh-controller/changeplan.go | 2 +- cmd/mesh-controller/changeplan_test.go | 2 +- cmd/mesh-controller/check.go | 2 +- cmd/mesh-controller/check_builds_integration_test.go | 2 +- cmd/mesh-controller/check_builds_test.go | 2 +- cmd/mesh-controller/check_here.go | 2 +- cmd/mesh-controller/check_siblings_test.go | 2 +- cmd/mesh-controller/check_test.go | 2 +- cmd/mesh-controller/checks.go | 2 +- cmd/mesh-controller/checks_queue_test.go | 2 +- cmd/mesh-controller/composed_member_check_test.go | 2 +- cmd/mesh-controller/composed_verdict_test.go | 2 +- cmd/mesh-controller/config_move.go | 2 +- cmd/mesh-controller/config_moved_integration_test.go | 4 ++-- cmd/mesh-controller/config_moved_test.go | 2 +- cmd/mesh-controller/core_box.go | 2 +- cmd/mesh-controller/core_box_integration_test.go | 2 +- cmd/mesh-controller/core_box_test.go | 2 +- cmd/mesh-controller/credential_on_assign_test.go | 2 +- cmd/mesh-controller/data.go | 2 +- cmd/mesh-controller/data_integration_test.go | 2 +- cmd/mesh-controller/data_test.go | 2 +- cmd/mesh-controller/deadletters.go | 2 +- cmd/mesh-controller/delivery.go | 2 +- cmd/mesh-controller/delivery_changes.go | 2 +- cmd/mesh-controller/delivery_conditions.go | 2 +- cmd/mesh-controller/delivery_conditions_test.go | 2 +- cmd/mesh-controller/delivery_edges_test.go | 2 +- cmd/mesh-controller/delivery_integration_test.go | 2 +- cmd/mesh-controller/delivery_test.go | 2 +- cmd/mesh-controller/dependents_test.go | 2 +- cmd/mesh-controller/doctor_test.go | 2 +- cmd/mesh-controller/facts.go | 4 ++-- cmd/mesh-controller/facts_test.go | 2 +- cmd/mesh-controller/first_build_ask_integration_test.go | 2 +- cmd/mesh-controller/first_builds_integration_test.go | 2 +- cmd/mesh-controller/fixclass_test.go | 2 +- cmd/mesh-controller/gate.go | 2 +- cmd/mesh-controller/gate_followup_test.go | 2 +- cmd/mesh-controller/gate_integration_test.go | 2 +- cmd/mesh-controller/gate_rule_test.go | 2 +- cmd/mesh-controller/gate_test.go | 2 +- cmd/mesh-controller/generation.go | 2 +- cmd/mesh-controller/grant_follows_binding_integration_test.go | 2 +- 70 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cmd/mesh-builder/holder.go b/cmd/mesh-builder/holder.go index 777ca6f5..ff962c44 100644 --- a/cmd/mesh-builder/holder.go +++ b/cmd/mesh-builder/holder.go @@ -14,8 +14,8 @@ import ( "github.com/nats-io/nats.go/micro" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/builder" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/accept_outside.go b/cmd/mesh-controller/accept_outside.go index a4b8ae96..3a389f74 100644 --- a/cmd/mesh-controller/accept_outside.go +++ b/cmd/mesh-controller/accept_outside.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/acts.go b/cmd/mesh-controller/acts.go index 4f02544c..3b0d11a0 100644 --- a/cmd/mesh-controller/acts.go +++ b/cmd/mesh-controller/acts.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/acts_test.go b/cmd/mesh-controller/acts_test.go index 2e8e6261..a7c6f819 100644 --- a/cmd/mesh-controller/acts_test.go +++ b/cmd/mesh-controller/acts_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // What an assignment says about the machines it was not about. diff --git a/cmd/mesh-controller/addresses_integration_test.go b/cmd/mesh-controller/addresses_integration_test.go index 3d85873d..d8c507b2 100644 --- a/cmd/mesh-controller/addresses_integration_test.go +++ b/cmd/mesh-controller/addresses_integration_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/licences" ) diff --git a/cmd/mesh-controller/addresses_test.go b/cmd/mesh-controller/addresses_test.go index 5eb8d617..ec44be96 100644 --- a/cmd/mesh-controller/addresses_test.go +++ b/cmd/mesh-controller/addresses_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/adopting_test.go b/cmd/mesh-controller/adopting_test.go index 5561bb05..5a5191c1 100644 --- a/cmd/mesh-controller/adopting_test.go +++ b/cmd/mesh-controller/adopting_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" - "github.com/novox/mesh-controller/internal/overlay" ) // novox/hq ADR 0100: taking a module is its cutover; converging a node is one act, previewed, and diff --git a/cmd/mesh-controller/adoption.go b/cmd/mesh-controller/adoption.go index afa90a07..ddad0cbe 100644 --- a/cmd/mesh-controller/adoption.go +++ b/cmd/mesh-controller/adoption.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-controller/internal/inventory" - "github.com/novox/mesh-controller/internal/overlay" ) // A node is adopted or converged (novox/hq ADR 0100), and it is said to be adopted wherever the diff --git a/cmd/mesh-controller/agent_account_test.go b/cmd/mesh-controller/agent_account_test.go index 63d5dff9..c8db9085 100644 --- a/cmd/mesh-controller/agent_account_test.go +++ b/cmd/mesh-controller/agent_account_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/asker_wire.go b/cmd/mesh-controller/asker_wire.go index 66651dc5..59c75efa 100644 --- a/cmd/mesh-controller/asker_wire.go +++ b/cmd/mesh-controller/asker_wire.go @@ -19,8 +19,8 @@ import ( "git.novox.be/novox/mesh-sdk/go/asks" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/awaiting_push_integration_test.go b/cmd/mesh-controller/awaiting_push_integration_test.go index d3714080..3cf81782 100644 --- a/cmd/mesh-controller/awaiting_push_integration_test.go +++ b/cmd/mesh-controller/awaiting_push_integration_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" - "github.com/novox/mesh-controller/internal/overlay" ) func TestAModuleAssignedAndNotPushedIsAwaitingAPushNotUncomposable(t *testing.T) { diff --git a/cmd/mesh-controller/awaiting_push_test.go b/cmd/mesh-controller/awaiting_push_test.go index 58efd557..8c947f3d 100644 --- a/cmd/mesh-controller/awaiting_push_test.go +++ b/cmd/mesh-controller/awaiting_push_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/away_integration_test.go b/cmd/mesh-controller/away_integration_test.go index 759b7ed9..72f18610 100644 --- a/cmd/mesh-controller/away_integration_test.go +++ b/cmd/mesh-controller/away_integration_test.go @@ -13,8 +13,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" "github.com/novox/mesh-controller/internal/testbus" diff --git a/cmd/mesh-controller/backups_before_send_integration_test.go b/cmd/mesh-controller/backups_before_send_integration_test.go index 10da5daa..2baca74b 100644 --- a/cmd/mesh-controller/backups_before_send_integration_test.go +++ b/cmd/mesh-controller/backups_before_send_integration_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/nats-io/nats.go" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" "github.com/novox/mesh-controller/internal/testbus" diff --git a/cmd/mesh-controller/batches_integration_test.go b/cmd/mesh-controller/batches_integration_test.go index 880e9940..d7afe0af 100644 --- a/cmd/mesh-controller/batches_integration_test.go +++ b/cmd/mesh-controller/batches_integration_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/batches_test.go b/cmd/mesh-controller/batches_test.go index da7ad0e9..af52b8a9 100644 --- a/cmd/mesh-controller/batches_test.go +++ b/cmd/mesh-controller/batches_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/bindings.go b/cmd/mesh-controller/bindings.go index ea3309b8..ee0370ad 100644 --- a/cmd/mesh-controller/bindings.go +++ b/cmd/mesh-controller/bindings.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" ) diff --git a/cmd/mesh-controller/bindings_integration_test.go b/cmd/mesh-controller/bindings_integration_test.go index 580c1fde..f7571e26 100644 --- a/cmd/mesh-controller/bindings_integration_test.go +++ b/cmd/mesh-controller/bindings_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" ) diff --git a/cmd/mesh-controller/bindings_test.go b/cmd/mesh-controller/bindings_test.go index 98cb6b69..2101e614 100644 --- a/cmd/mesh-controller/bindings_test.go +++ b/cmd/mesh-controller/bindings_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" ) diff --git a/cmd/mesh-controller/build.go b/cmd/mesh-controller/build.go index 5028bdf4..accc7e29 100644 --- a/cmd/mesh-controller/build.go +++ b/cmd/mesh-controller/build.go @@ -15,9 +15,9 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" "github.com/novox/mesh-controller/internal/builder" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/build_seat_test.go b/cmd/mesh-controller/build_seat_test.go index e40ca0a5..26e5942d 100644 --- a/cmd/mesh-controller/build_seat_test.go +++ b/cmd/mesh-controller/build_seat_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/build_source.go b/cmd/mesh-controller/build_source.go index da098867..1f54422f 100644 --- a/cmd/mesh-controller/build_source.go +++ b/cmd/mesh-controller/build_source.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/bus_step.go b/cmd/mesh-controller/bus_step.go index e7785536..e52f97ce 100644 --- a/cmd/mesh-controller/bus_step.go +++ b/cmd/mesh-controller/bus_step.go @@ -11,7 +11,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/busobjects_test.go b/cmd/mesh-controller/busobjects_test.go index 349ab225..c40758f6 100644 --- a/cmd/mesh-controller/busobjects_test.go +++ b/cmd/mesh-controller/busobjects_test.go @@ -9,8 +9,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/busy_test.go b/cmd/mesh-controller/busy_test.go index 8399dcdc..4b8433e5 100644 --- a/cmd/mesh-controller/busy_test.go +++ b/cmd/mesh-controller/busy_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/chain_integration_test.go b/cmd/mesh-controller/chain_integration_test.go index 81866f2b..ea086c9c 100644 --- a/cmd/mesh-controller/chain_integration_test.go +++ b/cmd/mesh-controller/chain_integration_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/chain" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/changeplan.go b/cmd/mesh-controller/changeplan.go index 2b3ae219..f6d3461e 100644 --- a/cmd/mesh-controller/changeplan.go +++ b/cmd/mesh-controller/changeplan.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/changeplan_test.go b/cmd/mesh-controller/changeplan_test.go index 599cb20e..8e537227 100644 --- a/cmd/mesh-controller/changeplan_test.go +++ b/cmd/mesh-controller/changeplan_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check.go b/cmd/mesh-controller/check.go index ce08029d..b6f605f8 100644 --- a/cmd/mesh-controller/check.go +++ b/cmd/mesh-controller/check.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check_builds_integration_test.go b/cmd/mesh-controller/check_builds_integration_test.go index 37f33a6a..36a78eb6 100644 --- a/cmd/mesh-controller/check_builds_integration_test.go +++ b/cmd/mesh-controller/check_builds_integration_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check_builds_test.go b/cmd/mesh-controller/check_builds_test.go index 7a339b51..8c4d0ccf 100644 --- a/cmd/mesh-controller/check_builds_test.go +++ b/cmd/mesh-controller/check_builds_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/builder" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check_here.go b/cmd/mesh-controller/check_here.go index 201e1dec..51e7c786 100644 --- a/cmd/mesh-controller/check_here.go +++ b/cmd/mesh-controller/check_here.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/builder" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check_siblings_test.go b/cmd/mesh-controller/check_siblings_test.go index b35e8e60..379ecd98 100644 --- a/cmd/mesh-controller/check_siblings_test.go +++ b/cmd/mesh-controller/check_siblings_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/check_test.go b/cmd/mesh-controller/check_test.go index eecf6139..608b6b69 100644 --- a/cmd/mesh-controller/check_test.go +++ b/cmd/mesh-controller/check_test.go @@ -8,8 +8,8 @@ import ( "testing" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/beside" - "github.com/novox/mesh-controller/internal/catalogue" ) // The check anybody can run is the check registration runs (novox/hq issue 148, ADR 0037): a manifest diff --git a/cmd/mesh-controller/checks.go b/cmd/mesh-controller/checks.go index eda91b65..500fe76c 100644 --- a/cmd/mesh-controller/checks.go +++ b/cmd/mesh-controller/checks.go @@ -14,8 +14,8 @@ import ( "strings" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/checks_queue_test.go b/cmd/mesh-controller/checks_queue_test.go index d79c6207..b9fb48f2 100644 --- a/cmd/mesh-controller/checks_queue_test.go +++ b/cmd/mesh-controller/checks_queue_test.go @@ -10,8 +10,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/composed_member_check_test.go b/cmd/mesh-controller/composed_member_check_test.go index f5bbc15b..7943412f 100644 --- a/cmd/mesh-controller/composed_member_check_test.go +++ b/cmd/mesh-controller/composed_member_check_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/composed_verdict_test.go b/cmd/mesh-controller/composed_verdict_test.go index a8573833..f96bc00c 100644 --- a/cmd/mesh-controller/composed_verdict_test.go +++ b/cmd/mesh-controller/composed_verdict_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/config_move.go b/cmd/mesh-controller/config_move.go index 1b65621d..8052fae6 100644 --- a/cmd/mesh-controller/config_move.go +++ b/cmd/mesh-controller/config_move.go @@ -15,8 +15,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/config_moved_integration_test.go b/cmd/mesh-controller/config_moved_integration_test.go index 7c930d12..f7a5b5cb 100644 --- a/cmd/mesh-controller/config_moved_integration_test.go +++ b/cmd/mesh-controller/config_moved_integration_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" - "github.com/novox/mesh-controller/internal/overlay" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" ) func aConfiguredMesh(t *testing.T) (*stores, configuredMesh, map[string]map[string]any) { diff --git a/cmd/mesh-controller/config_moved_test.go b/cmd/mesh-controller/config_moved_test.go index 390a51e7..a0578ede 100644 --- a/cmd/mesh-controller/config_moved_test.go +++ b/cmd/mesh-controller/config_moved_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" snapshot "github.com/novox/mesh-controller/internal/facts" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/core_box.go b/cmd/mesh-controller/core_box.go index e3d1ac13..83166b26 100644 --- a/cmd/mesh-controller/core_box.go +++ b/cmd/mesh-controller/core_box.go @@ -13,7 +13,7 @@ import ( "sort" "strings" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/core_box_integration_test.go b/cmd/mesh-controller/core_box_integration_test.go index 55660821..de2f210d 100644 --- a/cmd/mesh-controller/core_box_integration_test.go +++ b/cmd/mesh-controller/core_box_integration_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/core_box_test.go b/cmd/mesh-controller/core_box_test.go index 4a6872de..56d8782e 100644 --- a/cmd/mesh-controller/core_box_test.go +++ b/cmd/mesh-controller/core_box_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/credential_on_assign_test.go b/cmd/mesh-controller/credential_on_assign_test.go index 9c8133a0..b6f557c4 100644 --- a/cmd/mesh-controller/credential_on_assign_test.go +++ b/cmd/mesh-controller/credential_on_assign_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/data.go b/cmd/mesh-controller/data.go index 142e2164..6c41e640 100644 --- a/cmd/mesh-controller/data.go +++ b/cmd/mesh-controller/data.go @@ -14,7 +14,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/data_integration_test.go b/cmd/mesh-controller/data_integration_test.go index 4d8a9853..68247082 100644 --- a/cmd/mesh-controller/data_integration_test.go +++ b/cmd/mesh-controller/data_integration_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/testbus" diff --git a/cmd/mesh-controller/data_test.go b/cmd/mesh-controller/data_test.go index 15dcf45e..a9589f77 100644 --- a/cmd/mesh-controller/data_test.go +++ b/cmd/mesh-controller/data_test.go @@ -11,7 +11,7 @@ import ( "github.com/novox/mesh-controller/internal/link" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/deadletters.go b/cmd/mesh-controller/deadletters.go index 74f22cb0..489256ee 100644 --- a/cmd/mesh-controller/deadletters.go +++ b/cmd/mesh-controller/deadletters.go @@ -9,8 +9,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/delivery.go b/cmd/mesh-controller/delivery.go index c24b2f43..9014ce1e 100644 --- a/cmd/mesh-controller/delivery.go +++ b/cmd/mesh-controller/delivery.go @@ -15,7 +15,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/delivery_changes.go b/cmd/mesh-controller/delivery_changes.go index 2fb5f82f..0e2a2966 100644 --- a/cmd/mesh-controller/delivery_changes.go +++ b/cmd/mesh-controller/delivery_changes.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/delivery_conditions.go b/cmd/mesh-controller/delivery_conditions.go index d5fefbe8..74b14082 100644 --- a/cmd/mesh-controller/delivery_conditions.go +++ b/cmd/mesh-controller/delivery_conditions.go @@ -10,8 +10,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/delivery_conditions_test.go b/cmd/mesh-controller/delivery_conditions_test.go index cb3176fa..c9533fac 100644 --- a/cmd/mesh-controller/delivery_conditions_test.go +++ b/cmd/mesh-controller/delivery_conditions_test.go @@ -13,8 +13,8 @@ import ( "github.com/nats-io/nats.go" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/delivery_edges_test.go b/cmd/mesh-controller/delivery_edges_test.go index 195aa2eb..b858720c 100644 --- a/cmd/mesh-controller/delivery_edges_test.go +++ b/cmd/mesh-controller/delivery_edges_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/delivery_integration_test.go b/cmd/mesh-controller/delivery_integration_test.go index ed85ec2f..6689e7a3 100644 --- a/cmd/mesh-controller/delivery_integration_test.go +++ b/cmd/mesh-controller/delivery_integration_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/nats-io/nats.go" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" "github.com/novox/mesh-controller/internal/testbus" diff --git a/cmd/mesh-controller/delivery_test.go b/cmd/mesh-controller/delivery_test.go index d7f1b0df..a3127130 100644 --- a/cmd/mesh-controller/delivery_test.go +++ b/cmd/mesh-controller/delivery_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/dependents_test.go b/cmd/mesh-controller/dependents_test.go index 48cf8d9b..05c306b1 100644 --- a/cmd/mesh-controller/dependents_test.go +++ b/cmd/mesh-controller/dependents_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/doctor_test.go b/cmd/mesh-controller/doctor_test.go index 8f5b0506..4c9e116e 100644 --- a/cmd/mesh-controller/doctor_test.go +++ b/cmd/mesh-controller/doctor_test.go @@ -10,8 +10,8 @@ import ( "golang.org/x/net/dns/dnsmessage" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/facts.go b/cmd/mesh-controller/facts.go index f1f38f76..83cbb7a7 100644 --- a/cmd/mesh-controller/facts.go +++ b/cmd/mesh-controller/facts.go @@ -14,12 +14,12 @@ import ( "sync" "time" - "github.com/novox/mesh-host/validate" + "git.novox.be/novox/mesh-sdk/go/validate" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/artifacts" "github.com/novox/mesh-controller/internal/broker" "github.com/novox/mesh-controller/internal/builder" - "github.com/novox/mesh-controller/internal/catalogue" snapshot "github.com/novox/mesh-controller/internal/facts" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/facts_test.go b/cmd/mesh-controller/facts_test.go index 7f3c9544..8c67d124 100644 --- a/cmd/mesh-controller/facts_test.go +++ b/cmd/mesh-controller/facts_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" snapshot "github.com/novox/mesh-controller/internal/facts" ) diff --git a/cmd/mesh-controller/first_build_ask_integration_test.go b/cmd/mesh-controller/first_build_ask_integration_test.go index 8f0a7ac8..68d84fdd 100644 --- a/cmd/mesh-controller/first_build_ask_integration_test.go +++ b/cmd/mesh-controller/first_build_ask_integration_test.go @@ -9,8 +9,8 @@ import ( "time" "git.novox.be/novox/mesh-sdk/go/asks" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/identity" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/first_builds_integration_test.go b/cmd/mesh-controller/first_builds_integration_test.go index 133c79a7..e82d7284 100644 --- a/cmd/mesh-controller/first_builds_integration_test.go +++ b/cmd/mesh-controller/first_builds_integration_test.go @@ -12,8 +12,8 @@ import ( "github.com/nats-io/nats.go/jetstream" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" "github.com/novox/mesh-controller/internal/testbus" diff --git a/cmd/mesh-controller/fixclass_test.go b/cmd/mesh-controller/fixclass_test.go index 225089f9..9541c005 100644 --- a/cmd/mesh-controller/fixclass_test.go +++ b/cmd/mesh-controller/fixclass_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/gate.go b/cmd/mesh-controller/gate.go index f0912525..30a7499d 100644 --- a/cmd/mesh-controller/gate.go +++ b/cmd/mesh-controller/gate.go @@ -13,8 +13,8 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/micro" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/gate_followup_test.go b/cmd/mesh-controller/gate_followup_test.go index 9ba07bf3..ca5dbb9f 100644 --- a/cmd/mesh-controller/gate_followup_test.go +++ b/cmd/mesh-controller/gate_followup_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/gate_integration_test.go b/cmd/mesh-controller/gate_integration_test.go index fff52fa6..31e5c56d 100644 --- a/cmd/mesh-controller/gate_integration_test.go +++ b/cmd/mesh-controller/gate_integration_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/gate_rule_test.go b/cmd/mesh-controller/gate_rule_test.go index 69681695..b1b1033e 100644 --- a/cmd/mesh-controller/gate_rule_test.go +++ b/cmd/mesh-controller/gate_rule_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" ) diff --git a/cmd/mesh-controller/gate_test.go b/cmd/mesh-controller/gate_test.go index 589c4aa4..8109ede3 100644 --- a/cmd/mesh-controller/gate_test.go +++ b/cmd/mesh-controller/gate_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/generation.go b/cmd/mesh-controller/generation.go index b8d1203b..a354d289 100644 --- a/cmd/mesh-controller/generation.go +++ b/cmd/mesh-controller/generation.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/conditions" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/grant_follows_binding_integration_test.go b/cmd/mesh-controller/grant_follows_binding_integration_test.go index 74622b3d..96362c4b 100644 --- a/cmd/mesh-controller/grant_follows_binding_integration_test.go +++ b/cmd/mesh-controller/grant_follows_binding_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) func TestAConsumerPinnedBackIsNoLongerGrantedByTheProviderItLeft(t *testing.T) {