From d78246d05c93c0cc958b025520df7bcd78f8eeeb Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Tue, 29 Sep 2026 10:33:14 +1000 Subject: [PATCH] refactor: move instance types to EC2 domain --- spinifex/daemon/capacityreservation.go | 2 +- spinifex/daemon/daemon.go | 2 +- spinifex/daemon/daemon_handlers_capacityreservation.go | 2 +- spinifex/daemon/daemon_test.go | 2 +- spinifex/{ => domains/ec2}/instancetypes/definitions.go | 0 spinifex/{ => domains/ec2}/instancetypes/detect.go | 0 spinifex/{ => domains/ec2}/instancetypes/detect_test.go | 0 spinifex/{ => domains/ec2}/instancetypes/eni_limits.go | 0 spinifex/{ => domains/ec2}/instancetypes/eni_limits_test.go | 0 spinifex/{ => domains/ec2}/instancetypes/generate.go | 0 spinifex/{ => domains/ec2}/instancetypes/generate_test.go | 0 .../{ => domains/ec2}/instancetypes/gpu_type_name_test.go | 0 spinifex/{ => domains/ec2}/instancetypes/multi_gpu_test.go | 0 spinifex/handlers/ec2/instance/service_impl.go | 2 +- spinifex/handlers/ec2/instance/service_impl_test.go | 2 +- spinifex/handlers/ecs/capacity.go | 2 +- spinifex/handlers/ecs/placement.go | 2 +- spinifex/handlers/eks/k3s_ha_control_plane.go | 2 +- spinifex/handlers/eks/k3s_ha_control_plane_test.go | 2 +- spinifex/handlers/eks/nodegroup.go | 4 ++-- spinifex/handlers/quota/reconcile.go | 2 +- spinifex/handlers/quota/records.go | 2 +- spinifex/handlers/quota/vcpu.go | 2 +- spinifex/handlers/rds/catalog_test.go | 2 +- spinifex/handlers/rds/paramcatalog.go | 2 +- spinifex/handlers/rds/sizing.go | 2 +- spinifex/handlers/rds/sizing_test.go | 2 +- spinifex/vm/lifecycle.go | 2 +- tests/e2e/gpu/ecs_gpu_test.go | 2 +- 29 files changed, 21 insertions(+), 21 deletions(-) rename spinifex/{ => domains/ec2}/instancetypes/definitions.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/detect.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/detect_test.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/eni_limits.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/eni_limits_test.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/generate.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/generate_test.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/gpu_type_name_test.go (100%) rename spinifex/{ => domains/ec2}/instancetypes/multi_gpu_test.go (100%) diff --git a/spinifex/daemon/capacityreservation.go b/spinifex/daemon/capacityreservation.go index 893f5d216..22d6835a3 100644 --- a/spinifex/daemon/capacityreservation.go +++ b/spinifex/daemon/capacityreservation.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/awserrors" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" ) // capacityReservation is an in-memory On-Demand Capacity Reservation pinned to diff --git a/spinifex/daemon/daemon.go b/spinifex/daemon/daemon.go index ed1cb65ad..e0f70c2e7 100644 --- a/spinifex/daemon/daemon.go +++ b/spinifex/daemon/daemon.go @@ -34,6 +34,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/awserrors" "github.com/mulgadc/spinifex/spinifex/bootstrap/preflight" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsprovider" handlers_acm "github.com/mulgadc/spinifex/spinifex/handlers/acm" handlers_bedrock "github.com/mulgadc/spinifex/spinifex/handlers/bedrock" @@ -61,7 +62,6 @@ import ( handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" handlers_rds "github.com/mulgadc/spinifex/spinifex/handlers/rds" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/kvutil" "github.com/mulgadc/spinifex/spinifex/network/external" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" diff --git a/spinifex/daemon/daemon_handlers_capacityreservation.go b/spinifex/daemon/daemon_handlers_capacityreservation.go index 965bf0050..f9c5ebffe 100644 --- a/spinifex/daemon/daemon_handlers_capacityreservation.go +++ b/spinifex/daemon/daemon_handlers_capacityreservation.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/awserrors" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" ) diff --git a/spinifex/daemon/daemon_test.go b/spinifex/daemon/daemon_test.go index 0db6d6668..a482b0df9 100644 --- a/spinifex/daemon/daemon_test.go +++ b/spinifex/daemon/daemon_test.go @@ -30,6 +30,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/awserrors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account" handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw" @@ -45,7 +46,6 @@ import ( handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" diff --git a/spinifex/instancetypes/definitions.go b/spinifex/domains/ec2/instancetypes/definitions.go similarity index 100% rename from spinifex/instancetypes/definitions.go rename to spinifex/domains/ec2/instancetypes/definitions.go diff --git a/spinifex/instancetypes/detect.go b/spinifex/domains/ec2/instancetypes/detect.go similarity index 100% rename from spinifex/instancetypes/detect.go rename to spinifex/domains/ec2/instancetypes/detect.go diff --git a/spinifex/instancetypes/detect_test.go b/spinifex/domains/ec2/instancetypes/detect_test.go similarity index 100% rename from spinifex/instancetypes/detect_test.go rename to spinifex/domains/ec2/instancetypes/detect_test.go diff --git a/spinifex/instancetypes/eni_limits.go b/spinifex/domains/ec2/instancetypes/eni_limits.go similarity index 100% rename from spinifex/instancetypes/eni_limits.go rename to spinifex/domains/ec2/instancetypes/eni_limits.go diff --git a/spinifex/instancetypes/eni_limits_test.go b/spinifex/domains/ec2/instancetypes/eni_limits_test.go similarity index 100% rename from spinifex/instancetypes/eni_limits_test.go rename to spinifex/domains/ec2/instancetypes/eni_limits_test.go diff --git a/spinifex/instancetypes/generate.go b/spinifex/domains/ec2/instancetypes/generate.go similarity index 100% rename from spinifex/instancetypes/generate.go rename to spinifex/domains/ec2/instancetypes/generate.go diff --git a/spinifex/instancetypes/generate_test.go b/spinifex/domains/ec2/instancetypes/generate_test.go similarity index 100% rename from spinifex/instancetypes/generate_test.go rename to spinifex/domains/ec2/instancetypes/generate_test.go diff --git a/spinifex/instancetypes/gpu_type_name_test.go b/spinifex/domains/ec2/instancetypes/gpu_type_name_test.go similarity index 100% rename from spinifex/instancetypes/gpu_type_name_test.go rename to spinifex/domains/ec2/instancetypes/gpu_type_name_test.go diff --git a/spinifex/instancetypes/multi_gpu_test.go b/spinifex/domains/ec2/instancetypes/multi_gpu_test.go similarity index 100% rename from spinifex/instancetypes/multi_gpu_test.go rename to spinifex/domains/ec2/instancetypes/multi_gpu_test.go diff --git a/spinifex/handlers/ec2/instance/service_impl.go b/spinifex/handlers/ec2/instance/service_impl.go index 01359961c..f8e90cd52 100644 --- a/spinifex/handlers/ec2/instance/service_impl.go +++ b/spinifex/handlers/ec2/instance/service_impl.go @@ -19,12 +19,12 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/awserrors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/network/topology" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/instance/service_impl_test.go b/spinifex/handlers/ec2/instance/service_impl_test.go index ebd9aa49b..358894b52 100644 --- a/spinifex/handlers/ec2/instance/service_impl_test.go +++ b/spinifex/handlers/ec2/instance/service_impl_test.go @@ -15,9 +15,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/awserrors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/tags" "github.com/mulgadc/spinifex/spinifex/testutil" diff --git a/spinifex/handlers/ecs/capacity.go b/spinifex/handlers/ecs/capacity.go index 0cf7d2325..27feceaf4 100644 --- a/spinifex/handlers/ecs/capacity.go +++ b/spinifex/handlers/ecs/capacity.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/awserrors" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/tags" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/ecs/placement.go b/spinifex/handlers/ecs/placement.go index 6a00032af..89748d631 100644 --- a/spinifex/handlers/ecs/placement.go +++ b/spinifex/handlers/ecs/placement.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" ) // Placement strategy identifiers (ecs-v1.md Q15). Default is binpack:memory. diff --git a/spinifex/handlers/eks/k3s_ha_control_plane.go b/spinifex/handlers/eks/k3s_ha_control_plane.go index ced8ad950..70a3211cb 100644 --- a/spinifex/handlers/eks/k3s_ha_control_plane.go +++ b/spinifex/handlers/eks/k3s_ha_control_plane.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/awserrors" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" handlers_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/handlers/ec2/placementgroup" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/types" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/eks/k3s_ha_control_plane_test.go b/spinifex/handlers/eks/k3s_ha_control_plane_test.go index d7bdac40c..ee5c3076e 100644 --- a/spinifex/handlers/eks/k3s_ha_control_plane_test.go +++ b/spinifex/handlers/eks/k3s_ha_control_plane_test.go @@ -14,9 +14,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/awserrors" + "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/instancetypes" "github.com/mulgadc/spinifex/spinifex/testutil" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/eks/nodegroup.go b/spinifex/handlers/eks/nodegroup.go index bd36bfc80..d7de333f9 100644 --- a/spinifex/handlers/eks/nodegroup.go +++ b/spinifex/handlers/eks/nodegroup.go @@ -21,11 +21,11 @@ import ( "github.com/aws/aws-sdk-go/service/eks" "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/bluebottle/pkg/auth" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/spinifex/awserrors" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/quota/reconcile.go b/spinifex/handlers/quota/reconcile.go index 9ee162493..10c4be5d7 100644 --- a/spinifex/handlers/quota/reconcile.go +++ b/spinifex/handlers/quota/reconcile.go @@ -6,7 +6,7 @@ import ( "log/slog" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/quota/records.go b/spinifex/handlers/quota/records.go index 87505bfb4..2aee16564 100644 --- a/spinifex/handlers/quota/records.go +++ b/spinifex/handlers/quota/records.go @@ -5,7 +5,7 @@ import ( "encoding/json" "log/slog" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/vm" diff --git a/spinifex/handlers/quota/vcpu.go b/spinifex/handlers/quota/vcpu.go index 149aaff10..884667e69 100644 --- a/spinifex/handlers/quota/vcpu.go +++ b/spinifex/handlers/quota/vcpu.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/awserrors" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/instancetypes" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/nats-io/nats.go" ) diff --git a/spinifex/handlers/rds/catalog_test.go b/spinifex/handlers/rds/catalog_test.go index 9fc07e0ca..148406ca0 100644 --- a/spinifex/handlers/rds/catalog_test.go +++ b/spinifex/handlers/rds/catalog_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/rds" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/rds/paramcatalog.go b/spinifex/handlers/rds/paramcatalog.go index 4467d2ba4..4b41d42f2 100644 --- a/spinifex/handlers/rds/paramcatalog.go +++ b/spinifex/handlers/rds/paramcatalog.go @@ -11,7 +11,7 @@ import ( "unicode" "github.com/mulgadc/spinifex/spinifex/awserrors" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" ) // The engine-neutral half of the parameter catalog: the spec type, its parsing diff --git a/spinifex/handlers/rds/sizing.go b/spinifex/handlers/rds/sizing.go index 97f72d0e3..d4c12e75f 100644 --- a/spinifex/handlers/rds/sizing.go +++ b/spinifex/handlers/rds/sizing.go @@ -6,7 +6,7 @@ import ( "slices" "github.com/mulgadc/spinifex/spinifex/awserrors" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" ) // db.* is a naming facade, not a second sizing table: every entry resolves diff --git a/spinifex/handlers/rds/sizing_test.go b/spinifex/handlers/rds/sizing_test.go index 5abd47980..7453714bd 100644 --- a/spinifex/handlers/rds/sizing_test.go +++ b/spinifex/handlers/rds/sizing_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/awserrors" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/vm/lifecycle.go b/spinifex/vm/lifecycle.go index 0671b0245..00e16f700 100644 --- a/spinifex/vm/lifecycle.go +++ b/spinifex/vm/lifecycle.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/otelsetup" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" "github.com/mulgadc/spinifex/spinifex/types" diff --git a/tests/e2e/gpu/ecs_gpu_test.go b/tests/e2e/gpu/ecs_gpu_test.go index aad6fe60b..7cee80914 100644 --- a/tests/e2e/gpu/ecs_gpu_test.go +++ b/tests/e2e/gpu/ecs_gpu_test.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" "github.com/aws/aws-sdk-go/service/iam" - "github.com/mulgadc/spinifex/spinifex/instancetypes" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/tags" "github.com/mulgadc/spinifex/tests/e2e/harness" "github.com/stretchr/testify/assert"