diff --git a/cmd/spinifex/cmd/admin.go b/cmd/spinifex/cmd/admin.go index a8539ce1c..41766d073 100644 --- a/cmd/spinifex/cmd/admin.go +++ b/cmd/spinifex/cmd/admin.go @@ -32,7 +32,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/formation" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" diff --git a/cmd/spinifex/cmd/admin_ochre.go b/cmd/spinifex/cmd/admin_ochre.go index bec4b9986..b9ad9e57b 100644 --- a/cmd/spinifex/cmd/admin_ochre.go +++ b/cmd/spinifex/cmd/admin_ochre.go @@ -21,7 +21,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/gateway/bedrock/hfhub" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/internal/testkit/ebsfake/ebsfake.go b/internal/testkit/ebsfake/ebsfake.go index cfe8345d4..c99ef5ea2 100644 --- a/internal/testkit/ebsfake/ebsfake.go +++ b/internal/testkit/ebsfake/ebsfake.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" ) diff --git a/spinifex/admin/image_import.go b/spinifex/admin/image_import.go index ed3dffef9..8a732309d 100644 --- a/spinifex/admin/image_import.go +++ b/spinifex/admin/image_import.go @@ -10,7 +10,7 @@ import ( "os/exec" "strconv" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/admin/image_import_test.go b/spinifex/admin/image_import_test.go index b4fe77f00..f0f79a713 100644 --- a/spinifex/admin/image_import_test.go +++ b/spinifex/admin/image_import_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "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 442546ca6..9c0368263 100644 --- a/spinifex/admin/orphan_volumes.go +++ b/spinifex/admin/orphan_volumes.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" ) // efiVolumeSuffix marks a volume derived from another one. An EFI variable diff --git a/spinifex/admin/orphan_volumes_test.go b/spinifex/admin/orphan_volumes_test.go index 4934e66cc..3655bc385 100644 --- a/spinifex/admin/orphan_volumes_test.go +++ b/spinifex/admin/orphan_volumes_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/daemon.go b/spinifex/daemon/daemon.go index ac8a60d5f..cf71e4c8e 100644 --- a/spinifex/daemon/daemon.go +++ b/spinifex/daemon/daemon.go @@ -35,7 +35,7 @@ import ( "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" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_acm "github.com/mulgadc/spinifex/spinifex/handlers/acm" handlers_bedrock "github.com/mulgadc/spinifex/spinifex/handlers/bedrock" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" diff --git a/spinifex/daemon/daemon_handlers_volume_test.go b/spinifex/daemon/daemon_handlers_volume_test.go index b9d72b3a3..8a673ade2 100644 --- a/spinifex/daemon/daemon_handlers_volume_test.go +++ b/spinifex/daemon/daemon_handlers_volume_test.go @@ -12,7 +12,7 @@ import ( "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" "github.com/mulgadc/spinifex/internal/testkit" diff --git a/spinifex/handlers/ec2/image/provider_snapshot_test.go b/spinifex/handlers/ec2/image/provider_snapshot_test.go index 67cfb2c30..0c71c1259 100644 --- a/spinifex/handlers/ec2/image/provider_snapshot_test.go +++ b/spinifex/handlers/ec2/image/provider_snapshot_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/provider_test.go b/spinifex/handlers/ec2/image/provider_test.go index b5f223703..c5eed6ea2 100644 --- a/spinifex/handlers/ec2/image/provider_test.go +++ b/spinifex/handlers/ec2/image/provider_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/service_impl.go b/spinifex/handlers/ec2/image/service_impl.go index 17f2f57c6..29d5cb41d 100644 --- a/spinifex/handlers/ec2/image/service_impl.go +++ b/spinifex/handlers/ec2/image/service_impl.go @@ -17,7 +17,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/instance/data_volumes_test.go b/spinifex/handlers/ec2/instance/data_volumes_test.go index 38d6bc795..d4e750d0f 100644 --- a/spinifex/handlers/ec2/instance/data_volumes_test.go +++ b/spinifex/handlers/ec2/instance/data_volumes_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/instance/export_test.go b/spinifex/handlers/ec2/instance/export_test.go index a31a67836..af3096d0e 100644 --- a/spinifex/handlers/ec2/instance/export_test.go +++ b/spinifex/handlers/ec2/instance/export_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" ) diff --git a/spinifex/handlers/ec2/instance/provider_efi_volume_test.go b/spinifex/handlers/ec2/instance/provider_efi_volume_test.go index 843564f7d..a5835bb5c 100644 --- a/spinifex/handlers/ec2/instance/provider_efi_volume_test.go +++ b/spinifex/handlers/ec2/instance/provider_efi_volume_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/instance/provider_root_volume_test.go b/spinifex/handlers/ec2/instance/provider_root_volume_test.go index dabcb0c75..68bcac8b1 100644 --- a/spinifex/handlers/ec2/instance/provider_root_volume_test.go +++ b/spinifex/handlers/ec2/instance/provider_root_volume_test.go @@ -12,7 +12,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" spxtypes "github.com/mulgadc/spinifex/spinifex/types" "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 6a4dd8575..d0bc9e47f 100644 --- a/spinifex/handlers/ec2/instance/service_impl.go +++ b/spinifex/handlers/ec2/instance/service_impl.go @@ -21,7 +21,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" 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" diff --git a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go index ed6d061d2..7b20ab123 100644 --- a/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go +++ b/spinifex/handlers/ec2/snapshot/delete_snapshot_pagination_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" "github.com/mulgadc/spinifex/internal/testkit/pagedstore" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/snapshot/drain_test.go b/spinifex/handlers/ec2/snapshot/drain_test.go index 0e94e971b..b94e754c7 100644 --- a/spinifex/handlers/ec2/snapshot/drain_test.go +++ b/spinifex/handlers/ec2/snapshot/drain_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" diff --git a/spinifex/handlers/ec2/snapshot/service_impl.go b/spinifex/handlers/ec2/snapshot/service_impl.go index aae4998c9..339b5ebfd 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl.go +++ b/spinifex/handlers/ec2/snapshot/service_impl.go @@ -19,7 +19,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" "github.com/mulgadc/spinifex/spinifex/kvstore" diff --git a/spinifex/handlers/ec2/snapshot/service_impl_test.go b/spinifex/handlers/ec2/snapshot/service_impl_test.go index 365f46618..a19c5d7cf 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl_test.go +++ b/spinifex/handlers/ec2/snapshot/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/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/kvstore" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" diff --git a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go index 4031b0413..a15d611fb 100644 --- a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go +++ b/spinifex/handlers/ec2/snapshot/snapshot_partition_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/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "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/volume/describe_volumes_provider_bench_test.go b/spinifex/handlers/ec2/volume/describe_volumes_provider_bench_test.go index 6444cc1d7..16e299f07 100644 --- a/spinifex/handlers/ec2/volume/describe_volumes_provider_bench_test.go +++ b/spinifex/handlers/ec2/volume/describe_volumes_provider_bench_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/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" ) // silenceLogs discards slog output for the duration of a benchmark's timed diff --git a/spinifex/handlers/ec2/volume/describe_volumes_provider_fastpath_test.go b/spinifex/handlers/ec2/volume/describe_volumes_provider_fastpath_test.go index ab9668987..83e0cdf7a 100644 --- a/spinifex/handlers/ec2/volume/describe_volumes_provider_fastpath_test.go +++ b/spinifex/handlers/ec2/volume/describe_volumes_provider_fastpath_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/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "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 e9f98dd67..c7e3a407a 100644 --- a/spinifex/handlers/ec2/volume/force_detach_test.go +++ b/spinifex/handlers/ec2/volume/force_detach_test.go @@ -11,7 +11,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/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "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 0336e1436..e1f737096 100644 --- a/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go +++ b/spinifex/handlers/ec2/volume/get_volume_metadata_provider_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go b/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go index 215612776..cc32aa258 100644 --- a/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go +++ b/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" "github.com/mulgadc/spinifex/spinifex/objectstore" spxtypes "github.com/mulgadc/spinifex/spinifex/types" diff --git a/spinifex/handlers/ec2/volume/service_impl.go b/spinifex/handlers/ec2/volume/service_impl.go index af28b1cfd..8756ddf51 100644 --- a/spinifex/handlers/ec2/volume/service_impl.go +++ b/spinifex/handlers/ec2/volume/service_impl.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" "github.com/mulgadc/spinifex/spinifex/objectstore" diff --git a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go b/spinifex/handlers/ec2/volume/service_impl_encryption_test.go index 2adb0e98d..67d79ee79 100644 --- a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_encryption_test.go @@ -10,7 +10,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "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_test.go b/spinifex/handlers/ec2/volume/service_impl_test.go index c7469fbac..b8916eb0a 100644 --- a/spinifex/handlers/ec2/volume/service_impl_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" diff --git a/spinifex/ebsprovider/conformance/bench.go b/spinifex/providers/ebs/conformance/bench.go similarity index 99% rename from spinifex/ebsprovider/conformance/bench.go rename to spinifex/providers/ebs/conformance/bench.go index ad9b7e513..39a37826a 100644 --- a/spinifex/ebsprovider/conformance/bench.go +++ b/spinifex/providers/ebs/conformance/bench.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" ) // defaultBenchVolumeBytes is the size a benchmarked volume is created at when diff --git a/spinifex/ebsprovider/conformance/bench_test.go b/spinifex/providers/ebs/conformance/bench_test.go similarity index 81% rename from spinifex/ebsprovider/conformance/bench_test.go rename to spinifex/providers/ebs/conformance/bench_test.go index f7f950724..127c986c4 100644 --- a/spinifex/ebsprovider/conformance/bench_test.go +++ b/spinifex/providers/ebs/conformance/bench_test.go @@ -3,10 +3,10 @@ package conformance_test import ( "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/nullprovider" ) // BenchmarkNullProvider_InProcess prices the contract with no transport and no diff --git a/spinifex/ebsprovider/conformance/conformance.go b/spinifex/providers/ebs/conformance/conformance.go similarity index 99% rename from spinifex/ebsprovider/conformance/conformance.go rename to spinifex/providers/ebs/conformance/conformance.go index 07af7ea02..82c0942d8 100644 --- a/spinifex/ebsprovider/conformance/conformance.go +++ b/spinifex/providers/ebs/conformance/conformance.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/conformance/conformance_test.go b/spinifex/providers/ebs/conformance/conformance_test.go similarity index 94% rename from spinifex/ebsprovider/conformance/conformance_test.go rename to spinifex/providers/ebs/conformance/conformance_test.go index 4748c50ed..eed8f6f7e 100644 --- a/spinifex/ebsprovider/conformance/conformance_test.go +++ b/spinifex/providers/ebs/conformance/conformance_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/conformance/datapath.go b/spinifex/providers/ebs/conformance/datapath.go similarity index 99% rename from spinifex/ebsprovider/conformance/datapath.go rename to spinifex/providers/ebs/conformance/datapath.go index 8c9e78e44..b6d351d1a 100644 --- a/spinifex/ebsprovider/conformance/datapath.go +++ b/spinifex/providers/ebs/conformance/datapath.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/conformance/nbdclient.go b/spinifex/providers/ebs/conformance/nbdclient.go similarity index 99% rename from spinifex/ebsprovider/conformance/nbdclient.go rename to spinifex/providers/ebs/conformance/nbdclient.go index 488a8283a..0dee84eb0 100644 --- a/spinifex/ebsprovider/conformance/nbdclient.go +++ b/spinifex/providers/ebs/conformance/nbdclient.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsprovider/conformance/tracking.go b/spinifex/providers/ebs/conformance/tracking.go similarity index 98% rename from spinifex/ebsprovider/conformance/tracking.go rename to spinifex/providers/ebs/conformance/tracking.go index 101d13243..f5b7faeb5 100644 --- a/spinifex/ebsprovider/conformance/tracking.go +++ b/spinifex/providers/ebs/conformance/tracking.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" ) // trackingProvider delegates every call to the provider under test and records diff --git a/spinifex/ebsprovider/errors.go b/spinifex/providers/ebs/errors.go similarity index 100% rename from spinifex/ebsprovider/errors.go rename to spinifex/providers/ebs/errors.go diff --git a/spinifex/ebsprovider/errors_test.go b/spinifex/providers/ebs/errors_test.go similarity index 100% rename from spinifex/ebsprovider/errors_test.go rename to spinifex/providers/ebs/errors_test.go diff --git a/spinifex/ebsprovider/hostile/hostile.go b/spinifex/providers/ebs/hostile/hostile.go similarity index 99% rename from spinifex/ebsprovider/hostile/hostile.go rename to spinifex/providers/ebs/hostile/hostile.go index d9fc35d5c..1d248a98c 100644 --- a/spinifex/ebsprovider/hostile/hostile.go +++ b/spinifex/providers/ebs/hostile/hostile.go @@ -17,7 +17,7 @@ import ( "sync" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/nats-io/nats.go" ) diff --git a/spinifex/ebsprovider/hostile/hostile_test.go b/spinifex/providers/ebs/hostile/hostile_test.go similarity index 97% rename from spinifex/ebsprovider/hostile/hostile_test.go rename to spinifex/providers/ebs/hostile/hostile_test.go index 0195d1b0c..d06dbbea1 100644 --- a/spinifex/ebsprovider/hostile/hostile_test.go +++ b/spinifex/providers/ebs/hostile/hostile_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/hostile" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/hostile" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/nullprovider" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsprovider/hostile/soak_test.go b/spinifex/providers/ebs/hostile/soak_test.go similarity index 97% rename from spinifex/ebsprovider/hostile/soak_test.go rename to spinifex/providers/ebs/hostile/soak_test.go index 248322ac9..1c7db6871 100644 --- a/spinifex/ebsprovider/hostile/soak_test.go +++ b/spinifex/providers/ebs/hostile/soak_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/hostile" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/hostile" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/nullprovider" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/hostile/verbs.go b/spinifex/providers/ebs/hostile/verbs.go similarity index 99% rename from spinifex/ebsprovider/hostile/verbs.go rename to spinifex/providers/ebs/hostile/verbs.go index aabad533e..0b349cd0f 100644 --- a/spinifex/ebsprovider/hostile/verbs.go +++ b/spinifex/providers/ebs/hostile/verbs.go @@ -3,7 +3,7 @@ package hostile import ( "context" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" ) // Verb names match the span names the contract emits, so an injection log and diff --git a/spinifex/ebsprovider/memory.go b/spinifex/providers/ebs/memory.go similarity index 100% rename from spinifex/ebsprovider/memory.go rename to spinifex/providers/ebs/memory.go diff --git a/spinifex/ebsprovider/memory_test.go b/spinifex/providers/ebs/memory_test.go similarity index 100% rename from spinifex/ebsprovider/memory_test.go rename to spinifex/providers/ebs/memory_test.go diff --git a/spinifex/ebsprovider/nats.go b/spinifex/providers/ebs/nats.go similarity index 100% rename from spinifex/ebsprovider/nats.go rename to spinifex/providers/ebs/nats.go diff --git a/spinifex/ebsprovider/nats_test.go b/spinifex/providers/ebs/nats_test.go similarity index 100% rename from spinifex/ebsprovider/nats_test.go rename to spinifex/providers/ebs/nats_test.go diff --git a/spinifex/ebsprovider/natsserve/classify_test.go b/spinifex/providers/ebs/natsserve/classify_test.go similarity index 96% rename from spinifex/ebsprovider/natsserve/classify_test.go rename to spinifex/providers/ebs/natsserve/classify_test.go index 0092c9f82..5f92c958b 100644 --- a/spinifex/ebsprovider/natsserve/classify_test.go +++ b/spinifex/providers/ebs/natsserve/classify_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" ) diff --git a/spinifex/ebsprovider/natsserve/handlers_test.go b/spinifex/providers/ebs/natsserve/handlers_test.go similarity index 99% rename from spinifex/ebsprovider/natsserve/handlers_test.go rename to spinifex/providers/ebs/natsserve/handlers_test.go index 924cd621f..58b9305eb 100644 --- a/spinifex/ebsprovider/natsserve/handlers_test.go +++ b/spinifex/providers/ebs/natsserve/handlers_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/ebsprovider/natsserve/server.go b/spinifex/providers/ebs/natsserve/server.go similarity index 99% rename from spinifex/ebsprovider/natsserve/server.go rename to spinifex/providers/ebs/natsserve/server.go index 492d5d0ce..3c817bb16 100644 --- a/spinifex/ebsprovider/natsserve/server.go +++ b/spinifex/providers/ebs/natsserve/server.go @@ -1,5 +1,5 @@ // Package natsserve is the provider-neutral NATS server for the -// ebs.provider.v1.* wire contract defined by spinifex/ebsprovider. It +// ebs.provider.v1.* wire contract defined by spinifex/providers/ebs. It // depends on nothing but the ebsprovider.EBSProvider interface, so any implementation of that interface can be served over NATS by calling Serve. package natsserve @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/nats-io/nats.go" "go.opentelemetry.io/otel/trace" ) @@ -56,7 +56,7 @@ func traced(base context.Context, handler msgHandler) nats.MsgHandler { } } -// Serve subscribes every subject spinifex/ebsprovider/nats.go defines, +// Serve subscribes every subject spinifex/providers/ebs/nats.go defines, // except owner-routed subjects (see the comment in the function body), and // delegates each to provider. The returned stop function unsubscribes everything Serve registered; it is safe to call more than once. func Serve(ctx context.Context, nc *nats.Conn, provider ebsprovider.EBSProvider, opts Options) (stop func(), err error) { diff --git a/spinifex/ebsprovider/natsserve/server_test.go b/spinifex/providers/ebs/natsserve/server_test.go similarity index 96% rename from spinifex/ebsprovider/natsserve/server_test.go rename to spinifex/providers/ebs/natsserve/server_test.go index 4fa47c232..6462a27c6 100644 --- a/spinifex/ebsprovider/natsserve/server_test.go +++ b/spinifex/providers/ebs/natsserve/server_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" diff --git a/spinifex/ebsprovider/nullprovider/nullprovider.go b/spinifex/providers/ebs/nullprovider/nullprovider.go similarity index 95% rename from spinifex/ebsprovider/nullprovider/nullprovider.go rename to spinifex/providers/ebs/nullprovider/nullprovider.go index dca4db537..94fe94168 100644 --- a/spinifex/ebsprovider/nullprovider/nullprovider.go +++ b/spinifex/providers/ebs/nullprovider/nullprovider.go @@ -13,8 +13,8 @@ import ( "context" "fmt" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/nats-io/nats.go" ) diff --git a/spinifex/ebsprovider/nullprovider/nullprovider_test.go b/spinifex/providers/ebs/nullprovider/nullprovider_test.go similarity index 93% rename from spinifex/ebsprovider/nullprovider/nullprovider_test.go rename to spinifex/providers/ebs/nullprovider/nullprovider_test.go index 1ecf73690..6b005da33 100644 --- a/spinifex/ebsprovider/nullprovider/nullprovider_test.go +++ b/spinifex/providers/ebs/nullprovider/nullprovider_test.go @@ -3,10 +3,10 @@ package nullprovider_test import ( "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/nullprovider" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/nullprovider" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/paging.go b/spinifex/providers/ebs/paging.go similarity index 100% rename from spinifex/ebsprovider/paging.go rename to spinifex/providers/ebs/paging.go diff --git a/spinifex/ebsprovider/paging_test.go b/spinifex/providers/ebs/paging_test.go similarity index 98% rename from spinifex/ebsprovider/paging_test.go rename to spinifex/providers/ebs/paging_test.go index b227b6b7e..0c8886f74 100644 --- a/spinifex/ebsprovider/paging_test.go +++ b/spinifex/providers/ebs/paging_test.go @@ -3,7 +3,7 @@ package ebsprovider_test import ( "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/ebsprovider/provider.go b/spinifex/providers/ebs/provider.go similarity index 100% rename from spinifex/ebsprovider/provider.go rename to spinifex/providers/ebs/provider.go diff --git a/spinifex/ebsprovider/telemetry.go b/spinifex/providers/ebs/telemetry.go similarity index 97% rename from spinifex/ebsprovider/telemetry.go rename to spinifex/providers/ebs/telemetry.go index 22e9beb0d..403119b96 100644 --- a/spinifex/ebsprovider/telemetry.go +++ b/spinifex/providers/ebs/telemetry.go @@ -15,6 +15,9 @@ import ( "go.opentelemetry.io/otel/trace" ) +// tracerName is the stable instrumentation scope for EBS-provider traces. +// It intentionally survives this package relocation so existing dashboards +// and alerts do not split their trace series. const tracerName = "github.com/mulgadc/spinifex/spinifex/ebsprovider" // spanNamePrefix puts provider spans in the same namespace as the ebs.mount diff --git a/spinifex/ebsprovider/telemetry_test.go b/spinifex/providers/ebs/telemetry_test.go similarity index 100% rename from spinifex/ebsprovider/telemetry_test.go rename to spinifex/providers/ebs/telemetry_test.go diff --git a/spinifex/services/qemunbdd/bench_test.go b/spinifex/services/qemunbdd/bench_test.go index d64c3bbea..aab11dddd 100644 --- a/spinifex/services/qemunbdd/bench_test.go +++ b/spinifex/services/qemunbdd/bench_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/qemunbdd/conformance_test.go b/spinifex/services/qemunbdd/conformance_test.go index 11e9e56b7..8d8e50a4d 100644 --- a/spinifex/services/qemunbdd/conformance_test.go +++ b/spinifex/services/qemunbdd/conformance_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/mulgadc/spinifex/spinifex/services/qemunbdd" "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/require" diff --git a/spinifex/services/qemunbdd/live_lifecycle_test.go b/spinifex/services/qemunbdd/live_lifecycle_test.go index 1e8e9afc4..7846a7c23 100644 --- a/spinifex/services/qemunbdd/live_lifecycle_test.go +++ b/spinifex/services/qemunbdd/live_lifecycle_test.go @@ -15,7 +15,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/qemunbdd/provider.go b/spinifex/services/qemunbdd/provider.go index 80551a26f..0a1f1a996 100644 --- a/spinifex/services/qemunbdd/provider.go +++ b/spinifex/services/qemunbdd/provider.go @@ -15,7 +15,7 @@ import ( "sync" "syscall" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/services/qemunbdd/provider_test.go b/spinifex/services/qemunbdd/provider_test.go index cc46ce31f..7e3a6c42c 100644 --- a/spinifex/services/qemunbdd/provider_test.go +++ b/spinifex/services/qemunbdd/provider_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/qemunbdd/service.go b/spinifex/services/qemunbdd/service.go index 9a1e02dcb..a4a27c1b4 100644 --- a/spinifex/services/qemunbdd/service.go +++ b/spinifex/services/qemunbdd/service.go @@ -9,7 +9,7 @@ import ( "syscall" "github.com/mulgadc/spinifex/spinifex/admin" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/natsserve" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/natsserve" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/services/qemunbdd/service_test.go b/spinifex/services/qemunbdd/service_test.go index dd5295595..afe0aa171 100644 --- a/spinifex/services/qemunbdd/service_test.go +++ b/spinifex/services/qemunbdd/service_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/internal/testkit" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/services/viperblockd/conformance_test.go b/spinifex/services/viperblockd/conformance_test.go index d4885ef68..17a86ec30 100644 --- a/spinifex/services/viperblockd/conformance_test.go +++ b/spinifex/services/viperblockd/conformance_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" "github.com/mulgadc/spinifex/spinifex/types" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" ) diff --git a/spinifex/services/viperblockd/create_local_state_test.go b/spinifex/services/viperblockd/create_local_state_test.go index bcd952347..6016de294 100644 --- a/spinifex/services/viperblockd/create_local_state_test.go +++ b/spinifex/services/viperblockd/create_local_state_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/viperblockd/live_bench_test.go b/spinifex/services/viperblockd/live_bench_test.go index f0400f111..b52d53a39 100644 --- a/spinifex/services/viperblockd/live_bench_test.go +++ b/spinifex/services/viperblockd/live_bench_test.go @@ -5,7 +5,7 @@ package viperblockd_test import ( "testing" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" ) // BenchmarkLive_Viperblockd runs the same suite the null and qemunbdd diff --git a/spinifex/services/viperblockd/live_datapath_test.go b/spinifex/services/viperblockd/live_datapath_test.go index 65b51bc19..7114593ad 100644 --- a/spinifex/services/viperblockd/live_datapath_test.go +++ b/spinifex/services/viperblockd/live_datapath_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" ) // TestLive_ViperblockdDataPath drives qemu-img bench against the published diff --git a/spinifex/services/viperblockd/live_nbdclient_test.go b/spinifex/services/viperblockd/live_nbdclient_test.go index a8dfbd1f4..97c693859 100644 --- a/spinifex/services/viperblockd/live_nbdclient_test.go +++ b/spinifex/services/viperblockd/live_nbdclient_test.go @@ -11,8 +11,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" - "github.com/mulgadc/spinifex/spinifex/ebsprovider/conformance" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/ebs/conformance" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/viperblockd/nbdkit_recovery_test.go b/spinifex/services/viperblockd/nbdkit_recovery_test.go index dd8ccbab6..adee3159c 100644 --- a/spinifex/services/viperblockd/nbdkit_recovery_test.go +++ b/spinifex/services/viperblockd/nbdkit_recovery_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/mulgadc/viperblock/viperblock" "github.com/stretchr/testify/assert" diff --git a/spinifex/services/viperblockd/provider_handlers.go b/spinifex/services/viperblockd/provider_handlers.go index 3efb59110..18c1a69b3 100644 --- a/spinifex/services/viperblockd/provider_handlers.go +++ b/spinifex/services/viperblockd/provider_handlers.go @@ -17,7 +17,7 @@ import ( awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/bluebottle/pkg/safecast" "github.com/mulgadc/spinifex/spinifex/admin" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/nbd" "github.com/mulgadc/spinifex/spinifex/types" diff --git a/spinifex/services/viperblockd/provider_handlers_invariants_test.go b/spinifex/services/viperblockd/provider_handlers_invariants_test.go index 67acd50e6..7e72c8222 100644 --- a/spinifex/services/viperblockd/provider_handlers_invariants_test.go +++ b/spinifex/services/viperblockd/provider_handlers_invariants_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/viperblockd/provider_handlers_test.go b/spinifex/services/viperblockd/provider_handlers_test.go index 695193e33..c0724f568 100644 --- a/spinifex/services/viperblockd/provider_handlers_test.go +++ b/spinifex/services/viperblockd/provider_handlers_test.go @@ -25,7 +25,7 @@ import ( awssdk "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/viperblock/viperblock" "github.com/nats-io/nats.go" diff --git a/spinifex/services/viperblockd/provider_tracing_test.go b/spinifex/services/viperblockd/provider_tracing_test.go index e2582ce16..2b17ae67f 100644 --- a/spinifex/services/viperblockd/provider_tracing_test.go +++ b/spinifex/services/viperblockd/provider_tracing_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/mulgadc/spinifex/internal/testkit" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/services/viperblockd/volume_lease_test.go b/spinifex/services/viperblockd/volume_lease_test.go index 4aee0012b..e68f14f8a 100644 --- a/spinifex/services/viperblockd/volume_lease_test.go +++ b/spinifex/services/viperblockd/volume_lease_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/tests/integration/volume_daemon_lite.go b/tests/integration/volume_daemon_lite.go index 3abcc1637..56a657ca5 100644 --- a/tests/integration/volume_daemon_lite.go +++ b/tests/integration/volume_daemon_lite.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/ebsprovider" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume" "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/services/viperblockd"