refactor: move listener inventory to test kit

This commit is contained in:
joshsiv-mulga
2026-09-29 14:56:39 +10:00
parent 56970d0796
commit d87326f644
9 changed files with 11 additions and 12 deletions
@@ -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
@@ -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) {
@@ -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
@@ -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
+1 -1
View File
@@ -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"),
}
}
@@ -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"),
}
@@ -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"
)
@@ -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"
)