From 9f1cde18b2d27c1aa77114921b9d12683ece32c7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 20 Nov 2024 22:04:49 +0100 Subject: [PATCH] go: use fixed names Signed-off-by: Jens Langhammer --- internal/outpost/ak/api.go | 6 +++--- internal/outpost/ak/crypto.go | 4 ++-- internal/outpost/flow/executor.go | 6 +++--- internal/outpost/ldap/bind/direct/bind.go | 4 ++-- internal/outpost/ldap/ldap.go | 2 +- internal/outpost/ldap/refresh.go | 2 +- internal/outpost/ldap/search/direct/direct.go | 6 +++--- internal/outpost/ldap/search/memory/memory.go | 4 ++-- internal/outpost/proxyv2/application/mode_common.go | 2 +- internal/outpost/proxyv2/proxyv2.go | 2 +- internal/outpost/proxyv2/refresh.go | 2 +- internal/outpost/radius/api.go | 2 +- internal/outpost/radius/handle_access_request.go | 2 +- internal/web/brand_tls/brand_tls.go | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/outpost/ak/api.go b/internal/outpost/ak/api.go index 2def064273..27514e0aaf 100644 --- a/internal/outpost/ak/api.go +++ b/internal/outpost/ak/api.go @@ -80,7 +80,7 @@ func NewAPIController(akURL url.URL, token string) *APIController { var outposts *api.PaginatedOutpostList var err error for { - outposts, _, err = apiClient.OutpostsApi.OutpostsInstancesList(context.Background()).Execute() + outposts, _, err = apiClient.OutpostsAPI.OutpostsInstancesList(context.Background()).Execute() if err == nil { break @@ -96,7 +96,7 @@ func NewAPIController(akURL url.URL, token string) *APIController { log.WithField("name", outpost.Name).Debug("Fetched outpost configuration") - akConfig, _, err := apiClient.RootApi.RootConfigRetrieve(context.Background()).Execute() + akConfig, _, err := apiClient.RootAPI.RootConfigRetrieve(context.Background()).Execute() if err != nil { log.WithError(err).Error("Failed to fetch global configuration") return nil @@ -174,7 +174,7 @@ func (a *APIController) Token() string { func (a *APIController) OnRefresh() error { // Because we don't know the outpost UUID, we simply do a list and pick the first // The service account this token belongs to should only have access to a single outpost - outposts, _, err := a.Client.OutpostsApi.OutpostsInstancesList(context.Background()).Execute() + outposts, _, err := a.Client.OutpostsAPI.OutpostsInstancesList(context.Background()).Execute() if err != nil { log.WithError(err).Error("Failed to fetch outpost configuration") return err diff --git a/internal/outpost/ak/crypto.go b/internal/outpost/ak/crypto.go index 824bd526ef..85229e0cf8 100644 --- a/internal/outpost/ak/crypto.go +++ b/internal/outpost/ak/crypto.go @@ -9,7 +9,7 @@ import ( ) type CryptoStore struct { - api *api.CryptoApiService + api *api.CryptoAPIService log *log.Entry @@ -17,7 +17,7 @@ type CryptoStore struct { certificates map[string]*tls.Certificate } -func NewCryptoStore(cryptoApi *api.CryptoApiService) *CryptoStore { +func NewCryptoStore(cryptoApi *api.CryptoAPIService) *CryptoStore { return &CryptoStore{ api: cryptoApi, log: log.WithField("logger", "authentik.outpost.cryptostore"), diff --git a/internal/outpost/flow/executor.go b/internal/outpost/flow/executor.go index 162aafb7e6..d6fdec2f0b 100644 --- a/internal/outpost/flow/executor.go +++ b/internal/outpost/flow/executor.go @@ -139,7 +139,7 @@ func (fe *FlowExecutor) SetSession(s *http.Cookie) { func (fe *FlowExecutor) WarmUp() error { gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge") defer gcsp.Finish() - req := fe.api.FlowsApi.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) + req := fe.api.FlowsAPI.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) _, _, err := req.Execute() return err } @@ -156,7 +156,7 @@ func (fe *FlowExecutor) Execute() (bool, error) { func (fe *FlowExecutor) getInitialChallenge() (*api.ChallengeTypes, error) { // Get challenge gcsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.get_challenge") - req := fe.api.FlowsApi.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) + req := fe.api.FlowsAPI.FlowsExecutorGet(gcsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) challenge, _, err := req.Execute() if err != nil { return nil, err @@ -179,7 +179,7 @@ func (fe *FlowExecutor) getInitialChallenge() (*api.ChallengeTypes, error) { func (fe *FlowExecutor) solveFlowChallenge(challenge *api.ChallengeTypes, depth int) (bool, error) { // Resole challenge scsp := sentry.StartSpan(fe.Context, "authentik.outposts.flow_executor.solve_challenge") - responseReq := fe.api.FlowsApi.FlowsExecutorSolve(scsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) + responseReq := fe.api.FlowsAPI.FlowsExecutorSolve(scsp.Context(), fe.flowSlug).Query(fe.Params.Encode()) i := challenge.GetActualInstance() if i == nil { return false, errors.New("response request instance was null") diff --git a/internal/outpost/ldap/bind/direct/bind.go b/internal/outpost/ldap/bind/direct/bind.go index 36697fbe0f..93fbf3d86e 100644 --- a/internal/outpost/ldap/bind/direct/bind.go +++ b/internal/outpost/ldap/bind/direct/bind.go @@ -58,7 +58,7 @@ func (db *DirectBinder) Bind(username string, req *bind.Request) (ldap.LDAPResul return ldap.LDAPResultInvalidCredentials, nil } - access, _, err := fe.ApiClient().OutpostsApi.OutpostsLdapAccessCheck( + access, _, err := fe.ApiClient().OutpostsAPI.OutpostsLdapAccessCheck( req.Context(), db.si.GetProviderID(), ).AppSlug(db.si.GetAppSlug()).Execute() if !access.Access.Passing { @@ -84,7 +84,7 @@ func (db *DirectBinder) Bind(username string, req *bind.Request) (ldap.LDAPResul req.Log().Info("User has access") uisp := sentry.StartSpan(req.Context(), "authentik.providers.ldap.bind.user_info") // Get user info to store in context - userInfo, _, err := fe.ApiClient().CoreApi.CoreUsersMeRetrieve(context.Background()).Execute() + userInfo, _, err := fe.ApiClient().CoreAPI.CoreUsersMeRetrieve(context.Background()).Execute() if err != nil { metrics.RequestsRejected.With(prometheus.Labels{ "outpost_name": db.si.GetOutpostName(), diff --git a/internal/outpost/ldap/ldap.go b/internal/outpost/ldap/ldap.go index 383682c78a..57a7324a6d 100644 --- a/internal/outpost/ldap/ldap.go +++ b/internal/outpost/ldap/ldap.go @@ -30,7 +30,7 @@ func NewServer(ac *ak.APIController) *LDAPServer { ls := &LDAPServer{ log: log.WithField("logger", "authentik.outpost.ldap"), ac: ac, - cs: ak.NewCryptoStore(ac.Client.CryptoApi), + cs: ak.NewCryptoStore(ac.Client.CryptoAPI), providers: []*ProviderInstance{}, } s := ldap.NewServer() diff --git a/internal/outpost/ldap/refresh.go b/internal/outpost/ldap/refresh.go index 0f00bbeb26..0a8273f4c6 100644 --- a/internal/outpost/ldap/refresh.go +++ b/internal/outpost/ldap/refresh.go @@ -30,7 +30,7 @@ func (ls *LDAPServer) getCurrentProvider(pk int32) *ProviderInstance { } func (ls *LDAPServer) Refresh() error { - apiProviders, err := ak.Paginator(ls.ac.Client.OutpostsApi.OutpostsLdapList(context.Background()), ak.PaginatorOptions{ + apiProviders, err := ak.Paginator(ls.ac.Client.OutpostsAPI.OutpostsLdapList(context.Background()), ak.PaginatorOptions{ PageSize: 100, Logger: ls.log, }) diff --git a/internal/outpost/ldap/search/direct/direct.go b/internal/outpost/ldap/search/direct/direct.go index fdc52e4111..ced80fb03c 100644 --- a/internal/outpost/ldap/search/direct/direct.go +++ b/internal/outpost/ldap/search/direct/direct.go @@ -113,7 +113,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, errs.Go(func() error { if flags.CanSearch { uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user") - searchReq, skip := utils.ParseFilterForUser(c.CoreApi.CoreUsersList(uapisp.Context()).IncludeGroups(true), parsedFilter, false) + searchReq, skip := utils.ParseFilterForUser(c.CoreAPI.CoreUsersList(uapisp.Context()).IncludeGroups(true), parsedFilter, false) if skip { req.Log().Trace("Skip backend request") @@ -132,7 +132,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, } else { if flags.UserInfo == nil { uapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_user") - u, _, err := c.CoreApi.CoreUsersRetrieve(uapisp.Context(), flags.UserPk).Execute() + u, _, err := c.CoreAPI.CoreUsersRetrieve(uapisp.Context(), flags.UserPk).Execute() uapisp.Finish() if err != nil { @@ -155,7 +155,7 @@ func (ds *DirectSearcher) Search(req *search.Request) (ldap.ServerSearchResult, if needGroups { errs.Go(func() error { gapisp := sentry.StartSpan(errCtx, "authentik.providers.ldap.search.api_group") - searchReq, skip := utils.ParseFilterForGroup(c.CoreApi.CoreGroupsList(gapisp.Context()).IncludeUsers(true), parsedFilter, false) + searchReq, skip := utils.ParseFilterForGroup(c.CoreAPI.CoreGroupsList(gapisp.Context()).IncludeUsers(true), parsedFilter, false) if skip { req.Log().Trace("Skip backend request") return nil diff --git a/internal/outpost/ldap/search/memory/memory.go b/internal/outpost/ldap/search/memory/memory.go index 0236cd9f28..713cd06ffb 100644 --- a/internal/outpost/ldap/search/memory/memory.go +++ b/internal/outpost/ldap/search/memory/memory.go @@ -39,12 +39,12 @@ func NewMemorySearcher(si server.LDAPServerInstance) *MemorySearcher { } ms.log.Debug("initialised memory searcher") // Error is not handled here, we get an empty/truncated list and the error is logged - users, _ := ak.Paginator(ms.si.GetAPIClient().CoreApi.CoreUsersList(context.TODO()).IncludeGroups(true), ak.PaginatorOptions{ + users, _ := ak.Paginator(ms.si.GetAPIClient().CoreAPI.CoreUsersList(context.TODO()).IncludeGroups(true), ak.PaginatorOptions{ PageSize: 100, Logger: ms.log, }) ms.users = users - groups, _ := ak.Paginator(ms.si.GetAPIClient().CoreApi.CoreGroupsList(context.TODO()).IncludeUsers(true), ak.PaginatorOptions{ + groups, _ := ak.Paginator(ms.si.GetAPIClient().CoreAPI.CoreGroupsList(context.TODO()).IncludeUsers(true), ak.PaginatorOptions{ PageSize: 100, Logger: ms.log, }) diff --git a/internal/outpost/proxyv2/application/mode_common.go b/internal/outpost/proxyv2/application/mode_common.go index 5866f5850b..2accafc45c 100644 --- a/internal/outpost/proxyv2/application/mode_common.go +++ b/internal/outpost/proxyv2/application/mode_common.go @@ -120,7 +120,7 @@ func (a *Application) ReportMisconfiguration(r *http.Request, msg string, fields ClientIp: *api.NewNullableString(api.PtrString(r.RemoteAddr)), Context: fields, } - _, _, err := a.ak.Client.EventsApi.EventsEventsCreate(context.Background()).EventRequest(req).Execute() + _, _, err := a.ak.Client.EventsAPI.EventsEventsCreate(context.Background()).EventRequest(req).Execute() if err != nil { a.log.WithError(err).Warning("failed to report configuration error") } diff --git a/internal/outpost/proxyv2/proxyv2.go b/internal/outpost/proxyv2/proxyv2.go index eed0ef18ac..093285ad6e 100644 --- a/internal/outpost/proxyv2/proxyv2.go +++ b/internal/outpost/proxyv2/proxyv2.go @@ -56,7 +56,7 @@ func NewProxyServer(ac *ak.APIController) *ProxyServer { globalMux.Use(sentryhttp.New(sentryhttp.Options{}).Handle) } s := &ProxyServer{ - cryptoStore: ak.NewCryptoStore(ac.Client.CryptoApi), + cryptoStore: ak.NewCryptoStore(ac.Client.CryptoAPI), apps: make(map[string]*application.Application), log: l, mux: rootMux, diff --git a/internal/outpost/proxyv2/refresh.go b/internal/outpost/proxyv2/refresh.go index cddd4363c1..3bdd0b1957 100644 --- a/internal/outpost/proxyv2/refresh.go +++ b/internal/outpost/proxyv2/refresh.go @@ -15,7 +15,7 @@ import ( ) func (ps *ProxyServer) Refresh() error { - providers, err := ak.Paginator(ps.akAPI.Client.OutpostsApi.OutpostsProxyList(context.Background()), ak.PaginatorOptions{ + providers, err := ak.Paginator(ps.akAPI.Client.OutpostsAPI.OutpostsProxyList(context.Background()), ak.PaginatorOptions{ PageSize: 100, Logger: ps.log, }) diff --git a/internal/outpost/radius/api.go b/internal/outpost/radius/api.go index 947fb7bf94..4fe116d496 100644 --- a/internal/outpost/radius/api.go +++ b/internal/outpost/radius/api.go @@ -31,7 +31,7 @@ func parseCIDRs(raw string) []*net.IPNet { } func (rs *RadiusServer) Refresh() error { - apiProviders, err := ak.Paginator(rs.ac.Client.OutpostsApi.OutpostsRadiusList(context.Background()), ak.PaginatorOptions{ + apiProviders, err := ak.Paginator(rs.ac.Client.OutpostsAPI.OutpostsRadiusList(context.Background()), ak.PaginatorOptions{ PageSize: 100, Logger: rs.log, }) diff --git a/internal/outpost/radius/handle_access_request.go b/internal/outpost/radius/handle_access_request.go index 308279cb4b..88c3c04111 100644 --- a/internal/outpost/radius/handle_access_request.go +++ b/internal/outpost/radius/handle_access_request.go @@ -45,7 +45,7 @@ func (rs *RadiusServer) Handle_AccessRequest(w radius.ResponseWriter, r *RadiusR _ = w.Write(r.Response(radius.CodeAccessReject)) return } - access, _, err := fe.ApiClient().OutpostsApi.OutpostsRadiusAccessCheck( + access, _, err := fe.ApiClient().OutpostsAPI.OutpostsRadiusAccessCheck( r.Context(), r.pi.providerId, ).AppSlug(r.pi.appSlug).Execute() if err != nil { diff --git a/internal/web/brand_tls/brand_tls.go b/internal/web/brand_tls/brand_tls.go index 107cf904c5..a19d0776db 100644 --- a/internal/web/brand_tls/brand_tls.go +++ b/internal/web/brand_tls/brand_tls.go @@ -22,7 +22,7 @@ type Watcher struct { } func NewWatcher(client *api.APIClient) *Watcher { - cs := ak.NewCryptoStore(client.CryptoApi) + cs := ak.NewCryptoStore(client.CryptoAPI) l := log.WithField("logger", "authentik.router.brand_tls") cert, err := crypto.GenerateSelfSignedCert() if err != nil { @@ -47,7 +47,7 @@ func (w *Watcher) Start() { func (w *Watcher) Check() { w.log.Info("updating brand certificates") - brands, err := ak.Paginator(w.client.CoreApi.CoreBrandsList(context.Background()), ak.PaginatorOptions{ + brands, err := ak.Paginator(w.client.CoreAPI.CoreBrandsList(context.Background()), ak.PaginatorOptions{ PageSize: 100, Logger: w.log, })