Skip to content

Commit 634eb59

Browse files
authored
fix: global auth apis wire register for ea mode (#6929)
* fix: global auth apis wire register for ea mode * fix: linting
1 parent 37b07f1 commit 634eb59

File tree

2 files changed

+63
-54
lines changed

2 files changed

+63
-54
lines changed

cmd/external-app/router.go

Lines changed: 61 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
2525
appStoreValues "github.com/devtron-labs/devtron/api/appStore/values"
2626
"github.com/devtron-labs/devtron/api/argoApplication"
27+
globalConfigAPI "github.com/devtron-labs/devtron/api/auth/authorisation/globalConfig"
2728
"github.com/devtron-labs/devtron/api/auth/sso"
2829
"github.com/devtron-labs/devtron/api/auth/user"
2930
"github.com/devtron-labs/devtron/api/chartRepo"
@@ -70,24 +71,25 @@ type MuxRouter struct {
7071
chartProviderRouter chartProvider.ChartProviderRouter
7172
dockerRegRouter router.DockerRegRouter
7273

73-
dashboardTelemetryRouter dashboardEvent.DashboardTelemetryRouter
74-
commonDeploymentRouter appStoreDeployment.CommonDeploymentRouter
75-
externalLinksRouter externalLink.ExternalLinkRouter
76-
moduleRouter module.ModuleRouter
77-
serverRouter server.ServerRouter
78-
apiTokenRouter apiToken.ApiTokenRouter
79-
k8sCapacityRouter capacity.K8sCapacityRouter
80-
webhookHelmRouter webhookHelm.WebhookHelmRouter
81-
userAttributesRouter router.UserAttributesRouter
82-
telemetryRouter router.TelemetryRouter
83-
userTerminalAccessRouter terminal.UserTerminalAccessRouter
84-
attributesRouter router.AttributesRouter
85-
appRouter app.AppRouterEAMode
86-
rbacRoleRouter user.RbacRoleRouter
87-
argoApplicationRouter argoApplication.ArgoApplicationRouter
88-
fluxApplicationRouter fluxApplication.FluxApplicationRouter
89-
userResourceRouter userResource.Router
90-
infraOverviewRouter router.InfraOverviewRouter
74+
dashboardTelemetryRouter dashboardEvent.DashboardTelemetryRouter
75+
commonDeploymentRouter appStoreDeployment.CommonDeploymentRouter
76+
externalLinksRouter externalLink.ExternalLinkRouter
77+
moduleRouter module.ModuleRouter
78+
serverRouter server.ServerRouter
79+
apiTokenRouter apiToken.ApiTokenRouter
80+
k8sCapacityRouter capacity.K8sCapacityRouter
81+
webhookHelmRouter webhookHelm.WebhookHelmRouter
82+
userAttributesRouter router.UserAttributesRouter
83+
telemetryRouter router.TelemetryRouter
84+
userTerminalAccessRouter terminal.UserTerminalAccessRouter
85+
attributesRouter router.AttributesRouter
86+
appRouter app.AppRouterEAMode
87+
rbacRoleRouter user.RbacRoleRouter
88+
argoApplicationRouter argoApplication.ArgoApplicationRouter
89+
fluxApplicationRouter fluxApplication.FluxApplicationRouter
90+
userResourceRouter userResource.Router
91+
infraOverviewRouter router.InfraOverviewRouter
92+
globalAuthorisationConfigRouter globalConfigAPI.AuthorisationConfigRouter
9193
}
9294

9395
func NewMuxRouter(
@@ -123,44 +125,46 @@ func NewMuxRouter(
123125
rbacRoleRouter user.RbacRoleRouter, argoApplicationRouter argoApplication.ArgoApplicationRouter, fluxApplicationRouter fluxApplication.FluxApplicationRouter,
124126
userResourceRouter userResource.Router,
125127
infraOverviewRouter router.InfraOverviewRouter,
128+
globalAuthorisationConfigRouter globalConfigAPI.AuthorisationConfigRouter,
126129
) *MuxRouter {
127130
r := &MuxRouter{
128-
Router: mux.NewRouter(),
129-
logger: logger,
130-
ssoLoginRouter: ssoLoginRouter,
131-
teamRouter: teamRouter,
132-
UserAuthRouter: UserAuthRouter,
133-
userRouter: userRouter,
134-
commonRouter: commonRouter,
135-
clusterRouter: clusterRouter,
136-
dashboardRouter: dashboardRouter,
137-
helmAppRouter: helmAppRouter,
138-
environmentRouter: environmentRouter,
139-
k8sApplicationRouter: k8sApplicationRouter,
140-
chartRepositoryRouter: chartRepositoryRouter,
141-
appStoreDiscoverRouter: appStoreDiscoverRouter,
142-
appStoreValuesRouter: appStoreValuesRouter,
143-
appStoreDeploymentRouter: appStoreDeploymentRouter,
144-
chartProviderRouter: chartProviderRouter,
145-
dockerRegRouter: dockerRegRouter,
146-
dashboardTelemetryRouter: dashboardTelemetryRouter,
147-
commonDeploymentRouter: commonDeploymentRouter,
148-
externalLinksRouter: externalLinkRouter,
149-
moduleRouter: moduleRouter,
150-
serverRouter: serverRouter,
151-
apiTokenRouter: apiTokenRouter,
152-
k8sCapacityRouter: k8sCapacityRouter,
153-
webhookHelmRouter: webhookHelmRouter,
154-
userAttributesRouter: userAttributesRouter,
155-
telemetryRouter: telemetryRouter,
156-
userTerminalAccessRouter: userTerminalAccessRouter,
157-
attributesRouter: attributesRouter,
158-
appRouter: appRouter,
159-
rbacRoleRouter: rbacRoleRouter,
160-
argoApplicationRouter: argoApplicationRouter,
161-
fluxApplicationRouter: fluxApplicationRouter,
162-
userResourceRouter: userResourceRouter,
163-
infraOverviewRouter: infraOverviewRouter,
131+
Router: mux.NewRouter(),
132+
logger: logger,
133+
ssoLoginRouter: ssoLoginRouter,
134+
teamRouter: teamRouter,
135+
UserAuthRouter: UserAuthRouter,
136+
userRouter: userRouter,
137+
commonRouter: commonRouter,
138+
clusterRouter: clusterRouter,
139+
dashboardRouter: dashboardRouter,
140+
helmAppRouter: helmAppRouter,
141+
environmentRouter: environmentRouter,
142+
k8sApplicationRouter: k8sApplicationRouter,
143+
chartRepositoryRouter: chartRepositoryRouter,
144+
appStoreDiscoverRouter: appStoreDiscoverRouter,
145+
appStoreValuesRouter: appStoreValuesRouter,
146+
appStoreDeploymentRouter: appStoreDeploymentRouter,
147+
chartProviderRouter: chartProviderRouter,
148+
dockerRegRouter: dockerRegRouter,
149+
dashboardTelemetryRouter: dashboardTelemetryRouter,
150+
commonDeploymentRouter: commonDeploymentRouter,
151+
externalLinksRouter: externalLinkRouter,
152+
moduleRouter: moduleRouter,
153+
serverRouter: serverRouter,
154+
apiTokenRouter: apiTokenRouter,
155+
k8sCapacityRouter: k8sCapacityRouter,
156+
webhookHelmRouter: webhookHelmRouter,
157+
userAttributesRouter: userAttributesRouter,
158+
telemetryRouter: telemetryRouter,
159+
userTerminalAccessRouter: userTerminalAccessRouter,
160+
attributesRouter: attributesRouter,
161+
appRouter: appRouter,
162+
rbacRoleRouter: rbacRoleRouter,
163+
argoApplicationRouter: argoApplicationRouter,
164+
fluxApplicationRouter: fluxApplicationRouter,
165+
userResourceRouter: userResourceRouter,
166+
infraOverviewRouter: infraOverviewRouter,
167+
globalAuthorisationConfigRouter: globalAuthorisationConfigRouter,
164168
}
165169
return r
166170
}
@@ -308,4 +312,7 @@ func (r *MuxRouter) Init() {
308312
infraOverviewRouter := r.Router.PathPrefix("/orchestrator/overview/infra").Subrouter()
309313
r.infraOverviewRouter.InitInfraOverviewRouter(infraOverviewRouter)
310314

315+
authorisationConfigRouter := r.Router.PathPrefix("/orchestrator/authorisation").Subrouter()
316+
r.globalAuthorisationConfigRouter.InitAuthorisationConfigRouter(authorisationConfigRouter)
317+
311318
}

cmd/external-app/wire.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
3232
appStoreValues "github.com/devtron-labs/devtron/api/appStore/values"
3333
"github.com/devtron-labs/devtron/api/argoApplication"
34+
globalConfigAPI "github.com/devtron-labs/devtron/api/auth/authorisation/globalConfig"
3435
"github.com/devtron-labs/devtron/api/auth/sso"
3536
"github.com/devtron-labs/devtron/api/auth/user"
3637
chartRepo "github.com/devtron-labs/devtron/api/chartRepo"
@@ -108,6 +109,7 @@ func InitializeApp() (*App, error) {
108109
user.UserWireSet,
109110
sso.SsoConfigWireSet,
110111
AuthWireSet,
112+
globalConfigAPI.GlobalConfigWireSet,
111113
util4.GetRuntimeConfig,
112114
util4.NewK8sUtil,
113115
externalLink.ExternalLinkWireSet,

0 commit comments

Comments
 (0)