diff --git a/cmd/spinifex/cmd/admin.go b/cmd/spinifex/cmd/admin.go index 3e389b22a..a8539ce1c 100644 --- a/cmd/spinifex/cmd/admin.go +++ b/cmd/spinifex/cmd/admin.go @@ -31,7 +31,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/formation" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" diff --git a/cmd/spinifex/cmd/admin_ochre.go b/cmd/spinifex/cmd/admin_ochre.go index 2424dd293..bec4b9986 100644 --- a/cmd/spinifex/cmd/admin_ochre.go +++ b/cmd/spinifex/cmd/admin_ochre.go @@ -20,7 +20,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/gateway/bedrock/hfhub" diff --git a/cmd/spinifex/cmd/admin_ochre_test.go b/cmd/spinifex/cmd/admin_ochre_test.go index 1cbd64275..9656bdefb 100644 --- a/cmd/spinifex/cmd/admin_ochre_test.go +++ b/cmd/spinifex/cmd/admin_ochre_test.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" diff --git a/cmd/spinifex/cmd/admin_test.go b/cmd/spinifex/cmd/admin_test.go index c18bbfd2c..46d9d0385 100644 --- a/cmd/spinifex/cmd/admin_test.go +++ b/cmd/spinifex/cmd/admin_test.go @@ -17,7 +17,7 @@ import ( nsconfig "github.com/mulgadc/northstar/pkg/config" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/formation" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" diff --git a/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go b/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go index 91a4e3131..7da60abe8 100644 --- a/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go +++ b/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" diff --git a/spinifex/admin/images_promote.go b/spinifex/admin/images_promote.go index 4e0aaf52b..7729aa4b6 100644 --- a/spinifex/admin/images_promote.go +++ b/spinifex/admin/images_promote.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/admin/images_promote_test.go b/spinifex/admin/images_promote_test.go index a86e65808..cbc1dec04 100644 --- a/spinifex/admin/images_promote_test.go +++ b/spinifex/admin/images_promote_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" diff --git a/spinifex/admin/images_remove.go b/spinifex/admin/images_remove.go index 8f7889d5c..dc8e67b78 100644 --- a/spinifex/admin/images_remove.go +++ b/spinifex/admin/images_remove.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/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/admin/images_remove_test.go b/spinifex/admin/images_remove_test.go index 078c7ba78..86beb61bd 100644 --- a/spinifex/admin/images_remove_test.go +++ b/spinifex/admin/images_remove_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/admin/orphan_volumes.go b/spinifex/admin/orphan_volumes.go index d903e832e..442546ca6 100644 --- a/spinifex/admin/orphan_volumes.go +++ b/spinifex/admin/orphan_volumes.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" ) diff --git a/spinifex/admin/orphan_volumes_test.go b/spinifex/admin/orphan_volumes_test.go index 54e857fb8..4934e66cc 100644 --- a/spinifex/admin/orphan_volumes_test.go +++ b/spinifex/admin/orphan_volumes_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_handlers_test.go b/spinifex/daemon/daemon_handlers_test.go index d03a6e2fd..9a6d56386 100644 --- a/spinifex/daemon/daemon_handlers_test.go +++ b/spinifex/daemon/daemon_handlers_test.go @@ -18,7 +18,7 @@ import ( awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account" handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" diff --git a/spinifex/daemon/daemon_handlers_volume_test.go b/spinifex/daemon/daemon_handlers_volume_test.go index ae21e640d..b9d72b3a3 100644 --- a/spinifex/daemon/daemon_handlers_volume_test.go +++ b/spinifex/daemon/daemon_handlers_volume_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" diff --git a/spinifex/daemon/daemon_test.go b/spinifex/daemon/daemon_test.go index 1f2188430..17f878475 100644 --- a/spinifex/daemon/daemon_test.go +++ b/spinifex/daemon/daemon_test.go @@ -31,7 +31,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "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/domains/ec2/ebs/metadata" handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account" handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw" handlers_ec2_eip "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eip" diff --git a/spinifex/ebsmetadata/metadata.go b/spinifex/domains/ec2/ebs/metadata/metadata.go similarity index 100% rename from spinifex/ebsmetadata/metadata.go rename to spinifex/domains/ec2/ebs/metadata/metadata.go diff --git a/spinifex/ebsmetadata/metadata_test.go b/spinifex/domains/ec2/ebs/metadata/metadata_test.go similarity index 100% rename from spinifex/ebsmetadata/metadata_test.go rename to spinifex/domains/ec2/ebs/metadata/metadata_test.go diff --git a/spinifex/ebsmetadata/snapshot_store_test.go b/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go similarity index 99% rename from spinifex/ebsmetadata/snapshot_store_test.go rename to spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go index 553b0cda7..bc764f39c 100644 --- a/spinifex/ebsmetadata/snapshot_store_test.go +++ b/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - . "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + . "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsmetadata/store.go b/spinifex/domains/ec2/ebs/metadata/store.go similarity index 100% rename from spinifex/ebsmetadata/store.go rename to spinifex/domains/ec2/ebs/metadata/store.go diff --git a/spinifex/ebsmetadata/store_test.go b/spinifex/domains/ec2/ebs/metadata/store_test.go similarity index 100% rename from spinifex/ebsmetadata/store_test.go rename to spinifex/domains/ec2/ebs/metadata/store_test.go diff --git a/spinifex/gateway/ec2/instance/RunInstances_test.go b/spinifex/gateway/ec2/instance/RunInstances_test.go index abcbde7b5..288b4d6fe 100644 --- a/spinifex/gateway/ec2/instance/RunInstances_test.go +++ b/spinifex/gateway/ec2/instance/RunInstances_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/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/ami_source_volume_test.go b/spinifex/handlers/ec2/image/ami_source_volume_test.go index 818bf7717..95c36c132 100644 --- a/spinifex/handlers/ec2/image/ami_source_volume_test.go +++ b/spinifex/handlers/ec2/image/ami_source_volume_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/describe_byid_test.go b/spinifex/handlers/ec2/image/describe_byid_test.go index 7be7db1a7..049596882 100644 --- a/spinifex/handlers/ec2/image/describe_byid_test.go +++ b/spinifex/handlers/ec2/image/describe_byid_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/recordingstore" diff --git a/spinifex/handlers/ec2/image/provider_snapshot_test.go b/spinifex/handlers/ec2/image/provider_snapshot_test.go index 4dc9c631c..67cfb2c30 100644 --- a/spinifex/handlers/ec2/image/provider_snapshot_test.go +++ b/spinifex/handlers/ec2/image/provider_snapshot_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/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/image/provider_test.go b/spinifex/handlers/ec2/image/provider_test.go index 1a4de4d93..b5f223703 100644 --- a/spinifex/handlers/ec2/image/provider_test.go +++ b/spinifex/handlers/ec2/image/provider_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" awss3 "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/image/service_impl.go b/spinifex/handlers/ec2/image/service_impl.go index 07c6a14e0..17f2f57c6 100644 --- a/spinifex/handlers/ec2/image/service_impl.go +++ b/spinifex/handlers/ec2/image/service_impl.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" diff --git a/spinifex/handlers/ec2/image/service_impl_test.go b/spinifex/handlers/ec2/image/service_impl_test.go index ce3b1b6a3..452c51559 100644 --- a/spinifex/handlers/ec2/image/service_impl_test.go +++ b/spinifex/handlers/ec2/image/service_impl_test.go @@ -15,7 +15,7 @@ import ( awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/utils" diff --git a/spinifex/handlers/ec2/instance/data_volumes_test.go b/spinifex/handlers/ec2/instance/data_volumes_test.go index 524ed30ef..38d6bc795 100644 --- a/spinifex/handlers/ec2/instance/data_volumes_test.go +++ b/spinifex/handlers/ec2/instance/data_volumes_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/bluebottle/pkg/safecast" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" diff --git a/spinifex/handlers/ec2/instance/export_test.go b/spinifex/handlers/ec2/instance/export_test.go index e4a4185c6..a31a67836 100644 --- a/spinifex/handlers/ec2/instance/export_test.go +++ b/spinifex/handlers/ec2/instance/export_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" diff --git a/spinifex/handlers/ec2/instance/metadata_options_test.go b/spinifex/handlers/ec2/instance/metadata_options_test.go index 723ada5ac..0f0693707 100644 --- a/spinifex/handlers/ec2/instance/metadata_options_test.go +++ b/spinifex/handlers/ec2/instance/metadata_options_test.go @@ -8,7 +8,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/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" vmmock "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm/mock" diff --git a/spinifex/handlers/ec2/instance/provider_root_volume_test.go b/spinifex/handlers/ec2/instance/provider_root_volume_test.go index f517db118..dabcb0c75 100644 --- a/spinifex/handlers/ec2/instance/provider_root_volume_test.go +++ b/spinifex/handlers/ec2/instance/provider_root_volume_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" spxtypes "github.com/mulgadc/spinifex/spinifex/types" diff --git a/spinifex/handlers/ec2/instance/service.go b/spinifex/handlers/ec2/instance/service.go index 4e8794a46..32fdcbca4 100644 --- a/spinifex/handlers/ec2/instance/service.go +++ b/spinifex/handlers/ec2/instance/service.go @@ -4,7 +4,7 @@ import ( "context" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" ) diff --git a/spinifex/handlers/ec2/instance/service_impl.go b/spinifex/handlers/ec2/instance/service_impl.go index 051cc691b..6a4dd8575 100644 --- a/spinifex/handlers/ec2/instance/service_impl.go +++ b/spinifex/handlers/ec2/instance/service_impl.go @@ -20,7 +20,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "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/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" diff --git a/spinifex/handlers/ec2/instance/service_impl_test.go b/spinifex/handlers/ec2/instance/service_impl_test.go index a0af91a95..73f121739 100644 --- a/spinifex/handlers/ec2/instance/service_impl_test.go +++ b/spinifex/handlers/ec2/instance/service_impl_test.go @@ -16,7 +16,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "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/domains/ec2/ebs/metadata" 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" diff --git a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go index e96c2dbd9..ed6d061d2 100644 --- a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go +++ b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/internal/testkit/pagedstore" diff --git a/spinifex/handlers/ec2/snapshot/describe_byid_test.go b/spinifex/handlers/ec2/snapshot/describe_byid_test.go index 814a553d8..6ec821218 100644 --- a/spinifex/handlers/ec2/snapshot/describe_byid_test.go +++ b/spinifex/handlers/ec2/snapshot/describe_byid_test.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/recordingstore" diff --git a/spinifex/handlers/ec2/snapshot/describe_fanout_test.go b/spinifex/handlers/ec2/snapshot/describe_fanout_test.go index ac97d6b67..a0366e447 100644 --- a/spinifex/handlers/ec2/snapshot/describe_fanout_test.go +++ b/spinifex/handlers/ec2/snapshot/describe_fanout_test.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/snapshot/drain_test.go b/spinifex/handlers/ec2/snapshot/drain_test.go index aad3e814c..0e94e971b 100644 --- a/spinifex/handlers/ec2/snapshot/drain_test.go +++ b/spinifex/handlers/ec2/snapshot/drain_test.go @@ -12,7 +12,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/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/snapshot/service_impl.go b/spinifex/handlers/ec2/snapshot/service_impl.go index c70dd1616..aae4998c9 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl.go +++ b/spinifex/handlers/ec2/snapshot/service_impl.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" diff --git a/spinifex/handlers/ec2/snapshot/service_impl_test.go b/spinifex/handlers/ec2/snapshot/service_impl_test.go index 478c8edac..365f46618 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl_test.go +++ b/spinifex/handlers/ec2/snapshot/service_impl_test.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go index 6b949c0b7..4031b0413 100644 --- a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go +++ b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/recordingstore" diff --git a/spinifex/handlers/ec2/volume/config_route_invariants_test.go b/spinifex/handlers/ec2/volume/config_route_invariants_test.go index 6fd052674..333e94540 100644 --- a/spinifex/handlers/ec2/volume/config_route_invariants_test.go +++ b/spinifex/handlers/ec2/volume/config_route_invariants_test.go @@ -3,7 +3,7 @@ package handlers_ec2_volume import ( "testing" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/force_detach_test.go b/spinifex/handlers/ec2/volume/force_detach_test.go index 5fdbc4ba4..e9f98dd67 100644 --- a/spinifex/handlers/ec2/volume/force_detach_test.go +++ b/spinifex/handlers/ec2/volume/force_detach_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/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go b/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go index f2001de32..0336e1436 100644 --- a/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go +++ b/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go b/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go index 2cc2acce8..f7f949b0d 100644 --- a/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go +++ b/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/types" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go b/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go index 2ac4c35d9..215612776 100644 --- a/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go +++ b/spinifex/handlers/ec2/volume/provider_snapshot_source_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/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/volume/record_tags_test.go b/spinifex/handlers/ec2/volume/record_tags_test.go index 91676919d..a58c52106 100644 --- a/spinifex/handlers/ec2/volume/record_tags_test.go +++ b/spinifex/handlers/ec2/volume/record_tags_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/service_impl.go b/spinifex/handlers/ec2/volume/service_impl.go index 6d14736c9..af28b1cfd 100644 --- a/spinifex/handlers/ec2/volume/service_impl.go +++ b/spinifex/handlers/ec2/volume/service_impl.go @@ -17,7 +17,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" diff --git a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go b/spinifex/handlers/ec2/volume/service_impl_encryption_test.go index 5f59de49a..2adb0e98d 100644 --- a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_encryption_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/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/volume/service_impl_test.go b/spinifex/handlers/ec2/volume/service_impl_test.go index 2bc1d8b1c..c7469fbac 100644 --- a/spinifex/handlers/ec2/volume/service_impl_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_test.go @@ -14,7 +14,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/ebsprovider" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/volume/testhelpers_test.go b/spinifex/handlers/ec2/volume/testhelpers_test.go index ee5f49956..321009705 100644 --- a/spinifex/handlers/ec2/volume/testhelpers_test.go +++ b/spinifex/handlers/ec2/volume/testhelpers_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/volume/volume_partition_test.go b/spinifex/handlers/ec2/volume/volume_partition_test.go index 9b67d3976..21ec9098f 100644 --- a/spinifex/handlers/ec2/volume/volume_partition_test.go +++ b/spinifex/handlers/ec2/volume/volume_partition_test.go @@ -11,7 +11,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/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ecs/capacity.go b/spinifex/handlers/ecs/capacity.go index b293a0040..3cb5ce650 100644 --- a/spinifex/handlers/ecs/capacity.go +++ b/spinifex/handlers/ecs/capacity.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/domains/ec2/instancetypes" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/tags" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/eks/nodegroup.go b/spinifex/handlers/eks/nodegroup.go index 6db6e8e05..98a9d533c 100644 --- a/spinifex/handlers/eks/nodegroup.go +++ b/spinifex/handlers/eks/nodegroup.go @@ -23,7 +23,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/auth" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" - "github.com/mulgadc/spinifex/spinifex/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/nats-io/nats.go/jetstream" diff --git a/tests/integration/image_test.go b/tests/integration/image_test.go index e52ca0f2f..0db6364cb 100644 --- a/tests/integration/image_test.go +++ b/tests/integration/image_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/ebsmetadata" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/stretchr/testify/require" )