diff --git a/Makefile b/Makefile index fdc68d624..4d599ae77 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ aws-model-coverage: generate-aws-model-coverage @go run ./cmd/aws-model-coverage # Segscan storage oracle: needs the mulga umbrella repo's scripts/segscan -# checked out alongside spinifex (see spinifex/testutil/segscanoracle), which +# checked out alongside spinifex (see internal/testkit/segscanoracle), which # is not the default local or CI layout, so this is a separate target from # test-integration rather than folded into it. Skips itself when segscan's # source isn't found. diff --git a/cmd/spinifex/cmd/admin_jsprobe_test.go b/cmd/spinifex/cmd/admin_jsprobe_test.go index b139c6600..101578924 100644 --- a/cmd/spinifex/cmd/admin_jsprobe_test.go +++ b/cmd/spinifex/cmd/admin_jsprobe_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/mulgadc/spinifex/spinifex/daemon" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" ) func newCanaryBucket(t *testing.T) (jetstream.KeyValue, jetstream.JetStream) { diff --git a/cmd/spinifex/cmd/admin_ochre_appliance_test.go b/cmd/spinifex/cmd/admin_ochre_appliance_test.go index a0e85930d..396bd10b7 100644 --- a/cmd/spinifex/cmd/admin_ochre_appliance_test.go +++ b/cmd/spinifex/cmd/admin_ochre_appliance_test.go @@ -9,7 +9,7 @@ import ( "errors" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/cmd/spinifex/cmd/admin_ochre_pull_test.go b/cmd/spinifex/cmd/admin_ochre_pull_test.go index 56be27b34..014aebeba 100644 --- a/cmd/spinifex/cmd/admin_ochre_pull_test.go +++ b/cmd/spinifex/cmd/admin_ochre_pull_test.go @@ -21,7 +21,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/gateway/bedrock/hfhub" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/spf13/cobra" diff --git a/cmd/spinifex/cmd/admin_ochre_test.go b/cmd/spinifex/cmd/admin_ochre_test.go index 04fb28e1f..1cbd64275 100644 --- a/cmd/spinifex/cmd/admin_ochre_test.go +++ b/cmd/spinifex/cmd/admin_ochre_test.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsmetadata" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/spf13/cobra" diff --git a/cmd/spinifex/cmd/cluster_test.go b/cmd/spinifex/cmd/cluster_test.go index ea085d5d2..878ec08a0 100644 --- a/cmd/spinifex/cmd/cluster_test.go +++ b/cmd/spinifex/cmd/cluster_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/cmd/spinifex/cmd/get_dhcp_leases_test.go b/cmd/spinifex/cmd/get_dhcp_leases_test.go index 387462e75..7db6d7ee6 100644 --- a/cmd/spinifex/cmd/get_dhcp_leases_test.go +++ b/cmd/spinifex/cmd/get_dhcp_leases_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/testutil/drainsocket.go b/internal/testkit/drainsocket.go similarity index 100% rename from spinifex/testutil/drainsocket.go rename to internal/testkit/drainsocket.go diff --git a/spinifex/testutil/ebsfake/ebsfake.go b/internal/testkit/ebsfake/ebsfake.go similarity index 100% rename from spinifex/testutil/ebsfake/ebsfake.go rename to internal/testkit/ebsfake/ebsfake.go diff --git a/spinifex/testutil/nats.go b/internal/testkit/nats.go similarity index 100% rename from spinifex/testutil/nats.go rename to internal/testkit/nats.go diff --git a/spinifex/testutil/pagedstore/pagedstore.go b/internal/testkit/pagedstore/pagedstore.go similarity index 100% rename from spinifex/testutil/pagedstore/pagedstore.go rename to internal/testkit/pagedstore/pagedstore.go diff --git a/spinifex/testutil/recordingstore/recordingstore.go b/internal/testkit/recordingstore/recordingstore.go similarity index 100% rename from spinifex/testutil/recordingstore/recordingstore.go rename to internal/testkit/recordingstore/recordingstore.go diff --git a/spinifex/testutil/segscanoracle/segscanoracle.go b/internal/testkit/segscanoracle/segscanoracle.go similarity index 97% rename from spinifex/testutil/segscanoracle/segscanoracle.go rename to internal/testkit/segscanoracle/segscanoracle.go index 2a47c0457..e937072e2 100644 --- a/spinifex/testutil/segscanoracle/segscanoracle.go +++ b/internal/testkit/segscanoracle/segscanoracle.go @@ -2,7 +2,7 @@ // umbrella repo's scripts/segscan against a copy of a real predastore node // data dir, reporting live / dead-tombstoned / dead-orphan bytes per the // on-disk .seg segments. It is the segscan-side counterpart to -// spinifex/testutil/vbscan (see that package's comment for the chunk/config +// internal/testkit/vbscan (see that package's comment for the chunk/config // oracle) — together they let integration tests assert real persisted // storage state instead of only "the handler did not error". // @@ -57,8 +57,8 @@ func Locate() (string, error) { if !ok { return "", errors.New("segscanoracle: could not resolve source location for module-relative lookup") } - // thisFile is /spinifex/testutil/segscanoracle/segscanoracle.go. - root := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(thisFile)))) + // thisFile is /internal/testkit/segscanoracle/segscanoracle.go. + root := filepath.Dir(filepath.Dir(filepath.Dir(thisFile))) return resolveSegscanDir(os.Getenv(segscanEnvVar), root) } diff --git a/spinifex/testutil/segscanoracle/segscanoracle_test.go b/internal/testkit/segscanoracle/segscanoracle_test.go similarity index 100% rename from spinifex/testutil/segscanoracle/segscanoracle_test.go rename to internal/testkit/segscanoracle/segscanoracle_test.go diff --git a/spinifex/testutil/tracing.go b/internal/testkit/tracing.go similarity index 100% rename from spinifex/testutil/tracing.go rename to internal/testkit/tracing.go diff --git a/spinifex/testutil/vbscan/vbscan.go b/internal/testkit/vbscan/vbscan.go similarity index 98% rename from spinifex/testutil/vbscan/vbscan.go rename to internal/testkit/vbscan/vbscan.go index 7c778d37f..0061d1a99 100644 --- a/spinifex/testutil/vbscan/vbscan.go +++ b/internal/testkit/vbscan/vbscan.go @@ -11,7 +11,7 @@ // This mirrors scripts/vbrefscan (in the mulga umbrella module) but is // reimplemented locally rather than imported: spinifex cannot depend on // mulga, the module that contains it, without a repo-level cycle. It is -// deliberately its own leaf package, not part of the shared spinifex/testutil +// deliberately its own leaf package, not part of the shared internal/testkit // package that ~80 test files import — see tests/fixtures/predastore's package // comment for why that matters (goleak poisoning via transitively-linked // long-lived goroutines). vbscan does not pull in a predastore cluster diff --git a/spinifex/testutil/vbscan/vbscan_test.go b/internal/testkit/vbscan/vbscan_test.go similarity index 100% rename from spinifex/testutil/vbscan/vbscan_test.go rename to internal/testkit/vbscan/vbscan_test.go diff --git a/scripts/diff-coverage.sh b/scripts/diff-coverage.sh index aa5dfaff2..5603b27ff 100755 --- a/scripts/diff-coverage.sh +++ b/scripts/diff-coverage.sh @@ -70,10 +70,10 @@ trap 'rm -rf "$TMPDIR"' EXIT # -C enables copy detection for the same reason (file split = partial copy). # cmd/installer/ui is excluded: interactive TUI rendering has no meaningful unit # test, and the installer is validated by the ISO hardware run instead. -# spinifex/testutil is excluded because it is fakes and harnesses used only from +# internal/testkit is excluded because it is fakes and harnesses used only from # _test.go files. Coverage is recorded per package under test, so a fake another # package's tests drive reads as zero-covered however hard it is exercised. -git diff "${BASE_REF}" HEAD --unified=0 -M -C --diff-filter=AM -- '*.go' ':!*_test.go' ':!spinifex/migrate/*' ':!cmd/installer/ui/*' ':!spinifex/testutil/*' | awk ' +git diff "${BASE_REF}" HEAD --unified=0 -M -C --diff-filter=AM -- '*.go' ':!*_test.go' ':!spinifex/migrate/*' ':!cmd/installer/ui/*' ':!internal/testkit/*' | awk ' /^\+\+\+ / { file = substr($2, 3) next diff --git a/spinifex/accountteardown/cluster_test.go b/spinifex/accountteardown/cluster_test.go index 397ba15b7..879206f56 100644 --- a/spinifex/accountteardown/cluster_test.go +++ b/spinifex/accountteardown/cluster_test.go @@ -7,7 +7,7 @@ import ( "testing" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/accountteardown/reapers_account_test.go b/spinifex/accountteardown/reapers_account_test.go index c83ddd98c..9f086650e 100644 --- a/spinifex/accountteardown/reapers_account_test.go +++ b/spinifex/accountteardown/reapers_account_test.go @@ -11,7 +11,7 @@ import ( handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/accountteardown/reapers_acm_test.go b/spinifex/accountteardown/reapers_acm_test.go index 7556b3dde..a3d6f401c 100644 --- a/spinifex/accountteardown/reapers_acm_test.go +++ b/spinifex/accountteardown/reapers_acm_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/acm" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_ec2_test.go b/spinifex/accountteardown/reapers_ec2_test.go index 5d5fe5cfb..14d10a5f5 100644 --- a/spinifex/accountteardown/reapers_ec2_test.go +++ b/spinifex/accountteardown/reapers_ec2_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_ecs_test.go b/spinifex/accountteardown/reapers_ecs_test.go index 12e345433..c3e8db3fd 100644 --- a/spinifex/accountteardown/reapers_ecs_test.go +++ b/spinifex/accountteardown/reapers_ecs_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" handlers_ecs "github.com/mulgadc/spinifex/spinifex/handlers/ecs" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_eks_test.go b/spinifex/accountteardown/reapers_eks_test.go index cb368509e..9b2e66526 100644 --- a/spinifex/accountteardown/reapers_eks_test.go +++ b/spinifex/accountteardown/reapers_eks_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/accountteardown/reapers_iam_test.go b/spinifex/accountteardown/reapers_iam_test.go index 71e251eb6..7863fbd94 100644 --- a/spinifex/accountteardown/reapers_iam_test.go +++ b/spinifex/accountteardown/reapers_iam_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/accountteardown/reapers_rds_test.go b/spinifex/accountteardown/reapers_rds_test.go index ca4567164..07ee42fcd 100644 --- a/spinifex/accountteardown/reapers_rds_test.go +++ b/spinifex/accountteardown/reapers_rds_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/cluster_ready_test.go b/spinifex/daemon/cluster_ready_test.go index 4bf28d932..f34f2c4db 100644 --- a/spinifex/daemon/cluster_ready_test.go +++ b/spinifex/daemon/cluster_ready_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/daemon/daemon_handlers_eks_test.go b/spinifex/daemon/daemon_handlers_eks_test.go index e84c99a47..73c98a36c 100644 --- a/spinifex/daemon/daemon_handlers_eks_test.go +++ b/spinifex/daemon/daemon_handlers_eks_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_handlers_test.go b/spinifex/daemon/daemon_handlers_test.go index 3f8c97810..e5abcb958 100644 --- a/spinifex/daemon/daemon_handlers_test.go +++ b/spinifex/daemon/daemon_handlers_test.go @@ -35,8 +35,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" - "github.com/mulgadc/spinifex/spinifex/testutil" - "github.com/mulgadc/spinifex/spinifex/testutil/ebsfake" + "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/internal/testkit/ebsfake" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" diff --git a/spinifex/daemon/daemon_handlers_volume_test.go b/spinifex/daemon/daemon_handlers_volume_test.go index f9f7363f0..09775c421 100644 --- a/spinifex/daemon/daemon_handlers_volume_test.go +++ b/spinifex/daemon/daemon_handlers_volume_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" diff --git a/spinifex/daemon/daemon_handlers_vpc_test.go b/spinifex/daemon/daemon_handlers_vpc_test.go index 73e9be294..0b02d8dae 100644 --- a/spinifex/daemon/daemon_handlers_vpc_test.go +++ b/spinifex/daemon/daemon_handlers_vpc_test.go @@ -12,7 +12,7 @@ import ( handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_system_instance_test.go b/spinifex/daemon/daemon_system_instance_test.go index 26d5fa118..bc97aad6e 100644 --- a/spinifex/daemon/daemon_system_instance_test.go +++ b/spinifex/daemon/daemon_system_instance_test.go @@ -20,7 +20,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_wire_lb_test.go b/spinifex/daemon/daemon_wire_lb_test.go index e557b8bdd..9d588433e 100644 --- a/spinifex/daemon/daemon_wire_lb_test.go +++ b/spinifex/daemon/daemon_wire_lb_test.go @@ -8,7 +8,7 @@ import ( handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/dns_reconcile_ec2_test.go b/spinifex/daemon/dns_reconcile_ec2_test.go index 12c41055e..6b26e4935 100644 --- a/spinifex/daemon/dns_reconcile_ec2_test.go +++ b/spinifex/daemon/dns_reconcile_ec2_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/dns_reconcile_test.go b/spinifex/daemon/dns_reconcile_test.go index 207f3590f..c8292440c 100644 --- a/spinifex/daemon/dns_reconcile_test.go +++ b/spinifex/daemon/dns_reconcile_test.go @@ -13,7 +13,7 @@ import ( handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/daemon/eni_orphan_reaper_test.go b/spinifex/daemon/eni_orphan_reaper_test.go index 46d855a9a..8e536cc03 100644 --- a/spinifex/daemon/eni_orphan_reaper_test.go +++ b/spinifex/daemon/eni_orphan_reaper_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/instance_record_repair_test.go b/spinifex/daemon/instance_record_repair_test.go index 7c54c13b6..d1e801522 100644 --- a/spinifex/daemon/instance_record_repair_test.go +++ b/spinifex/daemon/instance_record_repair_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/instance_records_rekey_test.go b/spinifex/daemon/instance_records_rekey_test.go index fa9a3f1f7..dd00a3275 100644 --- a/spinifex/daemon/instance_records_rekey_test.go +++ b/spinifex/daemon/instance_records_rekey_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/instance_records_test.go b/spinifex/daemon/instance_records_test.go index 3af5ba33c..9c2dfd847 100644 --- a/spinifex/daemon/instance_records_test.go +++ b/spinifex/daemon/instance_records_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/instance_records_transition_test.go b/spinifex/daemon/instance_records_transition_test.go index c3e97d1ba..fed836686 100644 --- a/spinifex/daemon/instance_records_transition_test.go +++ b/spinifex/daemon/instance_records_transition_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/instance_running_set_test.go b/spinifex/daemon/instance_running_set_test.go index 41d1df95f..3a0e342e5 100644 --- a/spinifex/daemon/instance_running_set_test.go +++ b/spinifex/daemon/instance_running_set_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/daemon" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/daemon/jetstream_test.go b/spinifex/daemon/jetstream_test.go index 93bdd2ac2..82c607557 100644 --- a/spinifex/daemon/jetstream_test.go +++ b/spinifex/daemon/jetstream_test.go @@ -3,7 +3,7 @@ package daemon import ( "encoding/json" "errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "sync" "testing" "time" diff --git a/spinifex/daemon/nats_classification_test.go b/spinifex/daemon/nats_classification_test.go index 85f5d87a8..14c5d4ad8 100644 --- a/spinifex/daemon/nats_classification_test.go +++ b/spinifex/daemon/nats_classification_test.go @@ -14,7 +14,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/ochre_deps_test.go b/spinifex/daemon/ochre_deps_test.go index 7884373df..c9bb03051 100644 --- a/spinifex/daemon/ochre_deps_test.go +++ b/spinifex/daemon/ochre_deps_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/daemon/state_test.go b/spinifex/daemon/state_test.go index f4d86c623..72b949cec 100644 --- a/spinifex/daemon/state_test.go +++ b/spinifex/daemon/state_test.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/vm_adapters_test.go b/spinifex/daemon/vm_adapters_test.go index 70dc435a9..7ac2bba24 100644 --- a/spinifex/daemon/vm_adapters_test.go +++ b/spinifex/daemon/vm_adapters_test.go @@ -14,7 +14,7 @@ import ( handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" diff --git a/spinifex/daemon/vpc_adapter_test.go b/spinifex/daemon/vpc_adapter_test.go index 8dfaa704a..0bc0b923f 100644 --- a/spinifex/daemon/vpc_adapter_test.go +++ b/spinifex/daemon/vpc_adapter_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/conformance/bench_test.go b/spinifex/ebsprovider/conformance/bench_test.go index f6e64356b..f7f950724 100644 --- a/spinifex/ebsprovider/conformance/bench_test.go +++ b/spinifex/ebsprovider/conformance/bench_test.go @@ -6,7 +6,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" ) // BenchmarkNullProvider_InProcess prices the contract with no transport and no diff --git a/spinifex/ebsprovider/conformance/conformance_test.go b/spinifex/ebsprovider/conformance/conformance_test.go index 9346e85c7..4748c50ed 100644 --- a/spinifex/ebsprovider/conformance/conformance_test.go +++ b/spinifex/ebsprovider/conformance/conformance_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/nats_test.go b/spinifex/ebsprovider/nats_test.go index 326297229..aa7d89f63 100644 --- a/spinifex/ebsprovider/nats_test.go +++ b/spinifex/ebsprovider/nats_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsprovider/natsserve/handlers_test.go b/spinifex/ebsprovider/natsserve/handlers_test.go index d3571e351..924cd621f 100644 --- a/spinifex/ebsprovider/natsserve/handlers_test.go +++ b/spinifex/ebsprovider/natsserve/handlers_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsprovider/natsserve/server_test.go b/spinifex/ebsprovider/natsserve/server_test.go index f90ccec18..4fa47c232 100644 --- a/spinifex/ebsprovider/natsserve/server_test.go +++ b/spinifex/ebsprovider/natsserve/server_test.go @@ -6,7 +6,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" diff --git a/spinifex/ebsprovider/nullprovider/nullprovider_test.go b/spinifex/ebsprovider/nullprovider/nullprovider_test.go index 541a8d25b..1ecf73690 100644 --- a/spinifex/ebsprovider/nullprovider/nullprovider_test.go +++ b/spinifex/ebsprovider/nullprovider/nullprovider_test.go @@ -6,7 +6,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/telemetry_test.go b/spinifex/ebsprovider/telemetry_test.go index 2e4b583ed..242afa2e1 100644 --- a/spinifex/ebsprovider/telemetry_test.go +++ b/spinifex/ebsprovider/telemetry_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/foundation/lifecycle/idempotency/store_test.go b/spinifex/foundation/lifecycle/idempotency/store_test.go index 3f835ab47..144c3b261 100644 --- a/spinifex/foundation/lifecycle/idempotency/store_test.go +++ b/spinifex/foundation/lifecycle/idempotency/store_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/foundation/lifecycle/idempotency/wait_test.go b/spinifex/foundation/lifecycle/idempotency/wait_test.go index bca5bf1b0..db48cd95e 100644 --- a/spinifex/foundation/lifecycle/idempotency/wait_test.go +++ b/spinifex/foundation/lifecycle/idempotency/wait_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/acm/certificates_test.go b/spinifex/gateway/acm/certificates_test.go index 3331aa0bb..b9d659049 100644 --- a/spinifex/gateway/acm/certificates_test.go +++ b/spinifex/gateway/acm/certificates_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/admin_accountquota_test.go b/spinifex/gateway/admin_accountquota_test.go index 33fb489de..8c5e2b5ef 100644 --- a/spinifex/gateway/admin_accountquota_test.go +++ b/spinifex/gateway/admin_accountquota_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/admin_createaccount_test.go b/spinifex/gateway/admin_createaccount_test.go index f942d0ee9..db61a9cc3 100644 --- a/spinifex/gateway/admin_createaccount_test.go +++ b/spinifex/gateway/admin_createaccount_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/admin_deleteaccount_job_test.go b/spinifex/gateway/admin_deleteaccount_job_test.go index 901ffb9da..e3088e1c8 100644 --- a/spinifex/gateway/admin_deleteaccount_job_test.go +++ b/spinifex/gateway/admin_deleteaccount_job_test.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/auth_test.go b/spinifex/gateway/auth_test.go index 99dda8565..2b35c1e8a 100644 --- a/spinifex/gateway/auth_test.go +++ b/spinifex/gateway/auth_test.go @@ -26,7 +26,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/bedrock/access_test.go b/spinifex/gateway/bedrock/access_test.go index e1c5884b0..f45654c21 100644 --- a/spinifex/gateway/bedrock/access_test.go +++ b/spinifex/gateway/bedrock/access_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/bedrock/credentials_test.go b/spinifex/gateway/bedrock/credentials_test.go index 489620339..3714419f8 100644 --- a/spinifex/gateway/bedrock/credentials_test.go +++ b/spinifex/gateway/bedrock/credentials_test.go @@ -6,7 +6,7 @@ import ( "testing" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/guardrail_test.go b/spinifex/gateway/bedrock/guardrail_test.go index 853384bf3..5fffdc0e3 100644 --- a/spinifex/gateway/bedrock/guardrail_test.go +++ b/spinifex/gateway/bedrock/guardrail_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/logging_test.go b/spinifex/gateway/bedrock/logging_test.go index 10f65970c..7b02c62bc 100644 --- a/spinifex/gateway/bedrock/logging_test.go +++ b/spinifex/gateway/bedrock/logging_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/bedrock/prices_test.go b/spinifex/gateway/bedrock/prices_test.go index 4105583aa..cfd28b2a5 100644 --- a/spinifex/gateway/bedrock/prices_test.go +++ b/spinifex/gateway/bedrock/prices_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/provisioned_test.go b/spinifex/gateway/bedrock/provisioned_test.go index c1f6fd0a9..ef8017766 100644 --- a/spinifex/gateway/bedrock/provisioned_test.go +++ b/spinifex/gateway/bedrock/provisioned_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/usage_test.go b/spinifex/gateway/bedrock/usage_test.go index bbddcc338..70e3ebc65 100644 --- a/spinifex/gateway/bedrock/usage_test.go +++ b/spinifex/gateway/bedrock/usage_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock/weights_test.go b/spinifex/gateway/bedrock/weights_test.go index 3317db98d..fd9b7402c 100644 --- a/spinifex/gateway/bedrock/weights_test.go +++ b/spinifex/gateway/bedrock/weights_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrock_request_test.go b/spinifex/gateway/bedrock_request_test.go index 81b7041fb..e1b623432 100644 --- a/spinifex/gateway/bedrock_request_test.go +++ b/spinifex/gateway/bedrock_request_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/bedrockruntime" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrockagent_request_test.go b/spinifex/gateway/bedrockagent_request_test.go index 1c6095f0c..a38caff7d 100644 --- a/spinifex/gateway/bedrockagent_request_test.go +++ b/spinifex/gateway/bedrockagent_request_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/service/bedrockagent" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/bedrockagent_test.go b/spinifex/gateway/bedrockagent_test.go index c103d6b32..afc8318da 100644 --- a/spinifex/gateway/bedrockagent_test.go +++ b/spinifex/gateway/bedrockagent_test.go @@ -19,7 +19,7 @@ import ( "github.com/aws/aws-sdk-go/service/bedrockagent" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/bedrockagentruntime_request_test.go b/spinifex/gateway/bedrockagentruntime_request_test.go index 5e4d3f99d..e47c4fc63 100644 --- a/spinifex/gateway/bedrockagentruntime_request_test.go +++ b/spinifex/gateway/bedrockagentruntime_request_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/service/bedrockagentruntime" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/discover_nodes_test.go b/spinifex/gateway/discover_nodes_test.go index 141735f10..e8eb5237a 100644 --- a/spinifex/gateway/discover_nodes_test.go +++ b/spinifex/gateway/discover_nodes_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/gateway" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" ) diff --git a/spinifex/gateway/ec2/capacityreservation/capacityreservation_test.go b/spinifex/gateway/ec2/capacityreservation/capacityreservation_test.go index fefd75962..956cd7609 100644 --- a/spinifex/gateway/ec2/capacityreservation/capacityreservation_test.go +++ b/spinifex/gateway/ec2/capacityreservation/capacityreservation_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/gateway/ec2/capacityreservation/fanout_test.go b/spinifex/gateway/ec2/capacityreservation/fanout_test.go index 55bb05bfa..9a72f4082 100644 --- a/spinifex/gateway/ec2/capacityreservation/fanout_test.go +++ b/spinifex/gateway/ec2/capacityreservation/fanout_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/ec2/instance/clienttoken_test.go b/spinifex/gateway/ec2/instance/clienttoken_test.go index 2e45ddb57..b3380813d 100644 --- a/spinifex/gateway/ec2/instance/clienttoken_test.go +++ b/spinifex/gateway/ec2/instance/clienttoken_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ec2/instance/helpers_test.go b/spinifex/gateway/ec2/instance/helpers_test.go index 550a6298b..ccc2ce0ba 100644 --- a/spinifex/gateway/ec2/instance/helpers_test.go +++ b/spinifex/gateway/ec2/instance/helpers_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" diff --git a/spinifex/gateway/ec2/spotinstance/lineage_test.go b/spinifex/gateway/ec2/spotinstance/lineage_test.go index 01aff150f..0b2ad14af 100644 --- a/spinifex/gateway/ec2/spotinstance/lineage_test.go +++ b/spinifex/gateway/ec2/spotinstance/lineage_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/gateway/ec2/spotinstance/quota_gate_order_test.go b/spinifex/gateway/ec2/spotinstance/quota_gate_order_test.go index 7fdeb6257..33ec8eca7 100644 --- a/spinifex/gateway/ec2/spotinstance/quota_gate_order_test.go +++ b/spinifex/gateway/ec2/spotinstance/quota_gate_order_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/ec2/volume/DetachVolume_test.go b/spinifex/gateway/ec2/volume/DetachVolume_test.go index ad5d2cc8d..e2dde7351 100644 --- a/spinifex/gateway/ec2/volume/DetachVolume_test.go +++ b/spinifex/gateway/ec2/volume/DetachVolume_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ec2/vpc/network_interface_hotplug_test.go b/spinifex/gateway/ec2/vpc/network_interface_hotplug_test.go index 49aa571f1..db6543425 100644 --- a/spinifex/gateway/ec2/vpc/network_interface_hotplug_test.go +++ b/spinifex/gateway/ec2/vpc/network_interface_hotplug_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/gateway/ec2_idempotency_test.go b/spinifex/gateway/ec2_idempotency_test.go index b4e3c26ee..e55114847 100644 --- a/spinifex/gateway/ec2_idempotency_test.go +++ b/spinifex/gateway/ec2_idempotency_test.go @@ -19,7 +19,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr/registry_image_test.go b/spinifex/gateway/ecr/registry_image_test.go index f388c2429..3ccab5e9c 100644 --- a/spinifex/gateway/ecr/registry_image_test.go +++ b/spinifex/gateway/ecr/registry_image_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr_createdeleterepository_test.go b/spinifex/gateway/ecr_createdeleterepository_test.go index 4313c1544..50441f647 100644 --- a/spinifex/gateway/ecr_createdeleterepository_test.go +++ b/spinifex/gateway/ecr_createdeleterepository_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecr_describerepositories_test.go b/spinifex/gateway/ecr_describerepositories_test.go index 0b0a5fd53..2f445ebe2 100644 --- a/spinifex/gateway/ecr_describerepositories_test.go +++ b/spinifex/gateway/ecr_describerepositories_test.go @@ -10,7 +10,7 @@ import ( "time" handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/ecrapi/lifecyclepolicy_test.go b/spinifex/gateway/ecrapi/lifecyclepolicy_test.go index 9fa59d249..0a9600f7f 100644 --- a/spinifex/gateway/ecrapi/lifecyclepolicy_test.go +++ b/spinifex/gateway/ecrapi/lifecyclepolicy_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecrapi/repositorypolicy_test.go b/spinifex/gateway/ecrapi/repositorypolicy_test.go index 965f27369..cae102466 100644 --- a/spinifex/gateway/ecrapi/repositorypolicy_test.go +++ b/spinifex/gateway/ecrapi/repositorypolicy_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/ecrauth/ecrauth_test.go b/spinifex/gateway/ecrauth/ecrauth_test.go index 3504dcee5..14be496e9 100644 --- a/spinifex/gateway/ecrauth/ecrauth_test.go +++ b/spinifex/gateway/ecrauth/ecrauth_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecrauth/rotator_test.go b/spinifex/gateway/ecrauth/rotator_test.go index 2a9907d80..559613b84 100644 --- a/spinifex/gateway/ecrauth/rotator_test.go +++ b/spinifex/gateway/ecrauth/rotator_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecrauth_middleware_test.go b/spinifex/gateway/ecrauth_middleware_test.go index 8a6f9d965..b1be10e5a 100644 --- a/spinifex/gateway/ecrauth_middleware_test.go +++ b/spinifex/gateway/ecrauth_middleware_test.go @@ -9,7 +9,7 @@ import ( "testing" gateway_ecrauth "github.com/mulgadc/spinifex/spinifex/gateway/ecrauth" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecs/clienttoken_test.go b/spinifex/gateway/ecs/clienttoken_test.go index a0ba8c1bf..86616b75a 100644 --- a/spinifex/gateway/ecs/clienttoken_test.go +++ b/spinifex/gateway/ecs/clienttoken_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/ecs" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/eks/internal_authz_test.go b/spinifex/gateway/eks/internal_authz_test.go index 30c8bd4d0..d0085c301 100644 --- a/spinifex/gateway/eks/internal_authz_test.go +++ b/spinifex/gateway/eks/internal_authz_test.go @@ -6,7 +6,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_eks "github.com/mulgadc/spinifex/spinifex/gateway/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/gateway/eks/internal_publish_test.go b/spinifex/gateway/eks/internal_publish_test.go index 0fe717d99..d6fc6a0dc 100644 --- a/spinifex/gateway/eks/internal_publish_test.go +++ b/spinifex/gateway/eks/internal_publish_test.go @@ -6,7 +6,7 @@ import ( "time" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/eks/token_review_test.go b/spinifex/gateway/eks/token_review_test.go index e2d52f343..affc3225c 100644 --- a/spinifex/gateway/eks/token_review_test.go +++ b/spinifex/gateway/eks/token_review_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/eks/wrappers_test.go b/spinifex/gateway/eks/wrappers_test.go index 42ab181c8..5af2a8643 100644 --- a/spinifex/gateway/eks/wrappers_test.go +++ b/spinifex/gateway/eks/wrappers_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/eks_authz_test.go b/spinifex/gateway/eks_authz_test.go index 0227e48ba..98f0ea3bb 100644 --- a/spinifex/gateway/eks_authz_test.go +++ b/spinifex/gateway/eks_authz_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_eks "github.com/mulgadc/spinifex/spinifex/gateway/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/elbv2/dispatch_test.go b/spinifex/gateway/elbv2/dispatch_test.go index dc97171ff..fccaa8eba 100644 --- a/spinifex/gateway/elbv2/dispatch_test.go +++ b/spinifex/gateway/elbv2/dispatch_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_elbv2 "github.com/mulgadc/spinifex/spinifex/gateway/elbv2" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/elbv2/listener_certs_test.go b/spinifex/gateway/elbv2/listener_certs_test.go index 186872d04..5703c1a3a 100644 --- a/spinifex/gateway/elbv2/listener_certs_test.go +++ b/spinifex/gateway/elbv2/listener_certs_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/gateway_test.go b/spinifex/gateway/gateway_test.go index 3d73a4a72..b1e746335 100644 --- a/spinifex/gateway/gateway_test.go +++ b/spinifex/gateway/gateway_test.go @@ -20,7 +20,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/ratelimit" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/oidc_discovery_test.go b/spinifex/gateway/oidc_discovery_test.go index b3672baf7..a86a23cac 100644 --- a/spinifex/gateway/oidc_discovery_test.go +++ b/spinifex/gateway/oidc_discovery_test.go @@ -7,7 +7,7 @@ import ( "testing" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" ) const ( diff --git a/spinifex/gateway/ratelimit_test.go b/spinifex/gateway/ratelimit_test.go index 4e1888bf3..eabe0c0d4 100644 --- a/spinifex/gateway/ratelimit_test.go +++ b/spinifex/gateway/ratelimit_test.go @@ -14,7 +14,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/rds/agent_test.go b/spinifex/gateway/rds/agent_test.go index 7d7b24bd3..54b93a6fd 100644 --- a/spinifex/gateway/rds/agent_test.go +++ b/spinifex/gateway/rds/agent_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/rds/enginecatalog_test.go b/spinifex/gateway/rds/enginecatalog_test.go index 70b92093f..11738190f 100644 --- a/spinifex/gateway/rds/enginecatalog_test.go +++ b/spinifex/gateway/rds/enginecatalog_test.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/rds/handler_test.go b/spinifex/gateway/rds/handler_test.go index 82d1e03e1..4ff0bac2c 100644 --- a/spinifex/gateway/rds/handler_test.go +++ b/spinifex/gateway/rds/handler_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/rds_test.go b/spinifex/gateway/rds_test.go index b7a0c005e..72692864b 100644 --- a/spinifex/gateway/rds_test.go +++ b/spinifex/gateway/rds_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/spinifex_modelaccess_test.go b/spinifex/gateway/spinifex_modelaccess_test.go index 7132108d1..2b561e06c 100644 --- a/spinifex/gateway/spinifex_modelaccess_test.go +++ b/spinifex/gateway/spinifex_modelaccess_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/spx/spx_test.go b/spinifex/gateway/spx/spx_test.go index d65ee857e..46bff7dc3 100644 --- a/spinifex/gateway/spx/spx_test.go +++ b/spinifex/gateway/spx/spx_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/acm/service_impl_test.go b/spinifex/handlers/acm/service_impl_test.go index 2e5ee91a8..6ad3a5ab5 100644 --- a/spinifex/handlers/acm/service_impl_test.go +++ b/spinifex/handlers/acm/service_impl_test.go @@ -23,7 +23,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/acm/store_test.go b/spinifex/handlers/acm/store_test.go index 767e7d798..378e40563 100644 --- a/spinifex/handlers/acm/store_test.go +++ b/spinifex/handlers/acm/store_test.go @@ -8,7 +8,7 @@ import ( "time" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/bedrock/reaper_test.go b/spinifex/handlers/bedrock/reaper_test.go index 7d39f73a1..3cf42cfcf 100644 --- a/spinifex/handlers/bedrock/reaper_test.go +++ b/spinifex/handlers/bedrock/reaper_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/bedrock/service_nats_test.go b/spinifex/handlers/bedrock/service_nats_test.go index b821a2c9c..dbae643e7 100644 --- a/spinifex/handlers/bedrock/service_nats_test.go +++ b/spinifex/handlers/bedrock/service_nats_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/bedrock/service_test.go b/spinifex/handlers/bedrock/service_test.go index 9399295e7..bc135f218 100644 --- a/spinifex/handlers/bedrock/service_test.go +++ b/spinifex/handlers/bedrock/service_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/bedrock/store_test.go b/spinifex/handlers/bedrock/store_test.go index bb0849571..95a0e7aca 100644 --- a/spinifex/handlers/bedrock/store_test.go +++ b/spinifex/handlers/bedrock/store_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/dns/reconcile_election_test.go b/spinifex/handlers/dns/reconcile_election_test.go index 5fa483658..1f7a7b757 100644 --- a/spinifex/handlers/dns/reconcile_election_test.go +++ b/spinifex/handlers/dns/reconcile_election_test.go @@ -7,7 +7,7 @@ import ( "testing" reconcilelock "github.com/mulgadc/spinifex/spinifex/network/reconcile" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/dns/reconcile_test.go b/spinifex/handlers/dns/reconcile_test.go index a4a067c6f..ee0129d7d 100644 --- a/spinifex/handlers/dns/reconcile_test.go +++ b/spinifex/handlers/dns/reconcile_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/kvstore" reconcilelock "github.com/mulgadc/spinifex/spinifex/network/reconcile" "github.com/mulgadc/spinifex/spinifex/reconciler" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/account/service_impl_test.go b/spinifex/handlers/ec2/account/service_impl_test.go index aa85911ec..736394d3e 100644 --- a/spinifex/handlers/ec2/account/service_impl_test.go +++ b/spinifex/handlers/ec2/account/service_impl_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/eigw/service_impl_test.go b/spinifex/handlers/ec2/eigw/service_impl_test.go index def1cac6b..76b48420f 100644 --- a/spinifex/handlers/ec2/eigw/service_impl_test.go +++ b/spinifex/handlers/ec2/eigw/service_impl_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/eip/service_impl_test.go b/spinifex/handlers/ec2/eip/service_impl_test.go index 4158f43b0..87ea427fb 100644 --- a/spinifex/handlers/ec2/eip/service_impl_test.go +++ b/spinifex/handlers/ec2/eip/service_impl_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/igw/service_impl_test.go b/spinifex/handlers/ec2/igw/service_impl_test.go index 059dba9ed..34de1a585 100644 --- a/spinifex/handlers/ec2/igw/service_impl_test.go +++ b/spinifex/handlers/ec2/igw/service_impl_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/image/describe_byid_test.go b/spinifex/handlers/ec2/image/describe_byid_test.go index 049f7e921..7be7db1a7 100644 --- a/spinifex/handlers/ec2/image/describe_byid_test.go +++ b/spinifex/handlers/ec2/image/describe_byid_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsmetadata" handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/recordingstore" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/drain_test.go b/spinifex/handlers/ec2/image/drain_test.go index 6b66608fc..fcd10dfae 100644 --- a/spinifex/handlers/ec2/image/drain_test.go +++ b/spinifex/handlers/ec2/image/drain_test.go @@ -12,7 +12,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/image/service_impl_test.go b/spinifex/handlers/ec2/image/service_impl_test.go index 5f494b506..ce3b1b6a3 100644 --- a/spinifex/handlers/ec2/image/service_impl_test.go +++ b/spinifex/handlers/ec2/image/service_impl_test.go @@ -17,7 +17,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/recordingstore" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/service_nats_test.go b/spinifex/handlers/ec2/image/service_nats_test.go index 41a4d0749..589917edd 100644 --- a/spinifex/handlers/ec2/image/service_nats_test.go +++ b/spinifex/handlers/ec2/image/service_nats_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/instance/service_impl_test.go b/spinifex/handlers/ec2/instance/service_impl_test.go index 2670b9654..f6b27871e 100644 --- a/spinifex/handlers/ec2/instance/service_impl_test.go +++ b/spinifex/handlers/ec2/instance/service_impl_test.go @@ -20,7 +20,7 @@ import ( handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" spxtypes "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" diff --git a/spinifex/handlers/ec2/instance/service_nats_test.go b/spinifex/handlers/ec2/instance/service_nats_test.go index 7b092e4f6..04dac3679 100644 --- a/spinifex/handlers/ec2/instance/service_nats_test.go +++ b/spinifex/handlers/ec2/instance/service_nats_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/launchtemplate/service_impl_test.go b/spinifex/handlers/ec2/launchtemplate/service_impl_test.go index e730d5e2e..adc203c3c 100644 --- a/spinifex/handlers/ec2/launchtemplate/service_impl_test.go +++ b/spinifex/handlers/ec2/launchtemplate/service_impl_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/natgw/service_impl_test.go b/spinifex/handlers/ec2/natgw/service_impl_test.go index 6d3a2a6dc..abd0f1bfc 100644 --- a/spinifex/handlers/ec2/natgw/service_impl_test.go +++ b/spinifex/handlers/ec2/natgw/service_impl_test.go @@ -10,7 +10,7 @@ import ( awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/placementgroup/service_impl_test.go b/spinifex/handlers/ec2/placementgroup/service_impl_test.go index 09e74f6da..c686c1bb3 100644 --- a/spinifex/handlers/ec2/placementgroup/service_impl_test.go +++ b/spinifex/handlers/ec2/placementgroup/service_impl_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/routetable/service_impl_test.go b/spinifex/handlers/ec2/routetable/service_impl_test.go index 997d1e0e3..7dfd29cb2 100644 --- a/spinifex/handlers/ec2/routetable/service_impl_test.go +++ b/spinifex/handlers/ec2/routetable/service_impl_test.go @@ -12,7 +12,7 @@ import ( handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_natgw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/natgw" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go index 39a9f6867..e96c2dbd9 100644 --- a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go +++ b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsmetadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" - "github.com/mulgadc/spinifex/spinifex/testutil/pagedstore" + "github.com/mulgadc/spinifex/internal/testkit/pagedstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/snapshot/describe_byid_test.go b/spinifex/handlers/ec2/snapshot/describe_byid_test.go index 6918d7d28..814a553d8 100644 --- a/spinifex/handlers/ec2/snapshot/describe_byid_test.go +++ b/spinifex/handlers/ec2/snapshot/describe_byid_test.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsmetadata" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/recordingstore" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/snapshot/drain_test.go b/spinifex/handlers/ec2/snapshot/drain_test.go index c52439917..aad3e814c 100644 --- a/spinifex/handlers/ec2/snapshot/drain_test.go +++ b/spinifex/handlers/ec2/snapshot/drain_test.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/snapshot/service_impl_test.go b/spinifex/handlers/ec2/snapshot/service_impl_test.go index 8bb80d5de..478c8edac 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl_test.go +++ b/spinifex/handlers/ec2/snapshot/service_impl_test.go @@ -19,7 +19,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go index ca0a50d7a..6b949c0b7 100644 --- a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go +++ b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsmetadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/recordingstore" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/spotinstance/service_impl_test.go b/spinifex/handlers/ec2/spotinstance/service_impl_test.go index 4acb0dc1f..5b9bd5dcb 100644 --- a/spinifex/handlers/ec2/spotinstance/service_impl_test.go +++ b/spinifex/handlers/ec2/spotinstance/service_impl_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/tags/service_impl_test.go b/spinifex/handlers/ec2/tags/service_impl_test.go index 5f47a0903..ec8346c93 100644 --- a/spinifex/handlers/ec2/tags/service_impl_test.go +++ b/spinifex/handlers/ec2/tags/service_impl_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/service_impl_test.go b/spinifex/handlers/ec2/volume/service_impl_test.go index 0bff388f4..2bc1d8b1c 100644 --- a/spinifex/handlers/ec2/volume/service_impl_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_test.go @@ -18,8 +18,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" - "github.com/mulgadc/spinifex/spinifex/testutil/ebsfake" + "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/internal/testkit/ebsfake" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/testhelpers_test.go b/spinifex/handlers/ec2/volume/testhelpers_test.go index ba5fc9014..ee5f49956 100644 --- a/spinifex/handlers/ec2/volume/testhelpers_test.go +++ b/spinifex/handlers/ec2/volume/testhelpers_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/volume/volume_partition_test.go b/spinifex/handlers/ec2/volume/volume_partition_test.go index 3c8c2ba74..9b67d3976 100644 --- a/spinifex/handlers/ec2/volume/volume_partition_test.go +++ b/spinifex/handlers/ec2/volume/volume_partition_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" - "github.com/mulgadc/spinifex/spinifex/testutil/recordingstore" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/vpc/default_vpc_test.go b/spinifex/handlers/ec2/vpc/default_vpc_test.go index c698f4d0d..ebf70d29b 100644 --- a/spinifex/handlers/ec2/vpc/default_vpc_test.go +++ b/spinifex/handlers/ec2/vpc/default_vpc_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/handlers/ec2/vpc/eni_test.go b/spinifex/handlers/ec2/vpc/eni_test.go index 2023159f8..5a7c7837a 100644 --- a/spinifex/handlers/ec2/vpc/eni_test.go +++ b/spinifex/handlers/ec2/vpc/eni_test.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/vpc/external_ipam_test.go b/spinifex/handlers/ec2/vpc/external_ipam_test.go index fd40579e1..c16cedc87 100644 --- a/spinifex/handlers/ec2/vpc/external_ipam_test.go +++ b/spinifex/handlers/ec2/vpc/external_ipam_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/vpc/ipam_test.go b/spinifex/handlers/ec2/vpc/ipam_test.go index e51865133..20010d848 100644 --- a/spinifex/handlers/ec2/vpc/ipam_test.go +++ b/spinifex/handlers/ec2/vpc/ipam_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/vpc/security_group_test.go b/spinifex/handlers/ec2/vpc/security_group_test.go index 52456eb9a..d43117633 100644 --- a/spinifex/handlers/ec2/vpc/security_group_test.go +++ b/spinifex/handlers/ec2/vpc/security_group_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/vpc/service_impl_test.go b/spinifex/handlers/ec2/vpc/service_impl_test.go index 26f81fa53..e8630994d 100644 --- a/spinifex/handlers/ec2/vpc/service_impl_test.go +++ b/spinifex/handlers/ec2/vpc/service_impl_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ecr/meta_kv_test.go b/spinifex/handlers/ecr/meta_kv_test.go index 701f7f264..2c791355e 100644 --- a/spinifex/handlers/ecr/meta_kv_test.go +++ b/spinifex/handlers/ecr/meta_kv_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ecr/service_test.go b/spinifex/handlers/ecr/service_test.go index 889292389..abd141f3b 100644 --- a/spinifex/handlers/ecr/service_test.go +++ b/spinifex/handlers/ecr/service_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ecs/eni_test.go b/spinifex/handlers/ecs/eni_test.go index d1f25ed21..b05dce57a 100644 --- a/spinifex/handlers/ecs/eni_test.go +++ b/spinifex/handlers/ecs/eni_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ecs/scheduler_test.go b/spinifex/handlers/ecs/scheduler_test.go index 5d1b779a9..6dc0ddb1b 100644 --- a/spinifex/handlers/ecs/scheduler_test.go +++ b/spinifex/handlers/ecs/scheduler_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" ) // TestScheduler_StandsDownWithoutIAM is the fleet outage this guards: a leader diff --git a/spinifex/handlers/ecs/service_test.go b/spinifex/handlers/ecs/service_test.go index 6882f664d..e3f40c146 100644 --- a/spinifex/handlers/ecs/service_test.go +++ b/spinifex/handlers/ecs/service_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecs" "github.com/mulgadc/spinifex/spinifex/handlers/ecs/bus" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ecs/services_eip_nats_test.go b/spinifex/handlers/ecs/services_eip_nats_test.go index 61c4cfe02..280d8f5e6 100644 --- a/spinifex/handlers/ecs/services_eip_nats_test.go +++ b/spinifex/handlers/ecs/services_eip_nats_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ecs/store_test.go b/spinifex/handlers/ecs/store_test.go index a7fb22c42..4dc60b70d 100644 --- a/spinifex/handlers/ecs/store_test.go +++ b/spinifex/handlers/ecs/store_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/addon_status_reconciler_test.go b/spinifex/handlers/eks/addon_status_reconciler_test.go index 8a3de7dc5..d199879e2 100644 --- a/spinifex/handlers/eks/addon_status_reconciler_test.go +++ b/spinifex/handlers/eks/addon_status_reconciler_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/addons_test.go b/spinifex/handlers/eks/addons_test.go index e6845a61f..9ca5f9ba3 100644 --- a/spinifex/handlers/eks/addons_test.go +++ b/spinifex/handlers/eks/addons_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/clienttoken_test.go b/spinifex/handlers/eks/clienttoken_test.go index 33bc8fad2..b84a9a9cd 100644 --- a/spinifex/handlers/eks/clienttoken_test.go +++ b/spinifex/handlers/eks/clienttoken_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/eks" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/cluster_reconciler_state_test.go b/spinifex/handlers/eks/cluster_reconciler_state_test.go index badbe5ba0..ce85357e9 100644 --- a/spinifex/handlers/eks/cluster_reconciler_state_test.go +++ b/spinifex/handlers/eks/cluster_reconciler_state_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/cluster_reconciler_test.go b/spinifex/handlers/eks/cluster_reconciler_test.go index bff3a6346..9faf17c20 100644 --- a/spinifex/handlers/eks/cluster_reconciler_test.go +++ b/spinifex/handlers/eks/cluster_reconciler_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/cluster_state_test.go b/spinifex/handlers/eks/cluster_state_test.go index c351c8ebd..730af7e8e 100644 --- a/spinifex/handlers/eks/cluster_state_test.go +++ b/spinifex/handlers/eks/cluster_state_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/delete_cluster_test.go b/spinifex/handlers/eks/delete_cluster_test.go index 83dc4db2a..7dc136842 100644 --- a/spinifex/handlers/eks/delete_cluster_test.go +++ b/spinifex/handlers/eks/delete_cluster_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/eks" "github.com/aws/aws-sdk-go/service/elbv2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/dns_reconcile_test.go b/spinifex/handlers/eks/dns_reconcile_test.go index c6a631e23..bbc0b5805 100644 --- a/spinifex/handlers/eks/dns_reconcile_test.go +++ b/spinifex/handlers/eks/dns_reconcile_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/k3s_ha_control_plane_test.go b/spinifex/handlers/eks/k3s_ha_control_plane_test.go index e595461fd..368c772a6 100644 --- a/spinifex/handlers/eks/k3s_ha_control_plane_test.go +++ b/spinifex/handlers/eks/k3s_ha_control_plane_test.go @@ -17,7 +17,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" handlers_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/handlers/ec2/placementgroup" "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/nats_bootstrap_test.go b/spinifex/handlers/eks/nats_bootstrap_test.go index 5e891cb3b..5efe2658b 100644 --- a/spinifex/handlers/eks/nats_bootstrap_test.go +++ b/spinifex/handlers/eks/nats_bootstrap_test.go @@ -11,7 +11,7 @@ import ( "time" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/nodegroup_test.go b/spinifex/handlers/eks/nodegroup_test.go index 2e155c080..52407f39d 100644 --- a/spinifex/handlers/eks/nodegroup_test.go +++ b/spinifex/handlers/eks/nodegroup_test.go @@ -19,7 +19,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/recovery_directive_test.go b/spinifex/handlers/eks/recovery_directive_test.go index 03d82c1d6..78d64ded4 100644 --- a/spinifex/handlers/eks/recovery_directive_test.go +++ b/spinifex/handlers/eks/recovery_directive_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/restore_snapshot_test.go b/spinifex/handlers/eks/restore_snapshot_test.go index 772ec4036..e05469fcc 100644 --- a/spinifex/handlers/eks/restore_snapshot_test.go +++ b/spinifex/handlers/eks/restore_snapshot_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/pagedstore" + "github.com/mulgadc/spinifex/internal/testkit/pagedstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/service_impl_test.go b/spinifex/handlers/eks/service_impl_test.go index 06b5af52d..cf333e008 100644 --- a/spinifex/handlers/eks/service_impl_test.go +++ b/spinifex/handlers/eks/service_impl_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/eks" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/eks/store_test.go b/spinifex/handlers/eks/store_test.go index e7b57fbf2..525663099 100644 --- a/spinifex/handlers/eks/store_test.go +++ b/spinifex/handlers/eks/store_test.go @@ -3,7 +3,7 @@ package handlers_eks import ( "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/token_review_test.go b/spinifex/handlers/eks/token_review_test.go index c526369d7..15290e106 100644 --- a/spinifex/handlers/eks/token_review_test.go +++ b/spinifex/handlers/eks/token_review_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/eks/watch_source_test.go b/spinifex/handlers/eks/watch_source_test.go index 0dbc57cfd..cc1d0060e 100644 --- a/spinifex/handlers/eks/watch_source_test.go +++ b/spinifex/handlers/eks/watch_source_test.go @@ -6,7 +6,7 @@ import ( handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/arn_test.go b/spinifex/handlers/elbv2/arn_test.go index a8afc0c39..78039c400 100644 --- a/spinifex/handlers/elbv2/arn_test.go +++ b/spinifex/handlers/elbv2/arn_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/cert_inuse_test.go b/spinifex/handlers/elbv2/cert_inuse_test.go index d48662c26..41ddd25b2 100644 --- a/spinifex/handlers/elbv2/cert_inuse_test.go +++ b/spinifex/handlers/elbv2/cert_inuse_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" handlers_acm "github.com/mulgadc/spinifex/spinifex/handlers/acm" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/haproxy_certs_test.go b/spinifex/handlers/elbv2/haproxy_certs_test.go index 7f6cc08b1..2f3549299 100644 --- a/spinifex/handlers/elbv2/haproxy_certs_test.go +++ b/spinifex/handlers/elbv2/haproxy_certs_test.go @@ -17,7 +17,7 @@ import ( handlers_acm "github.com/mulgadc/spinifex/spinifex/handlers/acm" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/lbagent" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/elbv2/health_checker_test.go b/spinifex/handlers/elbv2/health_checker_test.go index 26dc82b5f..424f1858d 100644 --- a/spinifex/handlers/elbv2/health_checker_test.go +++ b/spinifex/handlers/elbv2/health_checker_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/lbagent" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/service_impl_health_test.go b/spinifex/handlers/elbv2/service_impl_health_test.go index fb5637fe0..d07f00068 100644 --- a/spinifex/handlers/elbv2/service_impl_health_test.go +++ b/spinifex/handlers/elbv2/service_impl_health_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/service_impl_test.go b/spinifex/handlers/elbv2/service_impl_test.go index 5e9eb64dd..12893a4b0 100644 --- a/spinifex/handlers/elbv2/service_impl_test.go +++ b/spinifex/handlers/elbv2/service_impl_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/elbv2/service_impl_vpc_test.go b/spinifex/handlers/elbv2/service_impl_vpc_test.go index d2c907eb4..0cbce9c60 100644 --- a/spinifex/handlers/elbv2/service_impl_vpc_test.go +++ b/spinifex/handlers/elbv2/service_impl_vpc_test.go @@ -12,7 +12,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/elbv2/service_nats_e2e_test.go b/spinifex/handlers/elbv2/service_nats_e2e_test.go index 1182452ef..8e74ca824 100644 --- a/spinifex/handlers/elbv2/service_nats_e2e_test.go +++ b/spinifex/handlers/elbv2/service_nats_e2e_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/elbv2" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/elbv2/store_test.go b/spinifex/handlers/elbv2/store_test.go index 4448e626e..4796996ff 100644 --- a/spinifex/handlers/elbv2/store_test.go +++ b/spinifex/handlers/elbv2/store_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/elbv2/system_instance_launcher_nats_test.go b/spinifex/handlers/elbv2/system_instance_launcher_nats_test.go index 2c86ade97..012a57324 100644 --- a/spinifex/handlers/elbv2/system_instance_launcher_nats_test.go +++ b/spinifex/handlers/elbv2/system_instance_launcher_nats_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/iam/account_lifecycle_test.go b/spinifex/handlers/iam/account_lifecycle_test.go index 8a78d1c04..3cbe5912a 100644 --- a/spinifex/handlers/iam/account_lifecycle_test.go +++ b/spinifex/handlers/iam/account_lifecycle_test.go @@ -4,7 +4,7 @@ import ( "testing" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/iam/account_names_test.go b/spinifex/handlers/iam/account_names_test.go index b677ed97d..f36c091f6 100644 --- a/spinifex/handlers/iam/account_names_test.go +++ b/spinifex/handlers/iam/account_names_test.go @@ -5,7 +5,7 @@ import ( "testing" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/iam/account_test.go b/spinifex/handlers/iam/account_test.go index 0971205e5..5b4df9082 100644 --- a/spinifex/handlers/iam/account_test.go +++ b/spinifex/handlers/iam/account_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/iam/provision_test.go b/spinifex/handlers/iam/provision_test.go index 13a48e22d..8279d8ae2 100644 --- a/spinifex/handlers/iam/provision_test.go +++ b/spinifex/handlers/iam/provision_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/iam/service_impl_test.go b/spinifex/handlers/iam/service_impl_test.go index f2ec2bd8c..eda08a1cb 100644 --- a/spinifex/handlers/iam/service_impl_test.go +++ b/spinifex/handlers/iam/service_impl_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/imds/nats_clients_test.go b/spinifex/handlers/imds/nats_clients_test.go index 7ee3170cb..69fc8fe4a 100644 --- a/spinifex/handlers/imds/nats_clients_test.go +++ b/spinifex/handlers/imds/nats_clients_test.go @@ -14,7 +14,7 @@ import ( handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/imds/resolver_test.go b/spinifex/handlers/imds/resolver_test.go index 819b60f74..66e68aa6a 100644 --- a/spinifex/handlers/imds/resolver_test.go +++ b/spinifex/handlers/imds/resolver_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ochrevector/api_test.go b/spinifex/handlers/ochrevector/api_test.go index 88bb1d405..10734aaf8 100644 --- a/spinifex/handlers/ochrevector/api_test.go +++ b/spinifex/handlers/ochrevector/api_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ochrevector/appliance_test.go b/spinifex/handlers/ochrevector/appliance_test.go index ef387d75e..7bc413bec 100644 --- a/spinifex/handlers/ochrevector/appliance_test.go +++ b/spinifex/handlers/ochrevector/appliance_test.go @@ -15,7 +15,7 @@ import ( "time" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ochrevector/backup_test.go b/spinifex/handlers/ochrevector/backup_test.go index 8d3ffb0a1..329435a91 100644 --- a/spinifex/handlers/ochrevector/backup_test.go +++ b/spinifex/handlers/ochrevector/backup_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/ingest_test.go b/spinifex/handlers/ochrevector/ingest_test.go index 41ed21dda..8db88f37f 100644 --- a/spinifex/handlers/ochrevector/ingest_test.go +++ b/spinifex/handlers/ochrevector/ingest_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/jobs_test.go b/spinifex/handlers/ochrevector/jobs_test.go index a027a1150..68ba5b4e4 100644 --- a/spinifex/handlers/ochrevector/jobs_test.go +++ b/spinifex/handlers/ochrevector/jobs_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/kbstore_test.go b/spinifex/handlers/ochrevector/kbstore_test.go index 92c689904..25efd664b 100644 --- a/spinifex/handlers/ochrevector/kbstore_test.go +++ b/spinifex/handlers/ochrevector/kbstore_test.go @@ -8,7 +8,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/rds_launcher_test.go b/spinifex/handlers/ochrevector/rds_launcher_test.go index fd2ae07da..d38c8b929 100644 --- a/spinifex/handlers/ochrevector/rds_launcher_test.go +++ b/spinifex/handlers/ochrevector/rds_launcher_test.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ochrevector/registry_test.go b/spinifex/handlers/ochrevector/registry_test.go index 3bf3efc88..4f0a22455 100644 --- a/spinifex/handlers/ochrevector/registry_test.go +++ b/spinifex/handlers/ochrevector/registry_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/rerank_test.go b/spinifex/handlers/ochrevector/rerank_test.go index 24e1ecede..132bfdd55 100644 --- a/spinifex/handlers/ochrevector/rerank_test.go +++ b/spinifex/handlers/ochrevector/rerank_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/service_test.go b/spinifex/handlers/ochrevector/service_test.go index 87e67dbb4..7bfbbc358 100644 --- a/spinifex/handlers/ochrevector/service_test.go +++ b/spinifex/handlers/ochrevector/service_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/quota/bedrock_test.go b/spinifex/handlers/quota/bedrock_test.go index 9946016b9..7411d8e4d 100644 --- a/spinifex/handlers/quota/bedrock_test.go +++ b/spinifex/handlers/quota/bedrock_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" toml "github.com/pelletier/go-toml/v2" diff --git a/spinifex/handlers/quota/enforce_test.go b/spinifex/handlers/quota/enforce_test.go index e86fc3df0..39b4824c0 100644 --- a/spinifex/handlers/quota/enforce_test.go +++ b/spinifex/handlers/quota/enforce_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/quota/override_kv_test.go b/spinifex/handlers/quota/override_kv_test.go index a39c77975..5a29141a9 100644 --- a/spinifex/handlers/quota/override_kv_test.go +++ b/spinifex/handlers/quota/override_kv_test.go @@ -4,7 +4,7 @@ package handlers_quota import ( "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/quota/records_test.go b/spinifex/handlers/quota/records_test.go index d5ec63866..4233b2328 100644 --- a/spinifex/handlers/quota/records_test.go +++ b/spinifex/handlers/quota/records_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/quota/vcpu_test.go b/spinifex/handlers/quota/vcpu_test.go index 83869b0ed..540b9f7cf 100644 --- a/spinifex/handlers/quota/vcpu_test.go +++ b/spinifex/handlers/quota/vcpu_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/rds/agent_test.go b/spinifex/handlers/rds/agent_test.go index 11c9220c6..ccf3f8217 100644 --- a/spinifex/handlers/rds/agent_test.go +++ b/spinifex/handlers/rds/agent_test.go @@ -17,7 +17,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/create_test.go b/spinifex/handlers/rds/create_test.go index f46240c42..b28be559c 100644 --- a/spinifex/handlers/rds/create_test.go +++ b/spinifex/handlers/rds/create_test.go @@ -14,7 +14,7 @@ import ( handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/rds/launch_test.go b/spinifex/handlers/rds/launch_test.go index aaca18e13..b87c3fb24 100644 --- a/spinifex/handlers/rds/launch_test.go +++ b/spinifex/handlers/rds/launch_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" handlers_systemvpc "github.com/mulgadc/spinifex/spinifex/handlers/systemvpc" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/rds/lifecycle_test.go b/spinifex/handlers/rds/lifecycle_test.go index 5db7f69a9..4c67675f1 100644 --- a/spinifex/handlers/rds/lifecycle_test.go +++ b/spinifex/handlers/rds/lifecycle_test.go @@ -16,7 +16,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/modify_test.go b/spinifex/handlers/rds/modify_test.go index aac8f4df6..c31000143 100644 --- a/spinifex/handlers/rds/modify_test.go +++ b/spinifex/handlers/rds/modify_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/reconciler_test.go b/spinifex/handlers/rds/reconciler_test.go index 1445fb39c..229f45e91 100644 --- a/spinifex/handlers/rds/reconciler_test.go +++ b/spinifex/handlers/rds/reconciler_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/snapshot_test.go b/spinifex/handlers/rds/snapshot_test.go index 3321b0160..6ca22b697 100644 --- a/spinifex/handlers/rds/snapshot_test.go +++ b/spinifex/handlers/rds/snapshot_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" iammock "github.com/mulgadc/spinifex/spinifex/handlers/iam/mock" "github.com/mulgadc/spinifex/spinifex/tags" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/rds/store_test.go b/spinifex/handlers/rds/store_test.go index 23c2131bd..95451ba11 100644 --- a/spinifex/handlers/rds/store_test.go +++ b/spinifex/handlers/rds/store_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/watch_source_test.go b/spinifex/handlers/rds/watch_source_test.go index cf183c625..6eb5c04b3 100644 --- a/spinifex/handlers/rds/watch_source_test.go +++ b/spinifex/handlers/rds/watch_source_test.go @@ -6,7 +6,7 @@ import ( handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/sts/oidc_jwks_test.go b/spinifex/handlers/sts/oidc_jwks_test.go index 1a8f1d937..827e58ee0 100644 --- a/spinifex/handlers/sts/oidc_jwks_test.go +++ b/spinifex/handlers/sts/oidc_jwks_test.go @@ -5,7 +5,7 @@ import ( "testing" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/sts/service_impl_test.go b/spinifex/handlers/sts/service_impl_test.go index 1b8ba311d..a8124f4da 100644 --- a/spinifex/handlers/sts/service_impl_test.go +++ b/spinifex/handlers/sts/service_impl_test.go @@ -7,7 +7,7 @@ import ( "time" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/sts/session_credentials_test.go b/spinifex/handlers/sts/session_credentials_test.go index 9df45beca..3d7108b54 100644 --- a/spinifex/handlers/sts/session_credentials_test.go +++ b/spinifex/handlers/sts/session_credentials_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/instancecache/cache_test.go b/spinifex/instancecache/cache_test.go index 828bdb53a..87f4cd4be 100644 --- a/spinifex/instancecache/cache_test.go +++ b/spinifex/instancecache/cache_test.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/instancecache/liveness_test.go b/spinifex/instancecache/liveness_test.go index 105a3b460..c3eadc8d6 100644 --- a/spinifex/instancecache/liveness_test.go +++ b/spinifex/instancecache/liveness_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/instancecache" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" ) diff --git a/spinifex/instancecache/resume_from_revision_test.go b/spinifex/instancecache/resume_from_revision_test.go index e3f1e9864..b32df008e 100644 --- a/spinifex/instancecache/resume_from_revision_test.go +++ b/spinifex/instancecache/resume_from_revision_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" diff --git a/spinifex/kvlease/lease_test.go b/spinifex/kvlease/lease_test.go index 1e73a1141..4e1119f31 100644 --- a/spinifex/kvlease/lease_test.go +++ b/spinifex/kvlease/lease_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/kvlease" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/kvstore/recovery_test.go b/spinifex/kvstore/recovery_test.go index 33cb52315..76db4ed5b 100644 --- a/spinifex/kvstore/recovery_test.go +++ b/spinifex/kvstore/recovery_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/kvstore/snapshot_test.go b/spinifex/kvstore/snapshot_test.go index a2bb0f8ba..284b05ae7 100644 --- a/spinifex/kvstore/snapshot_test.go +++ b/spinifex/kvstore/snapshot_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/kvstore" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/spinifex/kvstore/store_test.go b/spinifex/kvstore/store_test.go index 1a99a51d2..ceed4b446 100644 --- a/spinifex/kvstore/store_test.go +++ b/spinifex/kvstore/store_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/kvutil/cas_conflict_test.go b/spinifex/kvutil/cas_conflict_test.go index 68da1c59c..d91c3ca37 100644 --- a/spinifex/kvutil/cas_conflict_test.go +++ b/spinifex/kvutil/cas_conflict_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/kvutil/kvutil_test.go b/spinifex/kvutil/kvutil_test.go index a15f9ccab..b71b8a531 100644 --- a/spinifex/kvutil/kvutil_test.go +++ b/spinifex/kvutil/kvutil_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/migrate/migrate_test.go b/spinifex/migrate/migrate_test.go index f91277cea..a78eabcf4 100644 --- a/spinifex/migrate/migrate_test.go +++ b/spinifex/migrate/migrate_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/network/external/dhcp/iface_mac_test.go b/spinifex/network/external/dhcp/iface_mac_test.go index 586912399..410178766 100644 --- a/spinifex/network/external/dhcp/iface_mac_test.go +++ b/spinifex/network/external/dhcp/iface_mac_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/network/external/dhcp/kv_test.go b/spinifex/network/external/dhcp/kv_test.go index af2111b4f..412b7b0da 100644 --- a/spinifex/network/external/dhcp/kv_test.go +++ b/spinifex/network/external/dhcp/kv_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/network/external/dhcp/lrp_allocator_test.go b/spinifex/network/external/dhcp/lrp_allocator_test.go index fe072a94f..66bc81245 100644 --- a/spinifex/network/external/dhcp/lrp_allocator_test.go +++ b/spinifex/network/external/dhcp/lrp_allocator_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/network/external/dhcp/manager_test.go b/spinifex/network/external/dhcp/manager_test.go index a9cefb9b8..219f3837e 100644 --- a/spinifex/network/external/dhcp/manager_test.go +++ b/spinifex/network/external/dhcp/manager_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/network/external/dhcp/pool_allocator_test.go b/spinifex/network/external/dhcp/pool_allocator_test.go index e646c89f0..cfb0a13a4 100644 --- a/spinifex/network/external/dhcp/pool_allocator_test.go +++ b/spinifex/network/external/dhcp/pool_allocator_test.go @@ -8,7 +8,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/network/external/static_pool_test.go b/spinifex/network/external/static_pool_test.go index 628d5b588..5f0c96220 100644 --- a/spinifex/network/external/static_pool_test.go +++ b/spinifex/network/external/static_pool_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/network/reconcile/drift_test.go b/spinifex/network/reconcile/drift_test.go index df91041e2..a20c3759b 100644 --- a/spinifex/network/reconcile/drift_test.go +++ b/spinifex/network/reconcile/drift_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" ) diff --git a/spinifex/network/reconcile/drift_watch_test.go b/spinifex/network/reconcile/drift_watch_test.go index 4feaa5439..83038ce5d 100644 --- a/spinifex/network/reconcile/drift_watch_test.go +++ b/spinifex/network/reconcile/drift_watch_test.go @@ -14,7 +14,7 @@ import ( handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/kvutil" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/reconcile/intent_test.go b/spinifex/network/reconcile/intent_test.go index f48183e21..dc40f1c48 100644 --- a/spinifex/network/reconcile/intent_test.go +++ b/spinifex/network/reconcile/intent_test.go @@ -14,7 +14,7 @@ import ( handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/policy" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/network/reconcile/lock_test.go b/spinifex/network/reconcile/lock_test.go index f79dca928..ef52b71dd 100644 --- a/spinifex/network/reconcile/lock_test.go +++ b/spinifex/network/reconcile/lock_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/network/subscribers/subscribers_test.go b/spinifex/network/subscribers/subscribers_test.go index 42cc3e584..7cc9abc6d 100644 --- a/spinifex/network/subscribers/subscribers_test.go +++ b/spinifex/network/subscribers/subscribers_test.go @@ -17,7 +17,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" ) const requestTimeout = 2 * time.Second diff --git a/spinifex/network/subscribers/topology_test.go b/spinifex/network/subscribers/topology_test.go index 77f834aa9..57b5383af 100644 --- a/spinifex/network/subscribers/topology_test.go +++ b/spinifex/network/subscribers/topology_test.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/types" ) diff --git a/spinifex/reconciler/reconciler_test.go b/spinifex/reconciler/reconciler_test.go index ef3884491..034dc8826 100644 --- a/spinifex/reconciler/reconciler_test.go +++ b/spinifex/reconciler/reconciler_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/reconciler" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/services/awsgw/eks_token_verify_test.go b/spinifex/services/awsgw/eks_token_verify_test.go index 9382e4134..f3b138b3c 100644 --- a/spinifex/services/awsgw/eks_token_verify_test.go +++ b/spinifex/services/awsgw/eks_token_verify_test.go @@ -8,7 +8,7 @@ import ( handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/awsgw/quota_reconcile_test.go b/spinifex/services/awsgw/quota_reconcile_test.go index 11a6dd7d4..6d2486f54 100644 --- a/spinifex/services/awsgw/quota_reconcile_test.go +++ b/spinifex/services/awsgw/quota_reconcile_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/resource" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/vm" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/require" diff --git a/spinifex/services/qemunbdd/bench_test.go b/spinifex/services/qemunbdd/bench_test.go index 79e9c3b77..d64c3bbea 100644 --- a/spinifex/services/qemunbdd/bench_test.go +++ b/spinifex/services/qemunbdd/bench_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/qemunbdd/conformance_test.go b/spinifex/services/qemunbdd/conformance_test.go index b64ecfae3..11e9e56b7 100644 --- a/spinifex/services/qemunbdd/conformance_test.go +++ b/spinifex/services/qemunbdd/conformance_test.go @@ -14,7 +14,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/spinifex/services/qemunbdd" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/qemunbdd/service_test.go b/spinifex/services/qemunbdd/service_test.go index d7e4f9c67..dd5295595 100644 --- a/spinifex/services/qemunbdd/service_test.go +++ b/spinifex/services/qemunbdd/service_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/viperblockd/engine_tracing_test.go b/spinifex/services/viperblockd/engine_tracing_test.go index 4a642d38c..fd7c69e4d 100644 --- a/spinifex/services/viperblockd/engine_tracing_test.go +++ b/spinifex/services/viperblockd/engine_tracing_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" diff --git a/spinifex/services/viperblockd/provider_tracing_test.go b/spinifex/services/viperblockd/provider_tracing_test.go index 72534b482..e2582ce16 100644 --- a/spinifex/services/viperblockd/provider_tracing_test.go +++ b/spinifex/services/viperblockd/provider_tracing_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/codes" diff --git a/spinifex/utils/nats_account_span_test.go b/spinifex/utils/nats_account_span_test.go index 35eba3ed1..0c4185623 100644 --- a/spinifex/utils/nats_account_span_test.go +++ b/spinifex/utils/nats_account_span_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/utils/nats_test.go b/spinifex/utils/nats_test.go index ef893ab1a..4c5a266b9 100644 --- a/spinifex/utils/nats_test.go +++ b/spinifex/utils/nats_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/utils/tagmirror_test.go b/spinifex/utils/tagmirror_test.go index 226ed66dc..385005801 100644 --- a/spinifex/utils/tagmirror_test.go +++ b/spinifex/utils/tagmirror_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/vpcd/lease_datapath_reconcile_test.go b/spinifex/vpcd/lease_datapath_reconcile_test.go index b927874f7..7f445eed2 100644 --- a/spinifex/vpcd/lease_datapath_reconcile_test.go +++ b/spinifex/vpcd/lease_datapath_reconcile_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/vpcd/lease_ip_change_test.go b/spinifex/vpcd/lease_ip_change_test.go index 99972f93d..c82f384f3 100644 --- a/spinifex/vpcd/lease_ip_change_test.go +++ b/spinifex/vpcd/lease_ip_change_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/policy" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/vpcd/lease_reaper_test.go b/spinifex/vpcd/lease_reaper_test.go index 7304324d5..38b93a134 100644 --- a/spinifex/vpcd/lease_reaper_test.go +++ b/spinifex/vpcd/lease_reaper_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/ovn/mock" "github.com/mulgadc/spinifex/spinifex/network/ovn/nbdb" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/testutil" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tests/fixtures/predastore/predastore.go b/tests/fixtures/predastore/predastore.go index af23a3542..4e7f07728 100644 --- a/tests/fixtures/predastore/predastore.go +++ b/tests/fixtures/predastore/predastore.go @@ -1,6 +1,6 @@ // Package predastore starts a real predastore cluster for tests that need to // exercise an actual S3-compatible backend rather than a mock. It is -// deliberately its own leaf package (not folded into spinifex/testutil, +// deliberately its own leaf package (not folded into internal/testkit, // which is imported by most of the module's test files for lightweight NATS // helpers): starting one here runs a whole predastore host — blob nodes, Raft // meta replicas and the S3 gate in front of them — whose goroutines run for diff --git a/tests/integration/segscan_oracle_test.go b/tests/integration/segscan_oracle_test.go index 8f513d48b..28b864c3e 100644 --- a/tests/integration/segscan_oracle_test.go +++ b/tests/integration/segscan_oracle_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/testutil/segscanoracle" + "github.com/mulgadc/spinifex/internal/testkit/segscanoracle" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/volume_test.go b/tests/integration/volume_test.go index 2c0fa2646..61c34ac8a 100644 --- a/tests/integration/volume_test.go +++ b/tests/integration/volume_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/testutil/vbscan" + "github.com/mulgadc/spinifex/internal/testkit/vbscan" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"