From 93084043a9bee45b7bc0a1aef3a834f7c6a08c84 Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Thu, 1 Oct 2026 14:35:36 +1000 Subject: [PATCH] refactor: move ecr resource owner to domain --- spinifex/daemon/daemon.go | 2 +- spinifex/{handlers => domains}/ecr/lifecycle.go | 0 spinifex/{handlers => domains}/ecr/lifecycle_test.go | 0 spinifex/{handlers => domains}/ecr/meta.go | 0 spinifex/{handlers => domains}/ecr/meta_kv_test.go | 0 spinifex/{handlers => domains}/ecr/meta_nats.go | 0 spinifex/{handlers => domains}/ecr/meta_test.go | 0 spinifex/{handlers => domains}/ecr/service.go | 0 spinifex/{handlers => domains}/ecr/service_impl.go | 0 spinifex/{handlers => domains}/ecr/service_test.go | 0 spinifex/{handlers => domains}/ecr/storage.go | 10 ++++++---- spinifex/{handlers => domains}/ecr/storage_test.go | 0 spinifex/gateway/ecr/lifecycle_sweep.go | 2 +- spinifex/gateway/ecr/lifecycle_sweep_test.go | 2 +- spinifex/gateway/ecr/registry.go | 2 +- spinifex/gateway/ecr/registry_ensurebucket_test.go | 2 +- spinifex/gateway/ecr/registry_image.go | 2 +- spinifex/gateway/ecr/registry_image_test.go | 2 +- spinifex/gateway/ecr/registry_test.go | 2 +- spinifex/gateway/ecr/registry_upload_test.go | 2 +- spinifex/gateway/ecr_createdeleterepository_test.go | 4 ++-- spinifex/gateway/ecr_createrepository.go | 2 +- spinifex/gateway/ecr_deleterepository.go | 2 +- spinifex/gateway/ecr_describerepositories.go | 2 +- spinifex/gateway/ecr_describerepositories_test.go | 2 +- spinifex/gateway/ecr_image.go | 2 +- spinifex/gateway/ecr_image_test.go | 2 +- spinifex/gateway/ecr_lifecyclepreview.go | 2 +- spinifex/gateway/ecr_repository.go | 2 +- spinifex/gateway/ecr_tagmutability.go | 2 +- spinifex/gateway/ecrapi/imagescanning.go | 2 +- spinifex/gateway/ecrapi/lifecyclepolicy.go | 2 +- spinifex/gateway/ecrapi/lifecyclepolicy_test.go | 4 ++-- spinifex/gateway/ecrapi/repositorypolicy.go | 2 +- spinifex/gateway/ecrapi/repositorypolicy_test.go | 4 ++-- spinifex/gateway/ecrapi/tags.go | 2 +- spinifex/gateway/ecrapi/validation.go | 2 +- spinifex/services/awsgw/awsgw.go | 2 +- tests/integration/ecr_daemon_lite.go | 2 +- tests/integration/harness.go | 2 +- 40 files changed, 38 insertions(+), 36 deletions(-) rename spinifex/{handlers => domains}/ecr/lifecycle.go (100%) rename spinifex/{handlers => domains}/ecr/lifecycle_test.go (100%) rename spinifex/{handlers => domains}/ecr/meta.go (100%) rename spinifex/{handlers => domains}/ecr/meta_kv_test.go (100%) rename spinifex/{handlers => domains}/ecr/meta_nats.go (100%) rename spinifex/{handlers => domains}/ecr/meta_test.go (100%) rename spinifex/{handlers => domains}/ecr/service.go (100%) rename spinifex/{handlers => domains}/ecr/service_impl.go (100%) rename spinifex/{handlers => domains}/ecr/service_test.go (100%) rename spinifex/{handlers => domains}/ecr/storage.go (93%) rename spinifex/{handlers => domains}/ecr/storage_test.go (100%) diff --git a/spinifex/daemon/daemon.go b/spinifex/daemon/daemon.go index 69a753f13..2bbc06245 100644 --- a/spinifex/daemon/daemon.go +++ b/spinifex/daemon/daemon.go @@ -40,6 +40,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/bootstrap/preflight" "github.com/mulgadc/spinifex/spinifex/clustersize" "github.com/mulgadc/spinifex/spinifex/domains/ec2/instancetypes" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" @@ -62,7 +63,6 @@ import ( handlers_ec2_tags "github.com/mulgadc/spinifex/spinifex/handlers/ec2/tags" handlers_ec2_volume "github.com/mulgadc/spinifex/spinifex/handlers/ec2/volume" handlers_ec2_vpc "github.com/mulgadc/spinifex/spinifex/handlers/ec2/vpc" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" handlers_ecs "github.com/mulgadc/spinifex/spinifex/handlers/ecs" handlers_eks "github.com/mulgadc/spinifex/spinifex/handlers/eks" handlers_elbv2 "github.com/mulgadc/spinifex/spinifex/handlers/elbv2" diff --git a/spinifex/handlers/ecr/lifecycle.go b/spinifex/domains/ecr/lifecycle.go similarity index 100% rename from spinifex/handlers/ecr/lifecycle.go rename to spinifex/domains/ecr/lifecycle.go diff --git a/spinifex/handlers/ecr/lifecycle_test.go b/spinifex/domains/ecr/lifecycle_test.go similarity index 100% rename from spinifex/handlers/ecr/lifecycle_test.go rename to spinifex/domains/ecr/lifecycle_test.go diff --git a/spinifex/handlers/ecr/meta.go b/spinifex/domains/ecr/meta.go similarity index 100% rename from spinifex/handlers/ecr/meta.go rename to spinifex/domains/ecr/meta.go diff --git a/spinifex/handlers/ecr/meta_kv_test.go b/spinifex/domains/ecr/meta_kv_test.go similarity index 100% rename from spinifex/handlers/ecr/meta_kv_test.go rename to spinifex/domains/ecr/meta_kv_test.go diff --git a/spinifex/handlers/ecr/meta_nats.go b/spinifex/domains/ecr/meta_nats.go similarity index 100% rename from spinifex/handlers/ecr/meta_nats.go rename to spinifex/domains/ecr/meta_nats.go diff --git a/spinifex/handlers/ecr/meta_test.go b/spinifex/domains/ecr/meta_test.go similarity index 100% rename from spinifex/handlers/ecr/meta_test.go rename to spinifex/domains/ecr/meta_test.go diff --git a/spinifex/handlers/ecr/service.go b/spinifex/domains/ecr/service.go similarity index 100% rename from spinifex/handlers/ecr/service.go rename to spinifex/domains/ecr/service.go diff --git a/spinifex/handlers/ecr/service_impl.go b/spinifex/domains/ecr/service_impl.go similarity index 100% rename from spinifex/handlers/ecr/service_impl.go rename to spinifex/domains/ecr/service_impl.go diff --git a/spinifex/handlers/ecr/service_test.go b/spinifex/domains/ecr/service_test.go similarity index 100% rename from spinifex/handlers/ecr/service_test.go rename to spinifex/domains/ecr/service_test.go diff --git a/spinifex/handlers/ecr/storage.go b/spinifex/domains/ecr/storage.go similarity index 93% rename from spinifex/handlers/ecr/storage.go rename to spinifex/domains/ecr/storage.go index bb76dcd88..eb2ec4f8d 100644 --- a/spinifex/handlers/ecr/storage.go +++ b/spinifex/domains/ecr/storage.go @@ -1,7 +1,9 @@ -// Package ecr holds the ECR registry handlers and the predastore storage -// layout that backs them. v1 stores everything for one account in a single -// per-account bucket; blobs are content-addressable and deduplicated per -// account, while manifests and tags are indexed per repository. +// Package ecr owns ECR repository and blob semantics, including the +// S3-compatible storage layout that backs registry data. v1 stores everything +// for one account in a single per-account bucket; blobs are content-addressable +// and deduplicated per account, while manifests and tags are indexed per +// repository. Generic gateway packages own HTTP and SigV4 mechanics and reach +// this domain through its explicit service and metadata interfaces. package ecr import ( diff --git a/spinifex/handlers/ecr/storage_test.go b/spinifex/domains/ecr/storage_test.go similarity index 100% rename from spinifex/handlers/ecr/storage_test.go rename to spinifex/domains/ecr/storage_test.go diff --git a/spinifex/gateway/ecr/lifecycle_sweep.go b/spinifex/gateway/ecr/lifecycle_sweep.go index 7d574c26f..1fa04b1ba 100644 --- a/spinifex/gateway/ecr/lifecycle_sweep.go +++ b/spinifex/gateway/ecr/lifecycle_sweep.go @@ -6,7 +6,7 @@ import ( "log/slog" "time" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/telemetry" ) diff --git a/spinifex/gateway/ecr/lifecycle_sweep_test.go b/spinifex/gateway/ecr/lifecycle_sweep_test.go index f374b53d8..8aab1deb0 100644 --- a/spinifex/gateway/ecr/lifecycle_sweep_test.go +++ b/spinifex/gateway/ecr/lifecycle_sweep_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/ecr" "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 27b3b8f44..1c49499f1 100644 --- a/spinifex/gateway/ecr/registry.go +++ b/spinifex/gateway/ecr/registry.go @@ -21,7 +21,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/domains/ecr" "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) diff --git a/spinifex/gateway/ecr/registry_ensurebucket_test.go b/spinifex/gateway/ecr/registry_ensurebucket_test.go index 3efe04c15..d0beab50b 100644 --- a/spinifex/gateway/ecr/registry_ensurebucket_test.go +++ b/spinifex/gateway/ecr/registry_ensurebucket_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/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_image.go b/spinifex/gateway/ecr/registry_image.go index d4e80a90a..45d808ec8 100644 --- a/spinifex/gateway/ecr/registry_image.go +++ b/spinifex/gateway/ecr/registry_image.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/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/providers/objectstore" ) diff --git a/spinifex/gateway/ecr/registry_image_test.go b/spinifex/gateway/ecr/registry_image_test.go index e63b9f0fc..0e3d3b41b 100644 --- a/spinifex/gateway/ecr/registry_image_test.go +++ b/spinifex/gateway/ecr/registry_image_test.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/internal/testkit" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/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 f3ca5e4b7..eea6a8287 100644 --- a/spinifex/gateway/ecr/registry_test.go +++ b/spinifex/gateway/ecr/registry_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/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_upload_test.go b/spinifex/gateway/ecr/registry_upload_test.go index 067227b1c..a93240d43 100644 --- a/spinifex/gateway/ecr/registry_upload_test.go +++ b/spinifex/gateway/ecr/registry_upload_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/s3" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecr_createdeleterepository_test.go b/spinifex/gateway/ecr_createdeleterepository_test.go index 50441f647..143c6469b 100644 --- a/spinifex/gateway/ecr_createdeleterepository_test.go +++ b/spinifex/gateway/ecr_createdeleterepository_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecr_createrepository.go b/spinifex/gateway/ecr_createrepository.go index dcc1103e3..95798ef30 100644 --- a/spinifex/gateway/ecr_createrepository.go +++ b/spinifex/gateway/ecr_createrepository.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // createRepositoryRequest is the camelCase AWS JSON 1.1 input shape. ecr.Tag diff --git a/spinifex/gateway/ecr_deleterepository.go b/spinifex/gateway/ecr_deleterepository.go index cc4ae13f4..261fb6c39 100644 --- a/spinifex/gateway/ecr_deleterepository.go +++ b/spinifex/gateway/ecr_deleterepository.go @@ -8,9 +8,9 @@ import ( "net/http" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // deleteRepositoryRequest is the camelCase AWS JSON 1.1 input shape. force=true diff --git a/spinifex/gateway/ecr_describerepositories.go b/spinifex/gateway/ecr_describerepositories.go index aef101683..33dfaf344 100644 --- a/spinifex/gateway/ecr_describerepositories.go +++ b/spinifex/gateway/ecr_describerepositories.go @@ -8,9 +8,9 @@ import ( "net/http" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // describeRepositoriesRequest is the camelCase AWS JSON 1.1 input shape. The SDK diff --git a/spinifex/gateway/ecr_describerepositories_test.go b/spinifex/gateway/ecr_describerepositories_test.go index 2f445ebe2..59edf44b3 100644 --- a/spinifex/gateway/ecr_describerepositories_test.go +++ b/spinifex/gateway/ecr_describerepositories_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/ecr_image.go b/spinifex/gateway/ecr_image.go index 4a78a4d03..9ae70748b 100644 --- a/spinifex/gateway/ecr_image.go +++ b/spinifex/gateway/ecr_image.go @@ -11,10 +11,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecr "github.com/mulgadc/spinifex/spinifex/gateway/ecr" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // maxImageBatch is the per-call cap on imageIds for the batch image actions. diff --git a/spinifex/gateway/ecr_image_test.go b/spinifex/gateway/ecr_image_test.go index ff214386f..7d3c858fd 100644 --- a/spinifex/gateway/ecr_image_test.go +++ b/spinifex/gateway/ecr_image_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "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/providers/objectstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecr_lifecyclepreview.go b/spinifex/gateway/ecr_lifecyclepreview.go index 808ba2415..a9d7c34e5 100644 --- a/spinifex/gateway/ecr_lifecyclepreview.go +++ b/spinifex/gateway/ecr_lifecyclepreview.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // lifecyclePreviewRequest is the camelCase AWS JSON 1.1 input shared by the two diff --git a/spinifex/gateway/ecr_repository.go b/spinifex/gateway/ecr_repository.go index 615c1c9be..ee87bc466 100644 --- a/spinifex/gateway/ecr_repository.go +++ b/spinifex/gateway/ecr_repository.go @@ -3,7 +3,7 @@ package gateway import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" ) // buildRepository projects a RepoMeta record into the AWS *ecr.Repository diff --git a/spinifex/gateway/ecr_tagmutability.go b/spinifex/gateway/ecr_tagmutability.go index 8bd426632..3248b9af2 100644 --- a/spinifex/gateway/ecr_tagmutability.go +++ b/spinifex/gateway/ecr_tagmutability.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" gateway_ecrapi "github.com/mulgadc/spinifex/spinifex/gateway/ecrapi" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // putImageTagMutabilityRequest is the camelCase AWS JSON 1.1 input shape. diff --git a/spinifex/gateway/ecrapi/imagescanning.go b/spinifex/gateway/ecrapi/imagescanning.go index 190f4a093..37452d9fd 100644 --- a/spinifex/gateway/ecrapi/imagescanning.go +++ b/spinifex/gateway/ecrapi/imagescanning.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/nats-io/nats.go" ) diff --git a/spinifex/gateway/ecrapi/lifecyclepolicy.go b/spinifex/gateway/ecrapi/lifecyclepolicy.go index 16a1d40f2..4d629b4d6 100644 --- a/spinifex/gateway/ecrapi/lifecyclepolicy.go +++ b/spinifex/gateway/ecrapi/lifecyclepolicy.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/nats-io/nats.go" ) diff --git a/spinifex/gateway/ecrapi/lifecyclepolicy_test.go b/spinifex/gateway/ecrapi/lifecyclepolicy_test.go index 0a9600f7f..812d575a7 100644 --- a/spinifex/gateway/ecrapi/lifecyclepolicy_test.go +++ b/spinifex/gateway/ecrapi/lifecyclepolicy_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/aws/aws-sdk-go/service/ecr" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/spinifex/gateway/ecrapi/repositorypolicy.go b/spinifex/gateway/ecrapi/repositorypolicy.go index 52e7d4025..a819a9700 100644 --- a/spinifex/gateway/ecrapi/repositorypolicy.go +++ b/spinifex/gateway/ecrapi/repositorypolicy.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/nats-io/nats.go" ) diff --git a/spinifex/gateway/ecrapi/repositorypolicy_test.go b/spinifex/gateway/ecrapi/repositorypolicy_test.go index cae102466..c935106b2 100644 --- a/spinifex/gateway/ecrapi/repositorypolicy_test.go +++ b/spinifex/gateway/ecrapi/repositorypolicy_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ecr" - "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/mulgadc/spinifex/internal/testkit" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" + "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" "github.com/mulgadc/spinifex/spinifex/utils" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/spinifex/gateway/ecrapi/tags.go b/spinifex/gateway/ecrapi/tags.go index dd5824284..2d64e5a33 100644 --- a/spinifex/gateway/ecrapi/tags.go +++ b/spinifex/gateway/ecrapi/tags.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" "github.com/nats-io/nats.go" ) diff --git a/spinifex/gateway/ecrapi/validation.go b/spinifex/gateway/ecrapi/validation.go index 79cf54d57..793194a1b 100644 --- a/spinifex/gateway/ecrapi/validation.go +++ b/spinifex/gateway/ecrapi/validation.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/aws/errors" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" ) // repositoryNamePattern is the expression AWS names when it refuses a diff --git a/spinifex/services/awsgw/awsgw.go b/spinifex/services/awsgw/awsgw.go index 4bb970d54..c9733fe33 100644 --- a/spinifex/services/awsgw/awsgw.go +++ b/spinifex/services/awsgw/awsgw.go @@ -22,6 +22,7 @@ import ( "github.com/mulgadc/spinifex/spinifex/admin" "github.com/mulgadc/spinifex/spinifex/bootstrap/config" "github.com/mulgadc/spinifex/spinifex/daemon" + "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/foundation/lifecycle/reconciler" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore" "github.com/mulgadc/spinifex/spinifex/foundation/state/kvutil" @@ -32,7 +33,6 @@ import ( gateway_ecrauth "github.com/mulgadc/spinifex/spinifex/gateway/ecrauth" handlers_bedrock "github.com/mulgadc/spinifex/spinifex/handlers/bedrock" handlers_ec2_instance "github.com/mulgadc/spinifex/spinifex/handlers/ec2/instance" - "github.com/mulgadc/spinifex/spinifex/handlers/ecr" handlers_iam "github.com/mulgadc/spinifex/spinifex/handlers/iam" handlers_ochrevector "github.com/mulgadc/spinifex/spinifex/handlers/ochrevector" handlers_quota "github.com/mulgadc/spinifex/spinifex/handlers/quota" diff --git a/tests/integration/ecr_daemon_lite.go b/tests/integration/ecr_daemon_lite.go index 0db63b6b7..3f607eaf6 100644 --- a/tests/integration/ecr_daemon_lite.go +++ b/tests/integration/ecr_daemon_lite.go @@ -5,7 +5,7 @@ package integration import ( "testing" - handlers_ecr "github.com/mulgadc/spinifex/spinifex/handlers/ecr" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/nats-io/nats.go" ) diff --git a/tests/integration/harness.go b/tests/integration/harness.go index 0457db907..66e383999 100644 --- a/tests/integration/harness.go +++ b/tests/integration/harness.go @@ -33,11 +33,11 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/aws/aws-sdk-go/service/sts" clusterv1 "github.com/mulgadc/spinifex/contracts/cluster/v1" + handlers_ecr "github.com/mulgadc/spinifex/spinifex/domains/ecr" "github.com/mulgadc/spinifex/spinifex/gateway" gateway_bedrock "github.com/mulgadc/spinifex/spinifex/gateway/bedrock" gateway_ecr "github.com/mulgadc/spinifex/spinifex/gateway/ecr" gateway_ecrauth "github.com/mulgadc/spinifex/spinifex/gateway/ecrauth" - 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/providers/objectstore"