From 4c84ac992ba7b81cfe5a1bbfd06c61de8ea3f29d Mon Sep 17 00:00:00 2001 From: mesh-tools Date: Tue, 20 Oct 2026 08:23:26 +0000 Subject: [PATCH] Take the catalogue, overlay and validator from mesh-sdk in cmd/mesh-controller, g to p (issue 1381, 2 of 6 import swaps) --- cmd/mesh-controller/grant_follows_binding_test.go | 2 +- cmd/mesh-controller/grants_step_integration_test.go | 2 +- cmd/mesh-controller/grants_step_store_test.go | 2 +- cmd/mesh-controller/grants_step_test.go | 2 +- cmd/mesh-controller/group_wait.go | 2 +- cmd/mesh-controller/health_check_test.go | 2 +- cmd/mesh-controller/health_probes.go | 2 +- cmd/mesh-controller/held_back.go | 2 +- cmd/mesh-controller/held_back_test.go | 4 ++-- cmd/mesh-controller/holders_silent_test.go | 2 +- cmd/mesh-controller/holdings.go | 4 ++-- cmd/mesh-controller/holdings_test.go | 2 +- cmd/mesh-controller/identity_bound_integration_test.go | 2 +- cmd/mesh-controller/issue201_integration_test.go | 2 +- cmd/mesh-controller/issue348_integration_test.go | 2 +- cmd/mesh-controller/issue352_integration_test.go | 2 +- cmd/mesh-controller/issue352_test.go | 2 +- cmd/mesh-controller/issue648_test.go | 2 +- cmd/mesh-controller/issued.go | 2 +- cmd/mesh-controller/issued_test.go | 2 +- cmd/mesh-controller/issued_to_vault.go | 2 +- cmd/mesh-controller/issued_to_vault_test.go | 2 +- cmd/mesh-controller/left_out.go | 2 +- cmd/mesh-controller/left_out_integration_test.go | 2 +- cmd/mesh-controller/left_out_test.go | 2 +- cmd/mesh-controller/local_network.go | 4 ++-- cmd/mesh-controller/local_network_test.go | 2 +- cmd/mesh-controller/lone_merge_test.go | 2 +- cmd/mesh-controller/merge_gate.go | 2 +- cmd/mesh-controller/merge_gate_handing_integration_test.go | 2 +- cmd/mesh-controller/merge_gate_integration_test.go | 2 +- cmd/mesh-controller/mesh_for_test.go | 4 ++-- cmd/mesh-controller/mirrors.go | 2 +- cmd/mesh-controller/mirrors_integration_test.go | 2 +- cmd/mesh-controller/mirrors_test.go | 2 +- cmd/mesh-controller/module_health.go | 2 +- cmd/mesh-controller/modules.go | 4 ++-- cmd/mesh-controller/modules_test.go | 2 +- cmd/mesh-controller/modules_wire_test.go | 2 +- cmd/mesh-controller/moved.go | 2 +- cmd/mesh-controller/moved_bus_test.go | 2 +- cmd/mesh-controller/network.go | 4 ++-- cmd/mesh-controller/network_test.go | 4 ++-- cmd/mesh-controller/new_module_approved_test.go | 2 +- cmd/mesh-controller/new_module_bus_test.go | 2 +- cmd/mesh-controller/new_module_on_merge_test.go | 2 +- cmd/mesh-controller/nodes.go | 4 ++-- cmd/mesh-controller/non_trunk_merge_test.go | 2 +- cmd/mesh-controller/one_group_one_plan_test.go | 2 +- cmd/mesh-controller/one_resolution_test.go | 2 +- cmd/mesh-controller/operator_wait.go | 2 +- cmd/mesh-controller/operator_wait_test.go | 2 +- cmd/mesh-controller/order_test.go | 2 +- cmd/mesh-controller/outside_accept_test.go | 2 +- cmd/mesh-controller/outside_not_given_test.go | 2 +- cmd/mesh-controller/outside_wait_test.go | 2 +- cmd/mesh-controller/over_budget.go | 2 +- cmd/mesh-controller/over_budget_integration_test.go | 2 +- cmd/mesh-controller/over_budget_test.go | 2 +- cmd/mesh-controller/own_path_by_claim_test.go | 2 +- cmd/mesh-controller/owned_paths_test.go | 2 +- cmd/mesh-controller/pending_integration_test.go | 2 +- cmd/mesh-controller/pending_test.go | 2 +- cmd/mesh-controller/person_wait_test.go | 2 +- cmd/mesh-controller/placement_moved_test.go | 2 +- cmd/mesh-controller/placement_words_moved_integration_test.go | 2 +- cmd/mesh-controller/plan.go | 4 ++-- cmd/mesh-controller/plan_backups.go | 2 +- cmd/mesh-controller/plan_backups_test.go | 2 +- cmd/mesh-controller/plan_clock_integration_test.go | 2 +- 70 files changed, 79 insertions(+), 79 deletions(-) diff --git a/cmd/mesh-controller/grant_follows_binding_test.go b/cmd/mesh-controller/grant_follows_binding_test.go index 9b9c6cd4..2918e1f0 100644 --- a/cmd/mesh-controller/grant_follows_binding_test.go +++ b/cmd/mesh-controller/grant_follows_binding_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" ) diff --git a/cmd/mesh-controller/grants_step_integration_test.go b/cmd/mesh-controller/grants_step_integration_test.go index c40c1bd3..7e54c6d8 100644 --- a/cmd/mesh-controller/grants_step_integration_test.go +++ b/cmd/mesh-controller/grants_step_integration_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // The store test's manifests are manifests the controller takes in: checked here, where no store is needed, diff --git a/cmd/mesh-controller/grants_step_store_test.go b/cmd/mesh-controller/grants_step_store_test.go index 705dc8fb..206303ab 100644 --- a/cmd/mesh-controller/grants_step_store_test.go +++ b/cmd/mesh-controller/grants_step_store_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/identity" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/grants_step_test.go b/cmd/mesh-controller/grants_step_test.go index 48b34bb5..c484d693 100644 --- a/cmd/mesh-controller/grants_step_test.go +++ b/cmd/mesh-controller/grants_step_test.go @@ -9,7 +9,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/group_wait.go b/cmd/mesh-controller/group_wait.go index 46a22e03..8713318e 100644 --- a/cmd/mesh-controller/group_wait.go +++ b/cmd/mesh-controller/group_wait.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/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/health_check_test.go b/cmd/mesh-controller/health_check_test.go index 5ac0e1cc..4c4ddf53 100644 --- a/cmd/mesh-controller/health_check_test.go +++ b/cmd/mesh-controller/health_check_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // Every catalogue module that runs something long-lived declares how it is ready (novox/hq ADR 0240 rule diff --git a/cmd/mesh-controller/health_probes.go b/cmd/mesh-controller/health_probes.go index c0e59764..d9cc994c 100644 --- a/cmd/mesh-controller/health_probes.go +++ b/cmd/mesh-controller/health_probes.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/inventory" "github.com/novox/mesh-controller/internal/lease" diff --git a/cmd/mesh-controller/held_back.go b/cmd/mesh-controller/held_back.go index 66644ec2..fd31c63e 100644 --- a/cmd/mesh-controller/held_back.go +++ b/cmd/mesh-controller/held_back.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" ) diff --git a/cmd/mesh-controller/held_back_test.go b/cmd/mesh-controller/held_back_test.go index 2d5eb506..66b66e6d 100644 --- a/cmd/mesh-controller/held_back_test.go +++ b/cmd/mesh-controller/held_back_test.go @@ -8,9 +8,9 @@ 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/overlay" ) // novox/hq issue 259, ADR 0221: a push that did not name a machine does not send it a build its diff --git a/cmd/mesh-controller/holders_silent_test.go b/cmd/mesh-controller/holders_silent_test.go index 79362ec9..0f1486f6 100644 --- a/cmd/mesh-controller/holders_silent_test.go +++ b/cmd/mesh-controller/holders_silent_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // The live case of 2026-10-07 (novox/hq issue 299), replayed: the node-uplink seat gained its first diff --git a/cmd/mesh-controller/holdings.go b/cmd/mesh-controller/holdings.go index 3eab711c..4de860ac 100644 --- a/cmd/mesh-controller/holdings.go +++ b/cmd/mesh-controller/holdings.go @@ -5,9 +5,9 @@ import ( "fmt" "sort" - "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" ) // recordDerivedHolders writes down who holds each mesh-scoped seat that nobody was ever recorded diff --git a/cmd/mesh-controller/holdings_test.go b/cmd/mesh-controller/holdings_test.go index efab46cd..8b3a0054 100644 --- a/cmd/mesh-controller/holdings_test.go +++ b/cmd/mesh-controller/holdings_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // A seat nobody ever handed over is held by whichever assignment happened to be alone — and the diff --git a/cmd/mesh-controller/identity_bound_integration_test.go b/cmd/mesh-controller/identity_bound_integration_test.go index 8195ab04..97d5a7a8 100644 --- a/cmd/mesh-controller/identity_bound_integration_test.go +++ b/cmd/mesh-controller/identity_bound_integration_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) func TestAnOverflowingConsumerNeverRefusesItsProvidersMachine(t *testing.T) { diff --git a/cmd/mesh-controller/issue201_integration_test.go b/cmd/mesh-controller/issue201_integration_test.go index 413b2f1c..1ee6d8eb 100644 --- a/cmd/mesh-controller/issue201_integration_test.go +++ b/cmd/mesh-controller/issue201_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/lease" ) diff --git a/cmd/mesh-controller/issue348_integration_test.go b/cmd/mesh-controller/issue348_integration_test.go index b2c5f29c..a723bda0 100644 --- a/cmd/mesh-controller/issue348_integration_test.go +++ b/cmd/mesh-controller/issue348_integration_test.go @@ -7,7 +7,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/issue352_integration_test.go b/cmd/mesh-controller/issue352_integration_test.go index 7f604afe..1f7c399e 100644 --- a/cmd/mesh-controller/issue352_integration_test.go +++ b/cmd/mesh-controller/issue352_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/conditions" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/issue352_test.go b/cmd/mesh-controller/issue352_test.go index 3baa9b57..86e8cea5 100644 --- a/cmd/mesh-controller/issue352_test.go +++ b/cmd/mesh-controller/issue352_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/issue648_test.go b/cmd/mesh-controller/issue648_test.go index 89fc9bb5..af1ba7d5 100644 --- a/cmd/mesh-controller/issue648_test.go +++ b/cmd/mesh-controller/issue648_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/inventory" ) diff --git a/cmd/mesh-controller/issued.go b/cmd/mesh-controller/issued.go index 4ae02291..4c553807 100644 --- a/cmd/mesh-controller/issued.go +++ b/cmd/mesh-controller/issued.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" "github.com/novox/mesh-controller/internal/secrets" diff --git a/cmd/mesh-controller/issued_test.go b/cmd/mesh-controller/issued_test.go index f2819a76..7752244e 100644 --- a/cmd/mesh-controller/issued_test.go +++ b/cmd/mesh-controller/issued_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" "github.com/novox/mesh-controller/internal/link" "github.com/novox/mesh-controller/internal/secrets" diff --git a/cmd/mesh-controller/issued_to_vault.go b/cmd/mesh-controller/issued_to_vault.go index 212a3d16..41703413 100644 --- a/cmd/mesh-controller/issued_to_vault.go +++ b/cmd/mesh-controller/issued_to_vault.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/inventory" ) diff --git a/cmd/mesh-controller/issued_to_vault_test.go b/cmd/mesh-controller/issued_to_vault_test.go index 6f518918..50068d32 100644 --- a/cmd/mesh-controller/issued_to_vault_test.go +++ b/cmd/mesh-controller/issued_to_vault_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" ) // Every other test mints without a vault to hand to: a stand-in that takes anything, replaced by the tests below. diff --git a/cmd/mesh-controller/left_out.go b/cmd/mesh-controller/left_out.go index c66a21d3..94d1b9e5 100644 --- a/cmd/mesh-controller/left_out.go +++ b/cmd/mesh-controller/left_out.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/conditions" ) diff --git a/cmd/mesh-controller/left_out_integration_test.go b/cmd/mesh-controller/left_out_integration_test.go index feae280f..bcb7f947 100644 --- a/cmd/mesh-controller/left_out_integration_test.go +++ b/cmd/mesh-controller/left_out_integration_test.go @@ -7,7 +7,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/left_out_test.go b/cmd/mesh-controller/left_out_test.go index 795bef55..dbe9c7c1 100644 --- a/cmd/mesh-controller/left_out_test.go +++ b/cmd/mesh-controller/left_out_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/conditions" ) diff --git a/cmd/mesh-controller/local_network.go b/cmd/mesh-controller/local_network.go index f3af5d91..833e3af3 100644 --- a/cmd/mesh-controller/local_network.go +++ b/cmd/mesh-controller/local_network.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "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" ) // localNetworksOf is a machine's attached networks judged (novox/hq ADR 0340): which count as its local diff --git a/cmd/mesh-controller/local_network_test.go b/cmd/mesh-controller/local_network_test.go index 739f39d2..0c46895e 100644 --- a/cmd/mesh-controller/local_network_test.go +++ b/cmd/mesh-controller/local_network_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" ) diff --git a/cmd/mesh-controller/lone_merge_test.go b/cmd/mesh-controller/lone_merge_test.go index 4c9eb8f6..e5850d76 100644 --- a/cmd/mesh-controller/lone_merge_test.go +++ b/cmd/mesh-controller/lone_merge_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" ) diff --git a/cmd/mesh-controller/merge_gate.go b/cmd/mesh-controller/merge_gate.go index 5557b96e..02adf909 100644 --- a/cmd/mesh-controller/merge_gate.go +++ b/cmd/mesh-controller/merge_gate.go @@ -21,9 +21,9 @@ import ( "github.com/jackc/pgx/v5" + "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/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/merge_gate_handing_integration_test.go b/cmd/mesh-controller/merge_gate_handing_integration_test.go index 74720f4c..05710b27 100644 --- a/cmd/mesh-controller/merge_gate_handing_integration_test.go +++ b/cmd/mesh-controller/merge_gate_handing_integration_test.go @@ -7,7 +7,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/merge_gate_integration_test.go b/cmd/mesh-controller/merge_gate_integration_test.go index 57ade01d..3cc28a22 100644 --- a/cmd/mesh-controller/merge_gate_integration_test.go +++ b/cmd/mesh-controller/merge_gate_integration_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" snapshot "github.com/novox/mesh-controller/internal/facts" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/mesh_for_test.go b/cmd/mesh-controller/mesh_for_test.go index aad02830..68be9da6 100644 --- a/cmd/mesh-controller/mesh_for_test.go +++ b/cmd/mesh-controller/mesh_for_test.go @@ -12,10 +12,10 @@ import ( "github.com/novox/mesh-controller/internal/conditions" - "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/licences" - "github.com/novox/mesh-controller/internal/overlay" ) // A mesh a command can be run against. diff --git a/cmd/mesh-controller/mirrors.go b/cmd/mesh-controller/mirrors.go index 901d3a8c..a3e8f2a5 100644 --- a/cmd/mesh-controller/mirrors.go +++ b/cmd/mesh-controller/mirrors.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/artifacts" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" ) diff --git a/cmd/mesh-controller/mirrors_integration_test.go b/cmd/mesh-controller/mirrors_integration_test.go index b2e5cfc7..c45687f4 100644 --- a/cmd/mesh-controller/mirrors_integration_test.go +++ b/cmd/mesh-controller/mirrors_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" ) diff --git a/cmd/mesh-controller/mirrors_test.go b/cmd/mesh-controller/mirrors_test.go index fee175df..af0f21aa 100644 --- a/cmd/mesh-controller/mirrors_test.go +++ b/cmd/mesh-controller/mirrors_test.go @@ -9,8 +9,8 @@ import ( "sync" "testing" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/novox/mesh-controller/internal/artifacts" - "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/module_health.go b/cmd/mesh-controller/module_health.go index 39ba6f01..f021b1b8 100644 --- a/cmd/mesh-controller/module_health.go +++ b/cmd/mesh-controller/module_health.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "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/modules.go b/cmd/mesh-controller/modules.go index 030f2af0..12b84e9d 100644 --- a/cmd/mesh-controller/modules.go +++ b/cmd/mesh-controller/modules.go @@ -13,11 +13,11 @@ import ( "strings" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "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/overlay" ) // the catalogue: what exists, what is assigned, and how it is configured. diff --git a/cmd/mesh-controller/modules_test.go b/cmd/mesh-controller/modules_test.go index 4de406cf..bbec2147 100644 --- a/cmd/mesh-controller/modules_test.go +++ b/cmd/mesh-controller/modules_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // `module issue` makes a broker account and delivers it as the module's own secret named broker. diff --git a/cmd/mesh-controller/modules_wire_test.go b/cmd/mesh-controller/modules_wire_test.go index 518ab17f..50b4c961 100644 --- a/cmd/mesh-controller/modules_wire_test.go +++ b/cmd/mesh-controller/modules_wire_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "git.novox.be/novox/mesh-sdk/go/validate" "github.com/novox/mesh-controller/internal/chain" - "github.com/novox/mesh-host/validate" ) // The module of each resource and the build of each module (novox/hq issue 1145, design 47 release 1-2). The diff --git a/cmd/mesh-controller/moved.go b/cmd/mesh-controller/moved.go index 3e9d95da..f84c23bb 100644 --- a/cmd/mesh-controller/moved.go +++ b/cmd/mesh-controller/moved.go @@ -15,8 +15,8 @@ import ( "git.novox.be/novox/mesh-sdk/go/asks" sdkdelivery "git.novox.be/novox/mesh-sdk/go/delivery" + "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/moved_bus_test.go b/cmd/mesh-controller/moved_bus_test.go index 1e999dd2..e8aebce2 100644 --- a/cmd/mesh-controller/moved_bus_test.go +++ b/cmd/mesh-controller/moved_bus_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/network.go b/cmd/mesh-controller/network.go index 283e8335..7308a464 100644 --- a/cmd/mesh-controller/network.go +++ b/cmd/mesh-controller/network.go @@ -11,9 +11,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" ) // the private network: who is on it, where, and what they are called. diff --git a/cmd/mesh-controller/network_test.go b/cmd/mesh-controller/network_test.go index de917559..9ff9056d 100644 --- a/cmd/mesh-controller/network_test.go +++ b/cmd/mesh-controller/network_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-controller/internal/beside" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/inventory" - "github.com/novox/mesh-controller/internal/overlay" ) // placementOf is what the mesh holds about where one node is. diff --git a/cmd/mesh-controller/new_module_approved_test.go b/cmd/mesh-controller/new_module_approved_test.go index 953aebc7..f5293efe 100644 --- a/cmd/mesh-controller/new_module_approved_test.go +++ b/cmd/mesh-controller/new_module_approved_test.go @@ -9,7 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-sdk/go/asks" - "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/new_module_bus_test.go b/cmd/mesh-controller/new_module_bus_test.go index e4579d37..05f65214 100644 --- a/cmd/mesh-controller/new_module_bus_test.go +++ b/cmd/mesh-controller/new_module_bus_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/new_module_on_merge_test.go b/cmd/mesh-controller/new_module_on_merge_test.go index 9bd9623d..a022c869 100644 --- a/cmd/mesh-controller/new_module_on_merge_test.go +++ b/cmd/mesh-controller/new_module_on_merge_test.go @@ -6,7 +6,7 @@ import ( "context" "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/nodes.go b/cmd/mesh-controller/nodes.go index 8d8e19ec..6a30aba3 100644 --- a/cmd/mesh-controller/nodes.go +++ b/cmd/mesh-controller/nodes.go @@ -14,12 +14,12 @@ import ( "strings" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "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" - "github.com/novox/mesh-controller/internal/overlay" "github.com/novox/mesh-controller/internal/token" ) diff --git a/cmd/mesh-controller/non_trunk_merge_test.go b/cmd/mesh-controller/non_trunk_merge_test.go index be0ace88..71322750 100644 --- a/cmd/mesh-controller/non_trunk_merge_test.go +++ b/cmd/mesh-controller/non_trunk_merge_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/one_group_one_plan_test.go b/cmd/mesh-controller/one_group_one_plan_test.go index 84c7af6c..14c7647a 100644 --- a/cmd/mesh-controller/one_group_one_plan_test.go +++ b/cmd/mesh-controller/one_group_one_plan_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/inventory" ) diff --git a/cmd/mesh-controller/one_resolution_test.go b/cmd/mesh-controller/one_resolution_test.go index 82a873a9..406b9ec7 100644 --- a/cmd/mesh-controller/one_resolution_test.go +++ b/cmd/mesh-controller/one_resolution_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" ) // novox/hq issue 237: every line of an act's answer comes from one resolution of the node taken after diff --git a/cmd/mesh-controller/operator_wait.go b/cmd/mesh-controller/operator_wait.go index 48e8bae4..6de6747b 100644 --- a/cmd/mesh-controller/operator_wait.go +++ b/cmd/mesh-controller/operator_wait.go @@ -8,7 +8,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/operator_wait_test.go b/cmd/mesh-controller/operator_wait_test.go index 1961f821..15879fa7 100644 --- a/cmd/mesh-controller/operator_wait_test.go +++ b/cmd/mesh-controller/operator_wait_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/order_test.go b/cmd/mesh-controller/order_test.go index f362c8df..9bd36d56 100644 --- a/cmd/mesh-controller/order_test.go +++ b/cmd/mesh-controller/order_test.go @@ -7,7 +7,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/outside_accept_test.go b/cmd/mesh-controller/outside_accept_test.go index bf314b1c..e3aa7cd9 100644 --- a/cmd/mesh-controller/outside_accept_test.go +++ b/cmd/mesh-controller/outside_accept_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // One accept for a provider reaches every consumer that binds the provision from it, and each consumer's send diff --git a/cmd/mesh-controller/outside_not_given_test.go b/cmd/mesh-controller/outside_not_given_test.go index 74421aa9..e1becf05 100644 --- a/cmd/mesh-controller/outside_not_given_test.go +++ b/cmd/mesh-controller/outside_not_given_test.go @@ -5,7 +5,7 @@ package main import ( "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // An own secret issued outside the mesh that nobody gave is never made (novox/hq issue 401, ADR 0228). Seen on diff --git a/cmd/mesh-controller/outside_wait_test.go b/cmd/mesh-controller/outside_wait_test.go index 1c7a76b8..f5f344a9 100644 --- a/cmd/mesh-controller/outside_wait_test.go +++ b/cmd/mesh-controller/outside_wait_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" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/link" diff --git a/cmd/mesh-controller/over_budget.go b/cmd/mesh-controller/over_budget.go index a3b8101e..03c578ff 100644 --- a/cmd/mesh-controller/over_budget.go +++ b/cmd/mesh-controller/over_budget.go @@ -9,7 +9,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/over_budget_integration_test.go b/cmd/mesh-controller/over_budget_integration_test.go index 38fc57ab..c16b24ad 100644 --- a/cmd/mesh-controller/over_budget_integration_test.go +++ b/cmd/mesh-controller/over_budget_integration_test.go @@ -6,7 +6,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/over_budget_test.go b/cmd/mesh-controller/over_budget_test.go index 52773bbc..9ba16ee4 100644 --- a/cmd/mesh-controller/over_budget_test.go +++ b/cmd/mesh-controller/over_budget_test.go @@ -5,8 +5,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" ) diff --git a/cmd/mesh-controller/own_path_by_claim_test.go b/cmd/mesh-controller/own_path_by_claim_test.go index a54bfd44..0b02f7ac 100644 --- a/cmd/mesh-controller/own_path_by_claim_test.go +++ b/cmd/mesh-controller/own_path_by_claim_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/owned_paths_test.go b/cmd/mesh-controller/owned_paths_test.go index 10784a11..1aa8aac4 100644 --- a/cmd/mesh-controller/owned_paths_test.go +++ b/cmd/mesh-controller/owned_paths_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/novox/mesh-host/validate" + "git.novox.be/novox/mesh-sdk/go/validate" ) // A directory or an archive that says how it reacts to files it does not know (novox/hq ADR 0422) is a diff --git a/cmd/mesh-controller/pending_integration_test.go b/cmd/mesh-controller/pending_integration_test.go index ba6a82fe..c6c5b90d 100644 --- a/cmd/mesh-controller/pending_integration_test.go +++ b/cmd/mesh-controller/pending_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/inventory" "github.com/novox/mesh-controller/internal/link" ) diff --git a/cmd/mesh-controller/pending_test.go b/cmd/mesh-controller/pending_test.go index c5171bca..ed5c12ee 100644 --- a/cmd/mesh-controller/pending_test.go +++ b/cmd/mesh-controller/pending_test.go @@ -6,7 +6,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/person_wait_test.go b/cmd/mesh-controller/person_wait_test.go index cd61536e..eeb3a77d 100644 --- a/cmd/mesh-controller/person_wait_test.go +++ b/cmd/mesh-controller/person_wait_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/placement_moved_test.go b/cmd/mesh-controller/placement_moved_test.go index f4a8938b..b873070c 100644 --- a/cmd/mesh-controller/placement_moved_test.go +++ b/cmd/mesh-controller/placement_moved_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/novox/mesh-controller/internal/catalogue" + "git.novox.be/novox/mesh-sdk/go/catalogue" ) // **Placement leaves the settings layers and no machine is told anything new** (novox/hq ADR 0348 clause diff --git a/cmd/mesh-controller/placement_words_moved_integration_test.go b/cmd/mesh-controller/placement_words_moved_integration_test.go index f707f74d..75e3b000 100644 --- a/cmd/mesh-controller/placement_words_moved_integration_test.go +++ b/cmd/mesh-controller/placement_words_moved_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" ) func aMeshWithTheWordsInItsLayers(t *testing.T) (*stores, wordedMesh) { diff --git a/cmd/mesh-controller/plan.go b/cmd/mesh-controller/plan.go index 108c6d83..3f51ec6a 100644 --- a/cmd/mesh-controller/plan.go +++ b/cmd/mesh-controller/plan.go @@ -14,13 +14,13 @@ import ( "strings" "sync" + "git.novox.be/novox/mesh-sdk/go/catalogue" + "git.novox.be/novox/mesh-sdk/go/overlay" "github.com/novox/mesh-controller/internal/broker" - "github.com/novox/mesh-controller/internal/catalogue" "github.com/novox/mesh-controller/internal/chain" "github.com/novox/mesh-controller/internal/inventory" "github.com/novox/mesh-controller/internal/licences" "github.com/novox/mesh-controller/internal/link" - "github.com/novox/mesh-controller/internal/overlay" ) // working out what one machine should be. diff --git a/cmd/mesh-controller/plan_backups.go b/cmd/mesh-controller/plan_backups.go index f741e126..f258d7a6 100644 --- a/cmd/mesh-controller/plan_backups.go +++ b/cmd/mesh-controller/plan_backups.go @@ -11,8 +11,8 @@ import ( "sync" "time" + "git.novox.be/novox/mesh-sdk/go/catalogue" "github.com/nats-io/nats.go" - "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/plan_backups_test.go b/cmd/mesh-controller/plan_backups_test.go index 522611ee..644f1950 100644 --- a/cmd/mesh-controller/plan_backups_test.go +++ b/cmd/mesh-controller/plan_backups_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/inventory" ) diff --git a/cmd/mesh-controller/plan_clock_integration_test.go b/cmd/mesh-controller/plan_clock_integration_test.go index 8581e2e3..460db64f 100644 --- a/cmd/mesh-controller/plan_clock_integration_test.go +++ b/cmd/mesh-controller/plan_clock_integration_test.go @@ -5,7 +5,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" )