diff --git a/cmd/spinifex/cmd/admin.go b/cmd/spinifex/cmd/admin.go index 84de4dc34..90873e747 100644 --- a/cmd/spinifex/cmd/admin.go +++ b/cmd/spinifex/cmd/admin.go @@ -33,13 +33,13 @@ import ( "github.com/mulgadc/spinifex/spinifex/clustersize" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/runtime/formation" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/network/host" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" + "github.com/mulgadc/spinifex/spinifex/runtime/formation" "github.com/mulgadc/spinifex/spinifex/runtime/host/dns" "github.com/mulgadc/spinifex/spinifex/services/viperblockd/vbwire" "github.com/mulgadc/spinifex/spinifex/utils" diff --git a/cmd/spinifex/cmd/admin_account_delete.go b/cmd/spinifex/cmd/admin_account_delete.go index aa4a00395..806a93faa 100644 --- a/cmd/spinifex/cmd/admin_account_delete.go +++ b/cmd/spinifex/cmd/admin_account_delete.go @@ -11,7 +11,7 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/accountteardown" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/spf13/cobra" ) diff --git a/cmd/spinifex/cmd/admin_ochre.go b/cmd/spinifex/cmd/admin_ochre.go index 1b2df561e..b460e46b1 100644 --- a/cmd/spinifex/cmd/admin_ochre.go +++ b/cmd/spinifex/cmd/admin_ochre.go @@ -21,10 +21,10 @@ 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/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" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/cmd/spinifex/cmd/admin_ochre_pull_test.go b/cmd/spinifex/cmd/admin_ochre_pull_test.go index 0c0fd8588..c5b1affdf 100644 --- a/cmd/spinifex/cmd/admin_ochre_pull_test.go +++ b/cmd/spinifex/cmd/admin_ochre_pull_test.go @@ -15,13 +15,13 @@ import ( "time" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" "github.com/mulgadc/spinifex/spinifex/gateway/bedrock/hfhub" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/spf13/cobra" diff --git a/cmd/spinifex/cmd/admin_ochre_test.go b/cmd/spinifex/cmd/admin_ochre_test.go index 14533b16a..0c3a805dd 100644 --- a/cmd/spinifex/cmd/admin_ochre_test.go +++ b/cmd/spinifex/cmd/admin_ochre_test.go @@ -14,11 +14,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/config" "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" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/spf13/cobra" diff --git a/cmd/spinifex/cmd/admin_upgrade.go b/cmd/spinifex/cmd/admin_upgrade.go index 3182550b9..559e322c7 100644 --- a/cmd/spinifex/cmd/admin_upgrade.go +++ b/cmd/spinifex/cmd/admin_upgrade.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" + "github.com/mulgadc/spinifex/spinifex/migrate" "github.com/mulgadc/spinifex/spinifex/operator/host/systemd" "github.com/spf13/cobra" diff --git a/cmd/spinifex/cmd/admin_upgrade_test.go b/cmd/spinifex/cmd/admin_upgrade_test.go index 0a68befff..1e6689121 100644 --- a/cmd/spinifex/cmd/admin_upgrade_test.go +++ b/cmd/spinifex/cmd/admin_upgrade_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" + "github.com/mulgadc/spinifex/spinifex/migrate" "github.com/mulgadc/spinifex/spinifex/operator/host/systemd" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/cmd/spinifex/cmd/nats_server_name_test.go b/cmd/spinifex/cmd/nats_server_name_test.go index 435888659..c8d9512db 100644 --- a/cmd/spinifex/cmd/nats_server_name_test.go +++ b/cmd/spinifex/cmd/nats_server_name_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - natssvc "github.com/mulgadc/spinifex/spinifex/services/nats" + natssvc "github.com/mulgadc/spinifex/spinifex/runtime/roles/nats" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go b/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go index 7da60abe8..db5cea2c8 100644 --- a/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go +++ b/cmd/spinifex/cmd/register_imported_ami_snapshot_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/testkit/ebsfake/ebsfake.go b/internal/testkit/ebsfake/ebsfake.go index c99ef5ea2..36862c5fc 100644 --- a/internal/testkit/ebsfake/ebsfake.go +++ b/internal/testkit/ebsfake/ebsfake.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/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // Provider is ebsprovider.MemoryProvider plus the object-prefix delete diff --git a/internal/testkit/pagedstore/pagedstore.go b/internal/testkit/pagedstore/pagedstore.go index baa3f9ae4..c54f0f7bb 100644 --- a/internal/testkit/pagedstore/pagedstore.go +++ b/internal/testkit/pagedstore/pagedstore.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // Store wraps a MemoryObjectStore and splits ListObjectsV2's answer into diff --git a/internal/testkit/recordingstore/recordingstore.go b/internal/testkit/recordingstore/recordingstore.go index 0ea0b370f..ac97823bf 100644 --- a/internal/testkit/recordingstore/recordingstore.go +++ b/internal/testkit/recordingstore/recordingstore.go @@ -13,7 +13,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // Store wraps a MemoryObjectStore, appending to Gets and ListPrefixes before diff --git a/internal/testkit/vbscan/vbscan.go b/internal/testkit/vbscan/vbscan.go index 0061d1a99..e6d193904 100644 --- a/internal/testkit/vbscan/vbscan.go +++ b/internal/testkit/vbscan/vbscan.go @@ -49,7 +49,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/viperblock/viperblock" ) diff --git a/spinifex/accountteardown/reapers_s3.go b/spinifex/accountteardown/reapers_s3.go index f953c571b..148e521c3 100644 --- a/spinifex/accountteardown/reapers_s3.go +++ b/spinifex/accountteardown/reapers_s3.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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // BucketStore is the slice of the object store the bucket reaper needs. diff --git a/spinifex/accountteardown/reapers_s3_test.go b/spinifex/accountteardown/reapers_s3_test.go index d7e144ee7..6b6450158 100644 --- a/spinifex/accountteardown/reapers_s3_test.go +++ b/spinifex/accountteardown/reapers_s3_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/admin/images_promote.go b/spinifex/admin/images_promote.go index 7729aa4b6..1c539c56c 100644 --- a/spinifex/admin/images_promote.go +++ b/spinifex/admin/images_promote.go @@ -7,9 +7,9 @@ import ( "log/slog" "strings" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/admin/images_promote_test.go b/spinifex/admin/images_promote_test.go index cbc1dec04..60984f711 100644 --- a/spinifex/admin/images_promote_test.go +++ b/spinifex/admin/images_promote_test.go @@ -6,9 +6,9 @@ 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/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/admin/images_remove.go b/spinifex/admin/images_remove.go index dc8e67b78..b32632a80 100644 --- a/spinifex/admin/images_remove.go +++ b/spinifex/admin/images_remove.go @@ -10,9 +10,9 @@ 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/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/admin/images_remove_test.go b/spinifex/admin/images_remove_test.go index 86beb61bd..a23b10c7f 100644 --- a/spinifex/admin/images_remove_test.go +++ b/spinifex/admin/images_remove_test.go @@ -7,9 +7,9 @@ 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/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/admin/orphan_volumes_test.go b/spinifex/admin/orphan_volumes_test.go index 3655bc385..c354d62ca 100644 --- a/spinifex/admin/orphan_volumes_test.go +++ b/spinifex/admin/orphan_volumes_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/daemon/daemon.go b/spinifex/daemon/daemon.go index d5c4bfb72..f0cd647a5 100644 --- a/spinifex/daemon/daemon.go +++ b/spinifex/daemon/daemon.go @@ -74,8 +74,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/network/external/exonet" "github.com/mulgadc/spinifex/spinifex/network/external/ocinet" "github.com/mulgadc/spinifex/spinifex/network/host" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/services/viperblockd/vbwire" diff --git a/spinifex/daemon/daemon_handlers_image.go b/spinifex/daemon/daemon_handlers_image.go index 4a4da4278..9a105561a 100644 --- a/spinifex/daemon/daemon_handlers_image.go +++ b/spinifex/daemon/daemon_handlers_image.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/daemon/daemon_handlers_instance_tags_test.go b/spinifex/daemon/daemon_handlers_instance_tags_test.go index 3c7ea8089..4879e86e7 100644 --- a/spinifex/daemon/daemon_handlers_instance_tags_test.go +++ b/spinifex/daemon/daemon_handlers_instance_tags_test.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" vmmock "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm/mock" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_handlers_instance_test.go b/spinifex/daemon/daemon_handlers_instance_test.go index 6c31f66e2..a07a26b03 100644 --- a/spinifex/daemon/daemon_handlers_instance_test.go +++ b/spinifex/daemon/daemon_handlers_instance_test.go @@ -10,10 +10,10 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/spinifex/utils" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" vmmock "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm/mock" + "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/daemon/daemon_handlers_monitoring_test.go b/spinifex/daemon/daemon_handlers_monitoring_test.go index c5e6e7053..d46e251e7 100644 --- a/spinifex/daemon/daemon_handlers_monitoring_test.go +++ b/spinifex/daemon/daemon_handlers_monitoring_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" vmmock "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm/mock" "github.com/stretchr/testify/assert" diff --git a/spinifex/daemon/daemon_handlers_test.go b/spinifex/daemon/daemon_handlers_test.go index 493b9c4b0..465fa60ca 100644 --- a/spinifex/daemon/daemon_handlers_test.go +++ b/spinifex/daemon/daemon_handlers_test.go @@ -38,7 +38,7 @@ import ( handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/external" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" vmmock "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm/mock" diff --git a/spinifex/daemon/daemon_handlers_volume_test.go b/spinifex/daemon/daemon_handlers_volume_test.go index 99bca2b50..40c20aad5 100644 --- a/spinifex/daemon/daemon_handlers_volume_test.go +++ b/spinifex/daemon/daemon_handlers_volume_test.go @@ -14,8 +14,8 @@ import ( "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" diff --git a/spinifex/daemon/daemon_test.go b/spinifex/daemon/daemon_test.go index 058d0ecca..0edf1c86f 100644 --- a/spinifex/daemon/daemon_test.go +++ b/spinifex/daemon/daemon_test.go @@ -49,7 +49,7 @@ import ( handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/runtime/compute/qmp" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" diff --git a/spinifex/daemon/eks_deps.go b/spinifex/daemon/eks_deps.go index ef83bd80b..84ad4db53 100644 --- a/spinifex/daemon/eks_deps.go +++ b/spinifex/daemon/eks_deps.go @@ -12,7 +12,7 @@ import ( handlers_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/handlers/ec2/placementgroup" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // systemRoleEnsurer lazily builds — and memoizes — the KV-backed IAM service diff --git a/spinifex/daemon/ochre_deps.go b/spinifex/daemon/ochre_deps.go index 94e69afc6..686a57111 100644 --- a/spinifex/daemon/ochre_deps.go +++ b/spinifex/daemon/ochre_deps.go @@ -15,7 +15,7 @@ import ( handlers_bedrock "github.com/mulgadc/spinifex/spinifex/handlers/bedrock" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" "github.com/mulgadc/spinifex/spinifex/network/host" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/daemon/vm_adapters.go b/spinifex/daemon/vm_adapters.go index d9c53c094..43c69e7e2 100644 --- a/spinifex/daemon/vm_adapters.go +++ b/spinifex/daemon/vm_adapters.go @@ -17,7 +17,7 @@ import ( handlers_ec2_placementgroup "github.com/mulgadc/spinifex/spinifex/handlers/ec2/placementgroup" "github.com/mulgadc/spinifex/spinifex/network/external/dhcp" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/gpu" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/services/viperblockd/vbwire" diff --git a/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go b/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go index bc764f39c..73af81c6b 100644 --- a/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go +++ b/spinifex/domains/ec2/ebs/metadata/snapshot_store_test.go @@ -9,7 +9,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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/domains/ec2/ebs/metadata/store.go b/spinifex/domains/ec2/ebs/metadata/store.go index af360a2e0..0a292969e 100644 --- a/spinifex/domains/ec2/ebs/metadata/store.go +++ b/spinifex/domains/ec2/ebs/metadata/store.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/domains/ec2/ebs/metadata/store_test.go b/spinifex/domains/ec2/ebs/metadata/store_test.go index 338e918b9..50f21f6b0 100644 --- a/spinifex/domains/ec2/ebs/metadata/store_test.go +++ b/spinifex/domains/ec2/ebs/metadata/store_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/admin_deleteaccount_job_test.go b/spinifex/gateway/admin_deleteaccount_job_test.go index c82cde419..60ef824e3 100644 --- a/spinifex/gateway/admin_deleteaccount_job_test.go +++ b/spinifex/gateway/admin_deleteaccount_job_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/aws/aws-sdk-go/service/s3" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/accountteardown" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" - "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/bedrock/logging.go b/spinifex/gateway/bedrock/logging.go index 4b8b8b8e5..1b30fa0f3 100644 --- a/spinifex/gateway/bedrock/logging.go +++ b/spinifex/gateway/bedrock/logging.go @@ -18,7 +18,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/clustersize" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/gateway/bedrock/logging_test.go b/spinifex/gateway/bedrock/logging_test.go index 576323dd7..27848e5d8 100644 --- a/spinifex/gateway/bedrock/logging_test.go +++ b/spinifex/gateway/bedrock/logging_test.go @@ -12,9 +12,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/bedrock" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecr/registry.go b/spinifex/gateway/ecr/registry.go index caf7141f2..27b3b8f44 100644 --- a/spinifex/gateway/ecr/registry.go +++ b/spinifex/gateway/ecr/registry.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // OCI media types recognised by the manifest validator. diff --git a/spinifex/gateway/ecr/registry_ensurebucket_test.go b/spinifex/gateway/ecr/registry_ensurebucket_test.go index ddbd5081f..3efe04c15 100644 --- a/spinifex/gateway/ecr/registry_ensurebucket_test.go +++ b/spinifex/gateway/ecr/registry_ensurebucket_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr/registry_image.go b/spinifex/gateway/ecr/registry_image.go index 81688b1f0..d4e80a90a 100644 --- a/spinifex/gateway/ecr/registry_image.go +++ b/spinifex/gateway/ecr/registry_image.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // ErrImageNotFound is returned by the image read/delete helpers when a tag or diff --git a/spinifex/gateway/ecr/registry_image_test.go b/spinifex/gateway/ecr/registry_image_test.go index 3ccab5e9c..e63b9f0fc 100644 --- a/spinifex/gateway/ecr/registry_image_test.go +++ b/spinifex/gateway/ecr/registry_image_test.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr/registry_test.go b/spinifex/gateway/ecr/registry_test.go index 999560f5e..f3ca5e4b7 100644 --- a/spinifex/gateway/ecr/registry_test.go +++ b/spinifex/gateway/ecr/registry_test.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr/registry_upload_test.go b/spinifex/gateway/ecr/registry_upload_test.go index 5063a7727..067227b1c 100644 --- a/spinifex/gateway/ecr/registry_upload_test.go +++ b/spinifex/gateway/ecr/registry_upload_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/gateway/ecr_image_test.go b/spinifex/gateway/ecr_image_test.go index 3a9973b23..ff214386f 100644 --- a/spinifex/gateway/ecr_image_test.go +++ b/spinifex/gateway/ecr_image_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecr "github.com/mulgadc/spinifex/spinifex/gateway/ecr" handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/image/deregister_legacy_config_test.go b/spinifex/handlers/ec2/image/deregister_legacy_config_test.go index 081ed4fca..75c6169f0 100644 --- a/spinifex/handlers/ec2/image/deregister_legacy_config_test.go +++ b/spinifex/handlers/ec2/image/deregister_legacy_config_test.go @@ -7,7 +7,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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "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 eb539aef9..11ad34b56 100644 --- a/spinifex/handlers/ec2/image/describe_byid_test.go +++ b/spinifex/handlers/ec2/image/describe_byid_test.go @@ -11,11 +11,11 @@ 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/foundation/aws/errors" - "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" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/drain_test.go b/spinifex/handlers/ec2/image/drain_test.go index c33ca9860..099c19dbd 100644 --- a/spinifex/handlers/ec2/image/drain_test.go +++ b/spinifex/handlers/ec2/image/drain_test.go @@ -13,7 +13,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/image/provider_snapshot_test.go b/spinifex/handlers/ec2/image/provider_snapshot_test.go index 0c71c1259..42a1dfb2f 100644 --- a/spinifex/handlers/ec2/image/provider_snapshot_test.go +++ b/spinifex/handlers/ec2/image/provider_snapshot_test.go @@ -7,11 +7,11 @@ 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/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/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 c5eed6ea2..6213cd290 100644 --- a/spinifex/handlers/ec2/image/provider_test.go +++ b/spinifex/handlers/ec2/image/provider_test.go @@ -10,7 +10,7 @@ import ( awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/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 479a84340..5ea0bcd3e 100644 --- a/spinifex/handlers/ec2/image/service_impl.go +++ b/spinifex/handlers/ec2/image/service_impl.go @@ -14,13 +14,13 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "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/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" 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" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" ) diff --git a/spinifex/handlers/ec2/image/service_impl_encryption_test.go b/spinifex/handlers/ec2/image/service_impl_encryption_test.go index 0e53e6cf7..756a5a354 100644 --- a/spinifex/handlers/ec2/image/service_impl_encryption_test.go +++ b/spinifex/handlers/ec2/image/service_impl_encryption_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/image/service_impl_test.go b/spinifex/handlers/ec2/image/service_impl_test.go index 452c51559..33bde2304 100644 --- a/spinifex/handlers/ec2/image/service_impl_test.go +++ b/spinifex/handlers/ec2/image/service_impl_test.go @@ -13,11 +13,11 @@ 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/foundation/aws/errors" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/config" "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/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/instance/export_test.go b/spinifex/handlers/ec2/instance/export_test.go index af3096d0e..cd9786761 100644 --- a/spinifex/handlers/ec2/instance/export_test.go +++ b/spinifex/handlers/ec2/instance/export_test.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/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 a5835bb5c..aea752c27 100644 --- a/spinifex/handlers/ec2/instance/provider_efi_volume_test.go +++ b/spinifex/handlers/ec2/instance/provider_efi_volume_test.go @@ -7,7 +7,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/instance/provider_root_volume_test.go b/spinifex/handlers/ec2/instance/provider_root_volume_test.go index fac123304..2ecb50ac8 100644 --- a/spinifex/handlers/ec2/instance/provider_root_volume_test.go +++ b/spinifex/handlers/ec2/instance/provider_root_volume_test.go @@ -13,8 +13,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" ebspolicy "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/policy" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/instance/service_impl.go b/spinifex/handlers/ec2/instance/service_impl.go index 735b3a237..8fa90df8d 100644 --- a/spinifex/handlers/ec2/instance/service_impl.go +++ b/spinifex/handlers/ec2/instance/service_impl.go @@ -30,8 +30,8 @@ import ( handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" "github.com/mulgadc/spinifex/spinifex/network/topology" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/key/service_impl.go b/spinifex/handlers/ec2/key/service_impl.go index 7a0e44953..ac6f65e2b 100644 --- a/spinifex/handlers/ec2/key/service_impl.go +++ b/spinifex/handlers/ec2/key/service_impl.go @@ -25,10 +25,10 @@ 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/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "golang.org/x/crypto/ssh" ) diff --git a/spinifex/handlers/ec2/key/service_impl_test.go b/spinifex/handlers/ec2/key/service_impl_test.go index d35091f30..e30b954a1 100644 --- a/spinifex/handlers/ec2/key/service_impl_test.go +++ b/spinifex/handlers/ec2/key/service_impl_test.go @@ -16,7 +16,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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/crypto/ssh" diff --git a/spinifex/handlers/ec2/snapshot/describe_byid_test.go b/spinifex/handlers/ec2/snapshot/describe_byid_test.go index 6ec821218..4de1cb26e 100644 --- a/spinifex/handlers/ec2/snapshot/describe_byid_test.go +++ b/spinifex/handlers/ec2/snapshot/describe_byid_test.go @@ -11,12 +11,12 @@ 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/foundation/aws/errors" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" - "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/internal/testkit/recordingstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/snapshot/describe_fanout_test.go b/spinifex/handlers/ec2/snapshot/describe_fanout_test.go index a0366e447..4da471959 100644 --- a/spinifex/handlers/ec2/snapshot/describe_fanout_test.go +++ b/spinifex/handlers/ec2/snapshot/describe_fanout_test.go @@ -8,11 +8,11 @@ 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/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_snapshot "github.com/mulgadc/spinifex/spinifex/handlers/ec2/snapshot" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/snapshot/drain_test.go b/spinifex/handlers/ec2/snapshot/drain_test.go index aff8e85d3..f2f63eb97 100644 --- a/spinifex/handlers/ec2/snapshot/drain_test.go +++ b/spinifex/handlers/ec2/snapshot/drain_test.go @@ -16,8 +16,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/handlers/ec2/snapshot/service_impl.go b/spinifex/handlers/ec2/snapshot/service_impl.go index 413170476..07b068014 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl.go +++ b/spinifex/handlers/ec2/snapshot/service_impl.go @@ -24,8 +24,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volumestate" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/handlers/ec2/snapshot/service_impl_test.go b/spinifex/handlers/ec2/snapshot/service_impl_test.go index 818dbde2b..12b1bf1ce 100644 --- a/spinifex/handlers/ec2/snapshot/service_impl_test.go +++ b/spinifex/handlers/ec2/snapshot/service_impl_test.go @@ -13,13 +13,13 @@ 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/foundation/aws/errors" + "github.com/mulgadc/spinifex/internal/testkit" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" - "github.com/mulgadc/spinifex/spinifex/objectstore" - "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go index a15d611fb..a06d52241 100644 --- a/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go +++ b/spinifex/handlers/ec2/snapshot/snapshot_partition_test.go @@ -13,12 +13,12 @@ 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/foundation/aws/errors" + "github.com/mulgadc/spinifex/internal/testkit/recordingstore" "github.com/mulgadc/spinifex/spinifex/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "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/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/tags/key_pair_tags_test.go b/spinifex/handlers/ec2/tags/key_pair_tags_test.go index b2f6d05fd..7e2626293 100644 --- a/spinifex/handlers/ec2/tags/key_pair_tags_test.go +++ b/spinifex/handlers/ec2/tags/key_pair_tags_test.go @@ -9,7 +9,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/config" handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key" handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/tags/service_impl.go b/spinifex/handlers/ec2/tags/service_impl.go index a82ca4026..dc6fd7b6d 100644 --- a/spinifex/handlers/ec2/tags/service_impl.go +++ b/spinifex/handlers/ec2/tags/service_impl.go @@ -22,7 +22,7 @@ import ( handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" handlers_ec2_key "github.com/mulgadc/spinifex/spinifex/handlers/ec2/key" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/ec2/tags/service_impl_test.go b/spinifex/handlers/ec2/tags/service_impl_test.go index ca4145181..4847e4bcb 100644 --- a/spinifex/handlers/ec2/tags/service_impl_test.go +++ b/spinifex/handlers/ec2/tags/service_impl_test.go @@ -7,10 +7,10 @@ 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/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/config" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/tags/store_test.go b/spinifex/handlers/ec2/tags/store_test.go index b1989da1e..612096234 100644 --- a/spinifex/handlers/ec2/tags/store_test.go +++ b/spinifex/handlers/ec2/tags/store_test.go @@ -16,7 +16,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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/volume/config_route_invariants_test.go b/spinifex/handlers/ec2/volume/config_route_invariants_test.go index 333e94540..9ac562855 100644 --- a/spinifex/handlers/ec2/volume/config_route_invariants_test.go +++ b/spinifex/handlers/ec2/volume/config_route_invariants_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "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 bf3b41db4..d5f7c42ac 100644 --- a/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go +++ b/spinifex/handlers/ec2/volume/lifecycle_invariants_test.go @@ -13,7 +13,7 @@ import ( viperblocklegacyv1 "github.com/mulgadc/spinifex/contracts/viperblockd/legacy/v1" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go" "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 90ac716db..9d3aaa852 100644 --- a/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go +++ b/spinifex/handlers/ec2/volume/provider_snapshot_source_test.go @@ -11,8 +11,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" ebspolicy "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/policy" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/record_tags_test.go b/spinifex/handlers/ec2/volume/record_tags_test.go index a58c52106..4f9809532 100644 --- a/spinifex/handlers/ec2/volume/record_tags_test.go +++ b/spinifex/handlers/ec2/volume/record_tags_test.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/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 ed06daacd..18c0c63cd 100644 --- a/spinifex/handlers/ec2/volume/service_impl.go +++ b/spinifex/handlers/ec2/volume/service_impl.go @@ -22,8 +22,8 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" 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" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" diff --git a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go b/spinifex/handlers/ec2/volume/service_impl_encryption_test.go index 67d79ee79..4c9ce6d75 100644 --- a/spinifex/handlers/ec2/volume/service_impl_encryption_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_encryption_test.go @@ -7,11 +7,11 @@ 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/config" "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/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 b8916eb0a..200d349be 100644 --- a/spinifex/handlers/ec2/volume/service_impl_test.go +++ b/spinifex/handlers/ec2/volume/service_impl_test.go @@ -12,14 +12,14 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/s3" "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/domains/ec2/ebs/metadata" - "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" "github.com/mulgadc/spinifex/internal/testkit/ebsfake" + "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" + awsfilters "github.com/mulgadc/spinifex/spinifex/foundation/aws/filters" + "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/handlers/ec2/volume/testhelpers_test.go b/spinifex/handlers/ec2/volume/testhelpers_test.go index 321009705..ae35865c8 100644 --- a/spinifex/handlers/ec2/volume/testhelpers_test.go +++ b/spinifex/handlers/ec2/volume/testhelpers_test.go @@ -8,9 +8,9 @@ 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/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/domains/ec2/ebs/metadata" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/volume/volume_leak_reaper_test.go b/spinifex/handlers/ec2/volume/volume_leak_reaper_test.go index 352de11ff..0f0f63589 100644 --- a/spinifex/handlers/ec2/volume/volume_leak_reaper_test.go +++ b/spinifex/handlers/ec2/volume/volume_leak_reaper_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ec2/volumestate/volumestate.go b/spinifex/handlers/ec2/volumestate/volumestate.go index 0272475ea..867e3859b 100644 --- a/spinifex/handlers/ec2/volumestate/volumestate.go +++ b/spinifex/handlers/ec2/volumestate/volumestate.go @@ -19,7 +19,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // Record is the control-plane-owned attachment state of a volume. diff --git a/spinifex/handlers/eks/restore_snapshot.go b/spinifex/handlers/eks/restore_snapshot.go index 9b904adf4..ff4fcd729 100644 --- a/spinifex/handlers/eks/restore_snapshot.go +++ b/spinifex/handlers/eks/restore_snapshot.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/handlers/eks/restore_snapshot_test.go b/spinifex/handlers/eks/restore_snapshot_test.go index e05469fcc..da33aafdd 100644 --- a/spinifex/handlers/eks/restore_snapshot_test.go +++ b/spinifex/handlers/eks/restore_snapshot_test.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/pagedstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/eks/service_impl.go b/spinifex/handlers/eks/service_impl.go index 024cba137..088c71f49 100644 --- a/spinifex/handlers/eks/service_impl.go +++ b/spinifex/handlers/eks/service_impl.go @@ -21,15 +21,15 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/mulgadc/bluebottle/pkg/auth" "github.com/mulgadc/spinifex/spinifex/admin" + "github.com/mulgadc/spinifex/spinifex/config" resourcearn "github.com/mulgadc/spinifex/spinifex/foundation/aws/arn" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" + "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" handlers_dns "github.com/mulgadc/spinifex/spinifex/handlers/dns" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" "github.com/mulgadc/spinifex/spinifex/handlers/sysinstance" - "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/idempotency" - "github.com/mulgadc/spinifex/spinifex/foundation/state/kvlease" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/spinifex/handlers/ochrevector/backup.go b/spinifex/handlers/ochrevector/backup.go index 90cb48a1b..7b03b042b 100644 --- a/spinifex/handlers/ochrevector/backup.go +++ b/spinifex/handlers/ochrevector/backup.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // SubjectBackupAccount and SubjectRestoreAccount are the operator-only NATS diff --git a/spinifex/handlers/ochrevector/backup_test.go b/spinifex/handlers/ochrevector/backup_test.go index 329435a91..b12ba1b18 100644 --- a/spinifex/handlers/ochrevector/backup_test.go +++ b/spinifex/handlers/ochrevector/backup_test.go @@ -16,8 +16,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/handlers/ochrevector/ingest.go b/spinifex/handlers/ochrevector/ingest.go index dbe057163..40f51df4f 100644 --- a/spinifex/handlers/ochrevector/ingest.go +++ b/spinifex/handlers/ochrevector/ingest.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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" ) diff --git a/spinifex/handlers/ochrevector/ingest_test.go b/spinifex/handlers/ochrevector/ingest_test.go index 8db88f37f..d14a38228 100644 --- a/spinifex/handlers/ochrevector/ingest_test.go +++ b/spinifex/handlers/ochrevector/ingest_test.go @@ -16,8 +16,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/migrate/migrate.go b/spinifex/migrate/migrate.go index e05776080..233f34300 100644 --- a/spinifex/migrate/migrate.go +++ b/spinifex/migrate/migrate.go @@ -11,7 +11,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" statemigrate "github.com/mulgadc/spinifex/spinifex/foundation/state/migrate" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/nats-io/nats.go/jetstream" ) diff --git a/spinifex/objectstore/buckets.go b/spinifex/providers/objectstore/buckets.go similarity index 100% rename from spinifex/objectstore/buckets.go rename to spinifex/providers/objectstore/buckets.go diff --git a/spinifex/objectstore/deleteobject_test.go b/spinifex/providers/objectstore/deleteobject_test.go similarity index 100% rename from spinifex/objectstore/deleteobject_test.go rename to spinifex/providers/objectstore/deleteobject_test.go diff --git a/spinifex/objectstore/ensurebucket_test.go b/spinifex/providers/objectstore/ensurebucket_test.go similarity index 100% rename from spinifex/objectstore/ensurebucket_test.go rename to spinifex/providers/objectstore/ensurebucket_test.go diff --git a/spinifex/objectstore/export_test.go b/spinifex/providers/objectstore/export_test.go similarity index 100% rename from spinifex/objectstore/export_test.go rename to spinifex/providers/objectstore/export_test.go diff --git a/spinifex/objectstore/list.go b/spinifex/providers/objectstore/list.go similarity index 100% rename from spinifex/objectstore/list.go rename to spinifex/providers/objectstore/list.go diff --git a/spinifex/objectstore/list_test.go b/spinifex/providers/objectstore/list_test.go similarity index 99% rename from spinifex/objectstore/list_test.go rename to spinifex/providers/objectstore/list_test.go index aeeeb785e..749d40997 100644 --- a/spinifex/objectstore/list_test.go +++ b/spinifex/providers/objectstore/list_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/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/objectstore/objectstore.go b/spinifex/providers/objectstore/objectstore.go similarity index 100% rename from spinifex/objectstore/objectstore.go rename to spinifex/providers/objectstore/objectstore.go diff --git a/spinifex/objectstore/objectstore_test.go b/spinifex/providers/objectstore/objectstore_test.go similarity index 100% rename from spinifex/objectstore/objectstore_test.go rename to spinifex/providers/objectstore/objectstore_test.go diff --git a/spinifex/services/awsgw/awsgw.go b/spinifex/services/awsgw/awsgw.go index 17e914a95..9962c65e7 100644 --- a/spinifex/services/awsgw/awsgw.go +++ b/spinifex/services/awsgw/awsgw.go @@ -38,7 +38,7 @@ import ( handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" "github.com/mulgadc/spinifex/spinifex/network/reconcile" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/cache" "github.com/mulgadc/spinifex/spinifex/runtime/compute/vm" "github.com/mulgadc/spinifex/spinifex/utils" diff --git a/spinifex/services/viperblockd/delete_prefix_test.go b/spinifex/services/viperblockd/delete_prefix_test.go index c49960ef4..8aa79dc2c 100644 --- a/spinifex/services/viperblockd/delete_prefix_test.go +++ b/spinifex/services/viperblockd/delete_prefix_test.go @@ -8,7 +8,7 @@ import ( awssdk "github.com/aws/aws-sdk-go/aws" awss3 "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/viperblockd/list_volumes_test.go b/spinifex/services/viperblockd/list_volumes_test.go index 7b913f175..5452f87b8 100644 --- a/spinifex/services/viperblockd/list_volumes_test.go +++ b/spinifex/services/viperblockd/list_volumes_test.go @@ -6,7 +6,7 @@ import ( awssdk "github.com/aws/aws-sdk-go/aws" awss3 "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/spinifex/services/viperblockd/provider_handlers.go b/spinifex/services/viperblockd/provider_handlers.go index 447686de6..3e8558fe2 100644 --- a/spinifex/services/viperblockd/provider_handlers.go +++ b/spinifex/services/viperblockd/provider_handlers.go @@ -18,8 +18,8 @@ import ( awss3 "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/bluebottle/pkg/safecast" viperblocklegacyv1 "github.com/mulgadc/spinifex/contracts/viperblockd/legacy/v1" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/spinifex/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/runtime/compute/nbd" "github.com/mulgadc/spinifex/spinifex/utils" vbtypes "github.com/mulgadc/viperblock/types" diff --git a/spinifex/services/viperblockd/provider_handlers_test.go b/spinifex/services/viperblockd/provider_handlers_test.go index 0ba219501..b8ca798fa 100644 --- a/spinifex/services/viperblockd/provider_handlers_test.go +++ b/spinifex/services/viperblockd/provider_handlers_test.go @@ -26,7 +26,7 @@ import ( awssdk "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" "github.com/mulgadc/spinifex/spinifex/providers/ebs" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/viperblock/viperblock" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/tests/e2e/kvquorum/node_loss_test.go b/tests/e2e/kvquorum/node_loss_test.go index 0dcb42008..10a8a49a8 100644 --- a/tests/e2e/kvquorum/node_loss_test.go +++ b/tests/e2e/kvquorum/node_loss_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" - natssvc "github.com/mulgadc/spinifex/spinifex/services/nats" + natssvc "github.com/mulgadc/spinifex/spinifex/runtime/roles/nats" "github.com/mulgadc/spinifex/tests/e2e/harness" "github.com/stretchr/testify/require" ) diff --git a/tests/integration/daemon_lite.go b/tests/integration/daemon_lite.go index 5eb550502..7ec3d4540 100644 --- a/tests/integration/daemon_lite.go +++ b/tests/integration/daemon_lite.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/config" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" handlers_ec2_account "github.com/mulgadc/spinifex/spinifex/handlers/ec2/account" handlers_ec2_eigw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/eigw" handlers_ec2_igw "github.com/mulgadc/spinifex/spinifex/handlers/ec2/igw" @@ -18,7 +18,7 @@ import ( handlers_ec2_routetable "github.com/mulgadc/spinifex/spinifex/handlers/ec2/routetable" handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" diff --git a/tests/integration/harness.go b/tests/integration/harness.go index a3efd4b18..0457db907 100644 --- a/tests/integration/harness.go +++ b/tests/integration/harness.go @@ -40,7 +40,7 @@ import ( handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_sts "github.com/mulgadc/spinifex/spinifex/handlers/sts" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" diff --git a/tests/integration/image_daemon_lite.go b/tests/integration/image_daemon_lite.go index 9c1ed822b..14aca7453 100644 --- a/tests/integration/image_daemon_lite.go +++ b/tests/integration/image_daemon_lite.go @@ -6,7 +6,7 @@ import ( "testing" handlers_ec2_image "github.com/mulgadc/spinifex/spinifex/handlers/ec2/image" - "github.com/mulgadc/spinifex/spinifex/objectstore" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) // testImageBucket is the bucket name StartImageDaemonLite's ImageServiceImpl diff --git a/tests/integration/volume_daemon_lite.go b/tests/integration/volume_daemon_lite.go index 56a657ca5..c8bd00254 100644 --- a/tests/integration/volume_daemon_lite.go +++ b/tests/integration/volume_daemon_lite.go @@ -8,9 +8,9 @@ import ( "time" "github.com/mulgadc/spinifex/spinifex/config" - "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/providers/ebs" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/mulgadc/spinifex/spinifex/services/viperblockd" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" "github.com/stretchr/testify/require" diff --git a/tests/integration/volume_test.go b/tests/integration/volume_test.go index 61c34ac8a..c9cc95ef9 100644 --- a/tests/integration/volume_test.go +++ b/tests/integration/volume_test.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/mulgadc/spinifex/spinifex/objectstore" "github.com/mulgadc/spinifex/internal/testkit/vbscan" + "github.com/mulgadc/spinifex/spinifex/providers/objectstore" testpredastore "github.com/mulgadc/spinifex/tests/fixtures/predastore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"