diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.go | 3 | ||||
| -rw-r--r-- | app/controllers/sparkles/controller.go | 5 | ||||
| -rw-r--r-- | app/init.go | 6 |
3 files changed, 6 insertions, 8 deletions
@@ -11,7 +11,6 @@ import ( "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/health" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/sessions" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/sparkles" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/db" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/web" @@ -36,7 +35,7 @@ func New(rootDir string) http.Handler { logger := ioc.MustResolve[*zerolog.Logger](ioc.Default) oidc := ioc.MustResolve[*oidc.OpenID](ioc.Default) - users := ioc.MustResolve[db.Repository[*domain.User]](ioc.Default) + users := ioc.MustResolve[domain.Repository[*domain.User]](ioc.Default) chain := middleware.IDToken(oidc)(middleware.User(users)(mux)) return log.HTTP(logger)(chain) diff --git a/app/controllers/sparkles/controller.go b/app/controllers/sparkles/controller.go index 04eee12..bda7151 100644 --- a/app/controllers/sparkles/controller.go +++ b/app/controllers/sparkles/controller.go @@ -7,16 +7,15 @@ import ( "github.com/xlgmokha/x/pkg/mapper" "github.com/xlgmokha/x/pkg/serde" "github.com/xlgmokha/x/pkg/x" - "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/db" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/web/middleware" ) type Controller struct { - db db.Repository[*domain.Sparkle] + db domain.Repository[*domain.Sparkle] } -func New(db db.Repository[*domain.Sparkle]) *Controller { +func New(db domain.Repository[*domain.Sparkle]) *Controller { return &Controller{db: db} } diff --git a/app/init.go b/app/init.go index f889fd9..3d1cbd0 100644 --- a/app/init.go +++ b/app/init.go @@ -24,10 +24,10 @@ func init() { ioc.RegisterSingleton[*zerolog.Logger](ioc.Default, func() *zerolog.Logger { return log.New(os.Stdout, log.Fields{}) }) - ioc.RegisterSingleton[db.Repository[*domain.Sparkle]](ioc.Default, func() db.Repository[*domain.Sparkle] { + ioc.RegisterSingleton[domain.Repository[*domain.Sparkle]](ioc.Default, func() domain.Repository[*domain.Sparkle] { return db.NewRepository[*domain.Sparkle]() }) - ioc.RegisterSingleton[db.Repository[*domain.User]](ioc.Default, func() db.Repository[*domain.User] { + ioc.RegisterSingleton[domain.Repository[*domain.User]](ioc.Default, func() domain.Repository[*domain.User] { return db.NewRepository[*domain.User]() }) ioc.RegisterSingleton[*http.ServeMux](ioc.Default, func() *http.ServeMux { @@ -37,7 +37,7 @@ func init() { return dashboard.New() }) ioc.Register[*sparkles.Controller](ioc.Default, func() *sparkles.Controller { - return sparkles.New(ioc.MustResolve[db.Repository[*domain.Sparkle]](ioc.Default)) + return sparkles.New(ioc.MustResolve[domain.Repository[*domain.Sparkle]](ioc.Default)) }) ioc.Register[*health.Controller](ioc.Default, func() *health.Controller { return health.New() |