gsadmin/spinifex
1
0
Fork 0
mirror of https://github.com/mulgadc/spinifex.git synced 2026-10-15 09:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move EC2 snapshot action adapters to domains/ec2/awsapi

Browse Source
This commit is contained in:
joshsiv-mulga
2026-10-07 14:36:36 +10:00
parent 4b315469fc
commit 8b106e7966
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spinifex/accountteardown/reapers_ec2.go
+3 -3
View File
@@ -18,10 +18,10 @@ import (
ec2launchtemplateapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/launchtemplate"
ec2placementgroupapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/placementgroup"
ec2routetableapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/routetable"
ec2snapshotapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/snapshot"
ec2vpcapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/vpc"
"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance"
gateway_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/gateway/ec2/snapshot"
gateway_ec2_volume "github.com/mulgadc/spinifex/spinifex/gateway/ec2/volume"
"github.com/nats-io/nats.go"
)
@@ -162,7 +162,7 @@ func (r *snapshotReaper) Kind() string { return "snapshot" }
func (r *snapshotReaper) Stage() Stage { return StageStorage }
func (r *snapshotReaper) List(ctx context.Context, accountID string) ([]Resource, error) {
out, err := gateway_ec2_snapshot.DescribeSnapshots(ctx, &ec2.DescribeSnapshotsInput{
out, err := ec2snapshotapi.DescribeSnapshots(ctx, &ec2.DescribeSnapshotsInput{
OwnerIds: []*string{aws.String(accountID)},
}, r.nc, accountID)
if err != nil {
@@ -180,7 +180,7 @@ func (r *snapshotReaper) List(ctx context.Context, accountID string) ([]Resource
}
func (r *snapshotReaper) Delete(ctx context.Context, accountID string, resource Resource, _ bool) error {
_, err := gateway_ec2_snapshot.DeleteSnapshot(ctx, &ec2.DeleteSnapshotInput{
_, err := ec2snapshotapi.DeleteSnapshot(ctx, &ec2.DeleteSnapshotInput{
SnapshotId: aws.String(resource.ID),
}, r.nc, accountID)
return ignoreAlreadyGone(err)
spinifex/gateway/ec2/snapshot/CopySnapshot.go → spinifex/domains/ec2/awsapi/snapshot/CopySnapshot.go
+1 -1
View File
@@ -1,4 +1,4 @@
package gateway_ec2_snapshot
package snapshot
import (
"context"
spinifex/gateway/ec2/snapshot/CreateSnapshot.go → spinifex/domains/ec2/awsapi/snapshot/CreateSnapshot.go
+1 -1
View File
@@ -1,4 +1,4 @@
package gateway_ec2_snapshot
package snapshot
import (
"context"
spinifex/gateway/ec2/snapshot/DeleteSnapshot.go → spinifex/domains/ec2/awsapi/snapshot/DeleteSnapshot.go
+1 -1
View File
@@ -1,4 +1,4 @@
package gateway_ec2_snapshot
package snapshot
import (
"context"
spinifex/gateway/ec2/snapshot/DescribeSnapshots.go → spinifex/domains/ec2/awsapi/snapshot/DescribeSnapshots.go
+1 -1
View File
@@ -1,4 +1,4 @@
package gateway_ec2_snapshot
package snapshot
import (
"context"
spinifex/gateway/ec2/snapshot/Snapshot_test.go → spinifex/domains/ec2/awsapi/snapshot/Snapshot_test.go
+1 -1
View File
@@ -1,4 +1,4 @@
package gateway_ec2_snapshot
package snapshot
import (
"context"
spinifex/gateway/ec2.go
+5 -5
View File
@@ -24,6 +24,7 @@ import (
ec2natgwapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/natgw"
ec2placementgroupapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/placementgroup"
ec2routetableapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/routetable"
ec2snapshotapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/snapshot"
ec2vpcapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/vpc"
ec2zoneapi "github.com/mulgadc/spinifex/spinifex/domains/ec2/awsapi/zone"
"github.com/mulgadc/spinifex/spinifex/foundation/aws/errors"
@@ -31,7 +32,6 @@ import (
"github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency"
gateway_ec2 "github.com/mulgadc/spinifex/spinifex/gateway/ec2"
gateway_ec2_instance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/instance"
gateway_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/gateway/ec2/snapshot"
gateway_ec2_spotinstance "github.com/mulgadc/spinifex/spinifex/gateway/ec2/spotinstance"
gateway_ec2_tags "github.com/mulgadc/spinifex/spinifex/gateway/ec2/tags"
gateway_ec2_volume "github.com/mulgadc/spinifex/spinifex/gateway/ec2/volume"
@@ -398,16 +398,16 @@ var ec2Actions = map[string]ec2Action{
return gateway_ec2_tags.DescribeTags(ctx, input, gw.NATSConn, accountID)
}),
"CreateSnapshot": ec2Handler(func(ctx context.Context, input *ec2.CreateSnapshotInput, gw *GatewayConfig, accountID string) (any, error) {
return gateway_ec2_snapshot.CreateSnapshot(ctx, input, gw.NATSConn, accountID)
return ec2snapshotapi.CreateSnapshot(ctx, input, gw.NATSConn, accountID)
}),
"DeleteSnapshot": ec2Handler(func(ctx context.Context, input *ec2.DeleteSnapshotInput, gw *GatewayConfig, accountID string) (any, error) {
return gateway_ec2_snapshot.DeleteSnapshot(ctx, input, gw.NATSConn, accountID)
return ec2snapshotapi.DeleteSnapshot(ctx, input, gw.NATSConn, accountID)
}),
"DescribeSnapshots": ec2Handler(func(ctx context.Context, input *ec2.DescribeSnapshotsInput, gw *GatewayConfig, accountID string) (any, error) {
return gateway_ec2_snapshot.DescribeSnapshots(ctx, input, gw.NATSConn, accountID)
return ec2snapshotapi.DescribeSnapshots(ctx, input, gw.NATSConn, accountID)
}),
"CopySnapshot": ec2Handler(func(ctx context.Context, input *ec2.CopySnapshotInput, gw *GatewayConfig, accountID string) (any, error) {
return gateway_ec2_snapshot.CopySnapshot(ctx, input, gw.NATSConn, accountID)
return ec2snapshotapi.CopySnapshot(ctx, input, gw.NATSConn, accountID)
}),
"CreateInternetGateway": ec2Handler(func(ctx context.Context, input *ec2.CreateInternetGatewayInput, gw *GatewayConfig, accountID string) (any, error) {
return ec2igwapi.CreateInternetGateway(ctx, input, gw.NATSConn, accountID)