Skip to content

Commit 93e635b

Browse files
Ash-expnishant-d
andauthored
chore: dead code removal and app router & rest handler restructuring (#4595) (#4608)
* prom code removal * removed test suites * chore: removed support for unused Prometheus and ArgoCd APIs * chore: app router and rest handler restructuring * removed redundant routings * fixed: sub path * Updated alias and added queries to AppList group router --------- Co-authored-by: nishant <[email protected]>
1 parent ecd7cc0 commit 93e635b

File tree

66 files changed

+2022
-4440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2022
-4440
lines changed

Wire.go

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,26 @@ import (
4444
"github.com/devtron-labs/devtron/api/k8s"
4545
"github.com/devtron-labs/devtron/api/module"
4646
"github.com/devtron-labs/devtron/api/restHandler"
47-
pipeline2 "github.com/devtron-labs/devtron/api/restHandler/app"
47+
"github.com/devtron-labs/devtron/api/restHandler/app/appInfo"
48+
appList2 "github.com/devtron-labs/devtron/api/restHandler/app/appList"
49+
pipeline3 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline"
50+
pipeline2 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline/configure"
51+
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/history"
52+
status2 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline/status"
53+
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/trigger"
54+
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/webhook"
55+
"github.com/devtron-labs/devtron/api/restHandler/app/workflow"
4856
"github.com/devtron-labs/devtron/api/restHandler/scopedVariable"
4957
"github.com/devtron-labs/devtron/api/router"
58+
app3 "github.com/devtron-labs/devtron/api/router/app"
59+
appInfo2 "github.com/devtron-labs/devtron/api/router/app/appInfo"
60+
"github.com/devtron-labs/devtron/api/router/app/appList"
61+
pipeline5 "github.com/devtron-labs/devtron/api/router/app/pipeline"
62+
pipeline4 "github.com/devtron-labs/devtron/api/router/app/pipeline/configure"
63+
history2 "github.com/devtron-labs/devtron/api/router/app/pipeline/history"
64+
status3 "github.com/devtron-labs/devtron/api/router/app/pipeline/status"
65+
trigger2 "github.com/devtron-labs/devtron/api/router/app/pipeline/trigger"
66+
workflow2 "github.com/devtron-labs/devtron/api/router/app/workflow"
5067
"github.com/devtron-labs/devtron/api/router/pubsub"
5168
"github.com/devtron-labs/devtron/api/server"
5269
"github.com/devtron-labs/devtron/api/sse"
@@ -81,7 +98,6 @@ import (
8198
resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
8299
security2 "github.com/devtron-labs/devtron/internal/sql/repository/security"
83100
"github.com/devtron-labs/devtron/internal/util"
84-
"github.com/devtron-labs/devtron/internal/util/ArgoUtil"
85101
"github.com/devtron-labs/devtron/pkg/app"
86102
"github.com/devtron-labs/devtron/pkg/app/status"
87103
"github.com/devtron-labs/devtron/pkg/appClone"
@@ -184,8 +200,8 @@ func InitializeApp() (*App, error) {
184200
wire.Bind(new(session2.ServiceClient), new(*middleware.LoginService)),
185201

186202
sse.NewSSE,
187-
router.NewPipelineTriggerRouter,
188-
wire.Bind(new(router.PipelineTriggerRouter), new(*router.PipelineTriggerRouterImpl)),
203+
trigger2.NewPipelineTriggerRouter,
204+
wire.Bind(new(trigger2.PipelineTriggerRouter), new(*trigger2.PipelineTriggerRouterImpl)),
189205

190206
//---- pprof start ----
191207
restHandler.NewPProfRestHandler,
@@ -195,8 +211,8 @@ func InitializeApp() (*App, error) {
195211
wire.Bind(new(router.PProfRouter), new(*router.PProfRouterImpl)),
196212
//---- pprof end ----
197213

198-
restHandler.NewPipelineRestHandler,
199-
wire.Bind(new(restHandler.PipelineTriggerRestHandler), new(*restHandler.PipelineTriggerRestHandlerImpl)),
214+
trigger.NewPipelineRestHandler,
215+
wire.Bind(new(trigger.PipelineTriggerRestHandler), new(*trigger.PipelineTriggerRestHandlerImpl)),
200216
app.GetAppServiceConfig,
201217
app.NewAppService,
202218
wire.Bind(new(app.AppService), new(*app.AppServiceImpl)),
@@ -250,13 +266,25 @@ func InitializeApp() (*App, error) {
250266
wire.Bind(new(pipeline.CdPipelineConfigService), new(*pipeline.CdPipelineConfigServiceImpl)),
251267
pipeline.NewDevtronAppConfigServiceImpl,
252268
wire.Bind(new(pipeline.DevtronAppConfigService), new(*pipeline.DevtronAppConfigServiceImpl)),
269+
pipeline3.NewDevtronAppAutoCompleteRestHandlerImpl,
270+
wire.Bind(new(pipeline3.DevtronAppAutoCompleteRestHandler), new(*pipeline3.DevtronAppAutoCompleteRestHandlerImpl)),
253271

254272
util5.NewLoggingMiddlewareImpl,
255273
wire.Bind(new(util5.LoggingMiddleware), new(*util5.LoggingMiddlewareImpl)),
256274
pipeline2.NewPipelineRestHandlerImpl,
257275
wire.Bind(new(pipeline2.PipelineConfigRestHandler), new(*pipeline2.PipelineConfigRestHandlerImpl)),
258-
router.NewPipelineRouterImpl,
259-
wire.Bind(new(router.PipelineConfigRouter), new(*router.PipelineConfigRouterImpl)),
276+
277+
pipeline4.NewPipelineRouterImpl,
278+
wire.Bind(new(pipeline4.PipelineConfigRouter), new(*pipeline4.PipelineConfigRouterImpl)),
279+
history2.NewPipelineHistoryRouterImpl,
280+
wire.Bind(new(history2.PipelineHistoryRouter), new(*history2.PipelineHistoryRouterImpl)),
281+
status3.NewPipelineStatusRouterImpl,
282+
wire.Bind(new(status3.PipelineStatusRouter), new(*status3.PipelineStatusRouterImpl)),
283+
pipeline5.NewDevtronAppAutoCompleteRouterImpl,
284+
wire.Bind(new(pipeline5.DevtronAppAutoCompleteRouter), new(*pipeline5.DevtronAppAutoCompleteRouterImpl)),
285+
workflow2.NewAppWorkflowRouterImpl,
286+
wire.Bind(new(workflow2.AppWorkflowRouter), new(*workflow2.AppWorkflowRouterImpl)),
287+
260288
pipeline.NewCiCdPipelineOrchestrator,
261289
wire.Bind(new(pipeline.CiCdPipelineOrchestrator), new(*pipeline.CiCdPipelineOrchestratorImpl)),
262290
pipelineConfig.NewMaterialRepositoryImpl,
@@ -305,10 +333,15 @@ func InitializeApp() (*App, error) {
305333
pipeline.NewGitRegistryConfigImpl,
306334
wire.Bind(new(pipeline.GitRegistryConfig), new(*pipeline.GitRegistryConfigImpl)),
307335

308-
router.NewAppListingRouterImpl,
309-
wire.Bind(new(router.AppListingRouter), new(*router.AppListingRouterImpl)),
310-
restHandler.NewAppListingRestHandlerImpl,
311-
wire.Bind(new(restHandler.AppListingRestHandler), new(*restHandler.AppListingRestHandlerImpl)),
336+
appList.NewAppFilteringRouterImpl,
337+
wire.Bind(new(appList.AppFilteringRouter), new(*appList.AppFilteringRouterImpl)),
338+
appList2.NewAppFilteringRestHandlerImpl,
339+
wire.Bind(new(appList2.AppFilteringRestHandler), new(*appList2.AppFilteringRestHandlerImpl)),
340+
341+
appList.NewAppListingRouterImpl,
342+
wire.Bind(new(appList.AppListingRouter), new(*appList.AppListingRouterImpl)),
343+
appList2.NewAppListingRestHandlerImpl,
344+
wire.Bind(new(appList2.AppListingRestHandler), new(*appList2.AppListingRestHandlerImpl)),
312345
app.NewAppListingServiceImpl,
313346
wire.Bind(new(app.AppListingService), new(*app.AppListingServiceImpl)),
314347
repository.NewAppListingRepositoryImpl,
@@ -358,28 +391,9 @@ func InitializeApp() (*App, error) {
358391
repository2.NewServiceClientImpl,
359392
wire.Bind(new(repository2.ServiceClient), new(*repository2.ServiceClientImpl)),
360393
wire.Bind(new(connector.Pump), new(*connector.PumpImpl)),
361-
restHandler.NewArgoApplicationRestHandlerImpl,
362-
wire.Bind(new(restHandler.ArgoApplicationRestHandler), new(*restHandler.ArgoApplicationRestHandlerImpl)),
363-
router.NewApplicationRouterImpl,
364-
wire.Bind(new(router.ApplicationRouter), new(*router.ApplicationRouterImpl)),
394+
365395
//app.GetConfig,
366396

367-
router.NewCDRouterImpl,
368-
wire.Bind(new(router.CDRouter), new(*router.CDRouterImpl)),
369-
restHandler.NewCDRestHandlerImpl,
370-
wire.Bind(new(restHandler.CDRestHandler), new(*restHandler.CDRestHandlerImpl)),
371-
372-
ArgoUtil.GetArgoConfig,
373-
ArgoUtil.NewArgoSession,
374-
ArgoUtil.NewResourceServiceImpl,
375-
wire.Bind(new(ArgoUtil.ResourceService), new(*ArgoUtil.ResourceServiceImpl)),
376-
//ArgoUtil.NewApplicationServiceImpl,
377-
//wire.Bind(new(ArgoUtil.ApplicationService), new(ArgoUtil.ApplicationServiceImpl)),
378-
//ArgoUtil.NewRepositoryService,
379-
//wire.Bind(new(ArgoUtil.RepositoryService), new(ArgoUtil.RepositoryServiceImpl)),
380-
381-
//ArgoUtil.NewClusterServiceImpl,
382-
//wire.Bind(new(ArgoUtil.ClusterService), new(ArgoUtil.ClusterServiceImpl)),
383397
pipeline.GetEcrConfig,
384398
//otel.NewOtelTracingServiceImpl,
385399
//wire.Bind(new(otel.OtelTracingService), new(*otel.OtelTracingServiceImpl)),
@@ -513,8 +527,8 @@ func InitializeApp() (*App, error) {
513527
appStoreRestHandler.NewAppStoreRouterImpl,
514528
wire.Bind(new(appStoreRestHandler.AppStoreRouter), new(*appStoreRestHandler.AppStoreRouterImpl)),
515529

516-
restHandler.NewAppWorkflowRestHandlerImpl,
517-
wire.Bind(new(restHandler.AppWorkflowRestHandler), new(*restHandler.AppWorkflowRestHandlerImpl)),
530+
workflow.NewAppWorkflowRestHandlerImpl,
531+
wire.Bind(new(workflow.AppWorkflowRestHandler), new(*workflow.AppWorkflowRestHandlerImpl)),
518532

519533
appWorkflow.NewAppWorkflowServiceImpl,
520534
wire.Bind(new(appWorkflow.AppWorkflowService), new(*appWorkflow.AppWorkflowServiceImpl)),
@@ -704,13 +718,15 @@ func InitializeApp() (*App, error) {
704718
wire.Bind(new(repository.WebhookEventDataRepository), new(*repository.WebhookEventDataRepositoryImpl)),
705719
pipeline.NewWebhookEventDataConfigImpl,
706720
wire.Bind(new(pipeline.WebhookEventDataConfig), new(*pipeline.WebhookEventDataConfigImpl)),
707-
restHandler.NewWebhookDataRestHandlerImpl,
708-
wire.Bind(new(restHandler.WebhookDataRestHandler), new(*restHandler.WebhookDataRestHandlerImpl)),
721+
webhook.NewWebhookDataRestHandlerImpl,
722+
wire.Bind(new(webhook.WebhookDataRestHandler), new(*webhook.WebhookDataRestHandlerImpl)),
709723

710-
router.NewAppRouterImpl,
711-
wire.Bind(new(router.AppRouter), new(*router.AppRouterImpl)),
712-
restHandler.NewAppRestHandlerImpl,
713-
wire.Bind(new(restHandler.AppRestHandler), new(*restHandler.AppRestHandlerImpl)),
724+
app3.NewAppRouterImpl,
725+
wire.Bind(new(app3.AppRouter), new(*app3.AppRouterImpl)),
726+
appInfo2.NewAppInfoRouterImpl,
727+
wire.Bind(new(appInfo2.AppInfoRouter), new(*appInfo2.AppInfoRouterImpl)),
728+
appInfo.NewAppInfoRestHandlerImpl,
729+
wire.Bind(new(appInfo.AppInfoRestHandler), new(*appInfo.AppInfoRestHandlerImpl)),
714730

715731
app.NewAppCrudOperationServiceImpl,
716732
wire.Bind(new(app.AppCrudOperationService), new(*app.AppCrudOperationServiceImpl)),
@@ -727,8 +743,8 @@ func InitializeApp() (*App, error) {
727743
// util2.NewGoJsonSchemaCustomFormatChecker,
728744

729745
//history starts
730-
restHandler.NewPipelineHistoryRestHandlerImpl,
731-
wire.Bind(new(restHandler.PipelineHistoryRestHandler), new(*restHandler.PipelineHistoryRestHandlerImpl)),
746+
history.NewPipelineHistoryRestHandlerImpl,
747+
wire.Bind(new(history.PipelineHistoryRestHandler), new(*history.PipelineHistoryRestHandlerImpl)),
732748

733749
repository3.NewConfigMapHistoryRepositoryImpl,
734750
wire.Bind(new(repository3.ConfigMapHistoryRepository), new(*repository3.ConfigMapHistoryRepositoryImpl)),
@@ -817,8 +833,8 @@ func InitializeApp() (*App, error) {
817833
cron.NewCiTriggerCronImpl,
818834
wire.Bind(new(cron.CiTriggerCron), new(*cron.CiTriggerCronImpl)),
819835

820-
restHandler.NewPipelineStatusTimelineRestHandlerImpl,
821-
wire.Bind(new(restHandler.PipelineStatusTimelineRestHandler), new(*restHandler.PipelineStatusTimelineRestHandlerImpl)),
836+
status2.NewPipelineStatusTimelineRestHandlerImpl,
837+
wire.Bind(new(status2.PipelineStatusTimelineRestHandler), new(*status2.PipelineStatusTimelineRestHandlerImpl)),
822838

823839
status.NewPipelineStatusTimelineServiceImpl,
824840
wire.Bind(new(status.PipelineStatusTimelineService), new(*status.PipelineStatusTimelineServiceImpl)),

0 commit comments

Comments
 (0)