From be652dd283d8c42adddedc66d6ba9210d5bdb511 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 1 May 2025 16:04:48 -0600 Subject: refactor: extract helper to log errors consistently --- app/init.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/init.go') diff --git a/app/init.go b/app/init.go index 74b4bfa..30a6dbb 100644 --- a/app/init.go +++ b/app/init.go @@ -6,9 +6,9 @@ import ( "os" "github.com/rs/zerolog" - "github.com/xlgmokha/x/pkg/env" "github.com/xlgmokha/x/pkg/ioc" "github.com/xlgmokha/x/pkg/log" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/controllers/dashboard" "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" @@ -50,12 +50,13 @@ func init() { } }) ioc.RegisterSingleton[*oidc.OpenID](ioc.Default, func() *oidc.OpenID { + ctx := context.WithValue(context.Background(), oauth2.HTTPClient, ioc.MustResolve[*http.Client](ioc.Default)) item, err := oidc.New( - context.WithValue(context.Background(), oauth2.HTTPClient, ioc.MustResolve[*http.Client](ioc.Default)), - env.Fetch("OIDC_ISSUER", "https://gitlab.com"), - env.Fetch("OAUTH_CLIENT_ID", "client_id"), - env.Fetch("OAUTH_CLIENT_SECRET", "client_secret"), - env.Fetch("OAUTH_REDIRECT_URL", "http://localhost:8080/session/callback"), + ctx, + cfg.OIDCIssuer, + cfg.OAuthClientID, + cfg.OAuthClientSecret, + cfg.OAuthRedirectURL, ) if err != nil { ioc.MustResolve[*zerolog.Logger](ioc.Default).Err(err).Send() -- cgit v1.2.3