diff --git a/spinifex/accountteardown/reapers_ec2.go b/spinifex/accountteardown/reapers_ec2.go index 73ee383bf..43789c7bd 100644 --- a/spinifex/accountteardown/reapers_ec2.go +++ b/spinifex/accountteardown/reapers_ec2.go @@ -12,12 +12,12 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" ec2keyapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/key" + ec2launchtemplateapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/launchtemplate" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ec2_eip "github.com/mulgadc/spinifex/spinifex/gateway/ec2/eip" gateway_ec2_igw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/igw" gateway_ec2_image "github.com/mulgadc/spinifex/spinifex/gateway/ec2/image" gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance" - gateway_ec2_launchtemplate "github.com/mulgadc/spinifex/spinifex/gateway/ec2/launchtemplate" gateway_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/gateway/ec2/placementgroup" gateway_ec2_routetable "github.com/mulgadc/spinifex/spinifex/gateway/ec2/routetable" gateway_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/gateway/ec2/snapshot" @@ -624,7 +624,7 @@ func (r *launchTemplateReaper) Kind() string { return "launch-template" } func (r *launchTemplateReaper) Stage() Stage { return StagePlatform } func (r *launchTemplateReaper) List(ctx context.Context, accountID string) ([]Resource, error) { - out, err := gateway_ec2_launchtemplate.DescribeLaunchTemplates(ctx, &ec2.DescribeLaunchTemplatesInput{}, r.nc, accountID) + out, err := ec2launchtemplateapi.DescribeLaunchTemplates(ctx, &ec2.DescribeLaunchTemplatesInput{}, r.nc, accountID) if err != nil { return nil, err } @@ -640,7 +640,7 @@ func (r *launchTemplateReaper) List(ctx context.Context, accountID string) ([]Re } func (r *launchTemplateReaper) Delete(ctx context.Context, accountID string, resource Resource, _ bool) error { - _, err := gateway_ec2_launchtemplate.DeleteLaunchTemplate(ctx, &ec2.DeleteLaunchTemplateInput{ + _, err := ec2launchtemplateapi.DeleteLaunchTemplate(ctx, &ec2.DeleteLaunchTemplateInput{ LaunchTemplateId: aws.String(resource.ID), }, r.nc, accountID) return ignoreAlreadyGone(err) diff --git a/spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplate.go b/spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplate.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplate.go rename to spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplate.go index 69406a36b..1e53d6415 100644 --- a/spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplate.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplate.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplateVersion.go b/spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplateVersion.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplateVersion.go rename to spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplateVersion.go index d4256d8ee..dc0fa45d8 100644 --- a/spinifex/gateway/ec2/launchtemplate/CreateLaunchTemplateVersion.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/CreateLaunchTemplateVersion.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplate.go b/spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplate.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplate.go rename to spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplate.go index f358d204a..9d59502e6 100644 --- a/spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplate.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplate.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplateVersions.go b/spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplateVersions.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplateVersions.go rename to spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplateVersions.go index 73dd04abc..423330b59 100644 --- a/spinifex/gateway/ec2/launchtemplate/DeleteLaunchTemplateVersions.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/DeleteLaunchTemplateVersions.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplateVersions.go b/spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplateVersions.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplateVersions.go rename to spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplateVersions.go index 2aec7d21b..ce2d73a04 100644 --- a/spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplateVersions.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplateVersions.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplates.go b/spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplates.go similarity index 95% rename from spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplates.go rename to spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplates.go index 49411258c..56dc07037 100644 --- a/spinifex/gateway/ec2/launchtemplate/DescribeLaunchTemplates.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/DescribeLaunchTemplates.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/ModifyLaunchTemplate.go b/spinifex/domains/ec2/awsapi/launchtemplate/ModifyLaunchTemplate.go similarity index 97% rename from spinifex/gateway/ec2/launchtemplate/ModifyLaunchTemplate.go rename to spinifex/domains/ec2/awsapi/launchtemplate/ModifyLaunchTemplate.go index 8f352aaaf..f8986807b 100644 --- a/spinifex/gateway/ec2/launchtemplate/ModifyLaunchTemplate.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/ModifyLaunchTemplate.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/launchtemplate_test.go b/spinifex/domains/ec2/awsapi/launchtemplate/launchtemplate_test.go similarity index 99% rename from spinifex/gateway/ec2/launchtemplate/launchtemplate_test.go rename to spinifex/domains/ec2/awsapi/launchtemplate/launchtemplate_test.go index 0611d77c9..976b579ba 100644 --- a/spinifex/gateway/ec2/launchtemplate/launchtemplate_test.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/launchtemplate_test.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "context" diff --git a/spinifex/gateway/ec2/launchtemplate/validate.go b/spinifex/domains/ec2/awsapi/launchtemplate/validate.go similarity index 95% rename from spinifex/gateway/ec2/launchtemplate/validate.go rename to spinifex/domains/ec2/awsapi/launchtemplate/validate.go index 342ac4c79..a337e8f99 100644 --- a/spinifex/gateway/ec2/launchtemplate/validate.go +++ b/spinifex/domains/ec2/awsapi/launchtemplate/validate.go @@ -1,4 +1,4 @@ -package gateway_ec2_launchtemplate +package launchtemplate import ( "errors" diff --git a/spinifex/gateway/ec2.go b/spinifex/gateway/ec2.go index f897608e4..4425cadc8 100644 --- a/spinifex/gateway/ec2.go +++ b/spinifex/gateway/ec2.go @@ -16,6 +16,7 @@ import ( ec2accountapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/account" ec2capacityreservationapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/capacityreservation" ec2keyapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/key" + ec2launchtemplateapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/launchtemplate" "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" @@ -25,7 +26,6 @@ import ( gateway_ec2_igw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/igw" gateway_ec2_image "github.com/mulgadc/spinifex/spinifex/gateway/ec2/image" gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance" - gateway_ec2_launchtemplate "github.com/mulgadc/spinifex/spinifex/gateway/ec2/launchtemplate" gateway_ec2_natgw "github.com/mulgadc/spinifex/spinifex/gateway/ec2/natgw" gateway_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/gateway/ec2/placementgroup" gateway_ec2_routetable "github.com/mulgadc/spinifex/spinifex/gateway/ec2/routetable" @@ -452,25 +452,25 @@ var ec2Actions = map[string]ec2Action{ return ec2capacityreservationapi.CancelCapacityReservation(ctx, input, gw.NATSConn, gw.ExpectedNodes, accountID) }), "CreateLaunchTemplate": ec2Handler(func(ctx context.Context, input *ec2.CreateLaunchTemplateInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.CreateLaunchTemplate(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.CreateLaunchTemplate(ctx, input, gw.NATSConn, accountID) }), "CreateLaunchTemplateVersion": ec2IdempotentHandler(func(ctx context.Context, input *ec2.CreateLaunchTemplateVersionInput, gw *GatewayConfig, accountID string) (ec2.CreateLaunchTemplateVersionOutput, error) { - return gateway_ec2_launchtemplate.CreateLaunchTemplateVersion(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.CreateLaunchTemplateVersion(ctx, input, gw.NATSConn, accountID) }), "DeleteLaunchTemplate": ec2Handler(func(ctx context.Context, input *ec2.DeleteLaunchTemplateInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.DeleteLaunchTemplate(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.DeleteLaunchTemplate(ctx, input, gw.NATSConn, accountID) }), "DeleteLaunchTemplateVersions": ec2Handler(func(ctx context.Context, input *ec2.DeleteLaunchTemplateVersionsInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.DeleteLaunchTemplateVersions(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.DeleteLaunchTemplateVersions(ctx, input, gw.NATSConn, accountID) }), "ModifyLaunchTemplate": ec2Handler(func(ctx context.Context, input *ec2.ModifyLaunchTemplateInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.ModifyLaunchTemplate(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.ModifyLaunchTemplate(ctx, input, gw.NATSConn, accountID) }), "DescribeLaunchTemplates": ec2Handler(func(ctx context.Context, input *ec2.DescribeLaunchTemplatesInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.DescribeLaunchTemplates(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.DescribeLaunchTemplates(ctx, input, gw.NATSConn, accountID) }), "DescribeLaunchTemplateVersions": ec2Handler(func(ctx context.Context, input *ec2.DescribeLaunchTemplateVersionsInput, gw *GatewayConfig, accountID string) (any, error) { - return gateway_ec2_launchtemplate.DescribeLaunchTemplateVersions(ctx, input, gw.NATSConn, accountID) + return ec2launchtemplateapi.DescribeLaunchTemplateVersions(ctx, input, gw.NATSConn, accountID) }), "RequestSpotInstances": ec2HandlerWithReq(func(ctx context.Context, input *ec2.RequestSpotInstancesInput, gw *GatewayConfig, accountID string, r *http.Request) (any, error) { passRoleCheck := func(roleARN string) error { diff --git a/tests/integration/launchtemplate_daemon_lite.go b/tests/integration/launchtemplate_daemon_lite.go index ddb133c72..c27585d53 100644 --- a/tests/integration/launchtemplate_daemon_lite.go +++ b/tests/integration/launchtemplate_daemon_lite.go @@ -14,7 +14,7 @@ import ( // ec2launchtemplate.LaunchTemplateServiceImpl — the same production // code a live daemon runs (daemon/daemon_handlers_launchtemplate.go) — to // every ec2.*LaunchTemplate* subject the gateway's NATSLaunchTemplateService -// client calls (gateway/ec2/launchtemplate/*.go, RunInstances.go's +// client calls (domains/ec2/awsapi/launchtemplate/*.go, RunInstances.go's // expandLaunchTemplate). Unlike StubSubject's static canned JSON, this // exercises the real KV-backed CRUD and version-resolution logic, matching // how RunInstances resolves a referenced template into effective ImageId/