From c38bf99e4fc734b1ff753caf0f3c2627f6497aca Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Wed, 7 Oct 2026 14:31:20 +1000 Subject: [PATCH] refactor: move EC2 zone action adapters to domains/ec2/awsapi --- .../ec2 => domains/ec2/awsapi}/zone/AvailabilityZone.go | 2 +- .../{gateway/ec2 => domains/ec2/awsapi}/zone/zone_test.go | 2 +- spinifex/gateway/ec2.go | 6 +++--- .../gateway/ec2/instance/DescribeInstanceTypeOfferings.go | 4 ++-- .../ec2/instance/DescribeInstanceTypeOfferings_test.go | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename spinifex/{gateway/ec2 => domains/ec2/awsapi}/zone/AvailabilityZone.go (99%) rename spinifex/{gateway/ec2 => domains/ec2/awsapi}/zone/zone_test.go (99%) diff --git a/spinifex/gateway/ec2/zone/AvailabilityZone.go b/spinifex/domains/ec2/awsapi/zone/AvailabilityZone.go similarity index 99% rename from spinifex/gateway/ec2/zone/AvailabilityZone.go rename to spinifex/domains/ec2/awsapi/zone/AvailabilityZone.go index e3136c2a0..513012376 100644 --- a/spinifex/gateway/ec2/zone/AvailabilityZone.go +++ b/spinifex/domains/ec2/awsapi/zone/AvailabilityZone.go @@ -1,4 +1,4 @@ -package gateway_ec2_zone +package zone import ( "slices" diff --git a/spinifex/gateway/ec2/zone/zone_test.go b/spinifex/domains/ec2/awsapi/zone/zone_test.go similarity index 99% rename from spinifex/gateway/ec2/zone/zone_test.go rename to spinifex/domains/ec2/awsapi/zone/zone_test.go index 257dcd7fd..215aa594a 100644 --- a/spinifex/gateway/ec2/zone/zone_test.go +++ b/spinifex/domains/ec2/awsapi/zone/zone_test.go @@ -1,4 +1,4 @@ -package gateway_ec2_zone +package zone import ( "testing" diff --git a/spinifex/gateway/ec2.go b/spinifex/gateway/ec2.go index 65c1c8350..5032a5799 100644 --- a/spinifex/gateway/ec2.go +++ b/spinifex/gateway/ec2.go @@ -18,6 +18,7 @@ import ( ec2keyapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/key" ec2launchtemplateapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/launchtemplate" ec2placementgroupapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/placementgroup" + ec2zoneapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/zone" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" awsxml "github.com/mulgadc/spinifex/spinifex/foundation/aws/xml" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" @@ -34,7 +35,6 @@ import ( gateway_ec2_tags "github.com/mulgadc/spinifex/spinifex/gateway/ec2/tags" gateway_ec2_volume "github.com/mulgadc/spinifex/spinifex/gateway/ec2/volume" gateway_ec2_vpc "github.com/mulgadc/spinifex/spinifex/gateway/ec2/vpc" - gateway_ec2_zone "github.com/mulgadc/spinifex/spinifex/gateway/ec2/zone" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" "github.com/mulgadc/spinifex/spinifex/ingress/aws/query" "github.com/nats-io/nats.go" @@ -330,10 +330,10 @@ var ec2Actions = map[string]ec2Action{ return gateway_ec2_image.ResetImageAttribute(ctx, input, gw.NATSConn, accountID) }), "DescribeRegions": ec2Handler(func(ctx context.Context, input *ec2.DescribeRegionsInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_zone.DescribeRegions(input, gw.Region, gw.advertisedEndpoint()) + return ec2zoneapi.DescribeRegions(input, gw.Region, gw.advertisedEndpoint()) }), "DescribeAvailabilityZones": ec2Handler(func(ctx context.Context, input *ec2.DescribeAvailabilityZonesInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_zone.DescribeAvailabilityZones(input, gw.Region, gw.AZ) + return ec2zoneapi.DescribeAvailabilityZones(input, gw.Region, gw.AZ) }), "DescribeVolumes": ec2Handler(func(ctx context.Context, input *ec2.DescribeVolumesInput, gw *GatewayConfig, accountID string) (any, error) { return gateway_ec2_volume.DescribeVolumes(ctx, input, gw.NATSConn, accountID) diff --git a/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings.go b/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings.go index 3e996e358..67b2eedd8 100644 --- a/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings.go +++ b/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + ec2zoneapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/zone" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" - gateway_ec2_zone "github.com/mulgadc/spinifex/spinifex/gateway/ec2/zone" "github.com/nats-io/nats.go" ) @@ -105,7 +105,7 @@ func offeringLocations(locationType, region, az string) ([]string, error) { return nil, errors.New(awserrors.ErrorInvalidParameterValue) } - zones, err := gateway_ec2_zone.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, region, az) + zones, err := ec2zoneapi.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, region, az) if err != nil { return nil, err } diff --git a/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings_test.go b/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings_test.go index f432b42e9..af1b515d1 100644 --- a/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings_test.go +++ b/spinifex/gateway/ec2/instance/DescribeInstanceTypeOfferings_test.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + ec2zoneapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/zone" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - gateway_ec2_zone "github.com/mulgadc/spinifex/spinifex/gateway/ec2/zone" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -46,7 +46,7 @@ func TestDescribeInstanceTypeOfferings_AvailabilityZone(t *testing.T) { types, err := DescribeInstanceTypes(context.Background(), &ec2.DescribeInstanceTypesInput{}, nc, 1, nil, "") require.NoError(t, err) - zones, err := gateway_ec2_zone.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, offeringsTestRegion, offeringsTestAZ) + zones, err := ec2zoneapi.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, offeringsTestRegion, offeringsTestAZ) require.NoError(t, err) output, err := DescribeInstanceTypeOfferings(context.Background(), &ec2.DescribeInstanceTypeOfferingsInput{ @@ -106,7 +106,7 @@ func TestDescribeInstanceTypeOfferings_AvailabilityZoneID(t *testing.T) { _, nc := startTestNATSServer(t) serveInstanceTypes(t, nc, "t3.micro") - zones, err := gateway_ec2_zone.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, offeringsTestRegion, offeringsTestAZ) + zones, err := ec2zoneapi.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{}, offeringsTestRegion, offeringsTestAZ) require.NoError(t, err) zoneID := aws.StringValue(zones.AvailabilityZones[0].ZoneId) require.NotEqual(t, offeringsTestAZ, zoneID, "zone ID must differ from zone name for this assertion to mean anything")