From d87326f644abca1e2a80950d22d4e14f7436ef58 Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Tue, 29 Sep 2026 14:56:39 +1000 Subject: [PATCH] refactor: move listener inventory to test kit --- .../testkit}/listenerinventory/doc.go | 9 ++++----- .../testkit}/listenerinventory/table.go | 0 .../testkit}/listenerinventory/table_test.go | 2 +- spinifex/network/invariants/host_containment_test.go | 2 +- spinifex/network/invariants/listener_bind_test.go | 2 +- spinifex/network/invariants/names_test.go | 2 +- spinifex/network/invariants/nats_subjects_test.go | 2 +- tests/e2e/multinode/listener_invariant_test.go | 2 +- tests/e2e/multinode/listener_invariant_unit_test.go | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) rename {spinifex/network => internal/testkit}/listenerinventory/doc.go (58%) rename {spinifex/network => internal/testkit}/listenerinventory/table.go (100%) rename {spinifex/network => internal/testkit}/listenerinventory/table_test.go (98%) diff --git a/spinifex/network/listenerinventory/doc.go b/internal/testkit/listenerinventory/doc.go similarity index 58% rename from spinifex/network/listenerinventory/doc.go rename to internal/testkit/listenerinventory/doc.go index 98107dd3d..474af01e0 100644 --- a/spinifex/network/listenerinventory/doc.go +++ b/internal/testkit/listenerinventory/doc.go @@ -6,9 +6,8 @@ // unrelated checks read: the static bind-site scan in // spinifex/network/invariants, which reads install scripts and config // templates, and the runtime e2e check in tests/e2e/multinode, which reads -// `ss -tulnp` on live nodes. Neither belongs under spinifex/network/'s -// ADR-0006 layer tree — this package is not part of that stack, and lives -// beside invariants for the same reason invariants does: it is read by both -// a go-test-only consumer and an e2e-tagged one, so it cannot itself carry -// a build tag or live under either caller. +// `ss -tulnp` on live nodes. Neither belongs under the executable network +// layer tree — this package is not part of that stack. It lives in the +// internal test kit because both a go-test-only consumer and an e2e-tagged +// consumer read it, so it cannot itself carry either caller's build tag. package listenerinventory diff --git a/spinifex/network/listenerinventory/table.go b/internal/testkit/listenerinventory/table.go similarity index 100% rename from spinifex/network/listenerinventory/table.go rename to internal/testkit/listenerinventory/table.go diff --git a/spinifex/network/listenerinventory/table_test.go b/internal/testkit/listenerinventory/table_test.go similarity index 98% rename from spinifex/network/listenerinventory/table_test.go rename to internal/testkit/listenerinventory/table_test.go index fd63d77ea..6f4d4d269 100644 --- a/spinifex/network/listenerinventory/table_test.go +++ b/internal/testkit/listenerinventory/table_test.go @@ -4,7 +4,7 @@ import ( "testing" networkconnections "github.com/mulgadc/spinifex/docs/security/network-connections" - "github.com/mulgadc/spinifex/spinifex/network/listenerinventory" + "github.com/mulgadc/spinifex/internal/testkit/listenerinventory" ) func TestParse_Synthetic(t *testing.T) { diff --git a/spinifex/network/invariants/host_containment_test.go b/spinifex/network/invariants/host_containment_test.go index e00a99fd2..e5bdb674d 100644 --- a/spinifex/network/invariants/host_containment_test.go +++ b/spinifex/network/invariants/host_containment_test.go @@ -33,7 +33,7 @@ func TestS2_BridgeModeContainedInL0(t *testing.T) { roots := []string{ filepath.Join(repoRoot(t), "spinifex", "network"), filepath.Join(repoRoot(t), "spinifex", "daemon"), - filepath.Join(repoRoot(t), "spinifex", "vm"), + filepath.Join(repoRoot(t), "spinifex", "runtime", "compute", "vm"), } type hit struct { file string diff --git a/spinifex/network/invariants/listener_bind_test.go b/spinifex/network/invariants/listener_bind_test.go index 12d9f6619..6ed303ea6 100644 --- a/spinifex/network/invariants/listener_bind_test.go +++ b/spinifex/network/invariants/listener_bind_test.go @@ -18,7 +18,7 @@ import ( "testing" networkconnections "github.com/mulgadc/spinifex/docs/security/network-connections" - "github.com/mulgadc/spinifex/spinifex/network/listenerinventory" + "github.com/mulgadc/spinifex/internal/testkit/listenerinventory" ) // TestListenerBindSitesMatchInventory is the static half of the listener diff --git a/spinifex/network/invariants/names_test.go b/spinifex/network/invariants/names_test.go index 29549c2b4..d742dd14c 100644 --- a/spinifex/network/invariants/names_test.go +++ b/spinifex/network/invariants/names_test.go @@ -249,7 +249,7 @@ func s4ScanRoots(t *testing.T) []string { filepath.Join(root, "spinifex", "vpcd"), filepath.Join(root, "spinifex", "daemon"), filepath.Join(root, "spinifex", "handlers"), - filepath.Join(root, "spinifex", "vm"), + filepath.Join(root, "spinifex", "runtime", "compute", "vm"), } } diff --git a/spinifex/network/invariants/nats_subjects_test.go b/spinifex/network/invariants/nats_subjects_test.go index 030cb5187..1f18c538d 100644 --- a/spinifex/network/invariants/nats_subjects_test.go +++ b/spinifex/network/invariants/nats_subjects_test.go @@ -35,7 +35,7 @@ func TestS7_NATSSubjectsCarryAZPrefix(t *testing.T) { filepath.Join(repoRoot(t), "spinifex", "vpcd"), filepath.Join(repoRoot(t), "spinifex", "daemon"), filepath.Join(repoRoot(t), "spinifex", "handlers"), - filepath.Join(repoRoot(t), "spinifex", "testutil"), + filepath.Join(repoRoot(t), "internal", "testkit"), filepath.Join(repoRoot(t), "spinifex", "utils"), } diff --git a/tests/e2e/multinode/listener_invariant_test.go b/tests/e2e/multinode/listener_invariant_test.go index 276a95272..0218570dd 100644 --- a/tests/e2e/multinode/listener_invariant_test.go +++ b/tests/e2e/multinode/listener_invariant_test.go @@ -12,7 +12,7 @@ import ( "time" networkconnections "github.com/mulgadc/spinifex/docs/security/network-connections" - "github.com/mulgadc/spinifex/spinifex/network/listenerinventory" + "github.com/mulgadc/spinifex/internal/testkit/listenerinventory" "github.com/mulgadc/spinifex/tests/e2e/harness" ) diff --git a/tests/e2e/multinode/listener_invariant_unit_test.go b/tests/e2e/multinode/listener_invariant_unit_test.go index 200fd6b93..57b35c084 100644 --- a/tests/e2e/multinode/listener_invariant_unit_test.go +++ b/tests/e2e/multinode/listener_invariant_unit_test.go @@ -5,7 +5,7 @@ package multinode import ( "testing" - "github.com/mulgadc/spinifex/spinifex/network/listenerinventory" + "github.com/mulgadc/spinifex/internal/testkit/listenerinventory" "github.com/mulgadc/spinifex/tests/e2e/harness" )