Skip to content

chore: dead code removal and app router & rest handler restructuring #4595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 30, 2024
Merged

chore: dead code removal and app router & rest handler restructuring #4595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1fcfbed
prom code removal
nishant-d Jan 21, 2024
1eef76a
removed test suites
nishant-d Jan 21, 2024
22938ec
Merge branch 'chore-dead-code-cleanup' into prom-code-remove
Ash-exp Jan 24, 2024
ad9a8b0
chore: removed support for unused Prometheus and ArgoCd APIs
Ash-exp Jan 25, 2024
90efab1
chore: app router and rest handler restructuring
Ash-exp Jan 28, 2024
ae68b3e
removed redundant routings
Ash-exp Jan 29, 2024
7fac593
fixed: sub path
Ash-exp Jan 30, 2024
0a368fc
Updated alias and added queries to AppList group router
Ash-exp Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 60 additions & 44 deletions Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,26 @@ import (
"github.com/devtron-labs/devtron/api/k8s"
"github.com/devtron-labs/devtron/api/module"
"github.com/devtron-labs/devtron/api/restHandler"
pipeline2 "github.com/devtron-labs/devtron/api/restHandler/app"
"github.com/devtron-labs/devtron/api/restHandler/app/appInfo"
appList2 "github.com/devtron-labs/devtron/api/restHandler/app/appList"
pipeline3 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline"
pipeline2 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline/configure"
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/history"
status2 "github.com/devtron-labs/devtron/api/restHandler/app/pipeline/status"
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/trigger"
"github.com/devtron-labs/devtron/api/restHandler/app/pipeline/webhook"
"github.com/devtron-labs/devtron/api/restHandler/app/workflow"
"github.com/devtron-labs/devtron/api/restHandler/scopedVariable"
"github.com/devtron-labs/devtron/api/router"
app3 "github.com/devtron-labs/devtron/api/router/app"
appInfo2 "github.com/devtron-labs/devtron/api/router/app/appInfo"
"github.com/devtron-labs/devtron/api/router/app/appList"
pipeline5 "github.com/devtron-labs/devtron/api/router/app/pipeline"
pipeline4 "github.com/devtron-labs/devtron/api/router/app/pipeline/configure"
history2 "github.com/devtron-labs/devtron/api/router/app/pipeline/history"
status3 "github.com/devtron-labs/devtron/api/router/app/pipeline/status"
trigger2 "github.com/devtron-labs/devtron/api/router/app/pipeline/trigger"
workflow2 "github.com/devtron-labs/devtron/api/router/app/workflow"
"github.com/devtron-labs/devtron/api/router/pubsub"
"github.com/devtron-labs/devtron/api/server"
"github.com/devtron-labs/devtron/api/sse"
Expand Down Expand Up @@ -81,7 +98,6 @@ import (
resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
security2 "github.com/devtron-labs/devtron/internal/sql/repository/security"
"github.com/devtron-labs/devtron/internal/util"
"github.com/devtron-labs/devtron/internal/util/ArgoUtil"
"github.com/devtron-labs/devtron/pkg/app"
"github.com/devtron-labs/devtron/pkg/app/status"
"github.com/devtron-labs/devtron/pkg/appClone"
Expand Down Expand Up @@ -183,8 +199,8 @@ func InitializeApp() (*App, error) {
wire.Bind(new(session2.ServiceClient), new(*middleware.LoginService)),

sse.NewSSE,
router.NewPipelineTriggerRouter,
wire.Bind(new(router.PipelineTriggerRouter), new(*router.PipelineTriggerRouterImpl)),
trigger2.NewPipelineTriggerRouter,
wire.Bind(new(trigger2.PipelineTriggerRouter), new(*trigger2.PipelineTriggerRouterImpl)),

//---- pprof start ----
restHandler.NewPProfRestHandler,
Expand All @@ -194,8 +210,8 @@ func InitializeApp() (*App, error) {
wire.Bind(new(router.PProfRouter), new(*router.PProfRouterImpl)),
//---- pprof end ----

restHandler.NewPipelineRestHandler,
wire.Bind(new(restHandler.PipelineTriggerRestHandler), new(*restHandler.PipelineTriggerRestHandlerImpl)),
trigger.NewPipelineRestHandler,
wire.Bind(new(trigger.PipelineTriggerRestHandler), new(*trigger.PipelineTriggerRestHandlerImpl)),
app.GetAppServiceConfig,
app.NewAppService,
wire.Bind(new(app.AppService), new(*app.AppServiceImpl)),
Expand Down Expand Up @@ -249,13 +265,25 @@ func InitializeApp() (*App, error) {
wire.Bind(new(pipeline.CdPipelineConfigService), new(*pipeline.CdPipelineConfigServiceImpl)),
pipeline.NewDevtronAppConfigServiceImpl,
wire.Bind(new(pipeline.DevtronAppConfigService), new(*pipeline.DevtronAppConfigServiceImpl)),
pipeline3.NewDevtronAppAutoCompleteRestHandlerImpl,
wire.Bind(new(pipeline3.DevtronAppAutoCompleteRestHandler), new(*pipeline3.DevtronAppAutoCompleteRestHandlerImpl)),

util5.NewLoggingMiddlewareImpl,
wire.Bind(new(util5.LoggingMiddleware), new(*util5.LoggingMiddlewareImpl)),
pipeline2.NewPipelineRestHandlerImpl,
wire.Bind(new(pipeline2.PipelineConfigRestHandler), new(*pipeline2.PipelineConfigRestHandlerImpl)),
router.NewPipelineRouterImpl,
wire.Bind(new(router.PipelineConfigRouter), new(*router.PipelineConfigRouterImpl)),

pipeline4.NewPipelineRouterImpl,
wire.Bind(new(pipeline4.PipelineConfigRouter), new(*pipeline4.PipelineConfigRouterImpl)),
history2.NewPipelineHistoryRouterImpl,
wire.Bind(new(history2.PipelineHistoryRouter), new(*history2.PipelineHistoryRouterImpl)),
status3.NewPipelineStatusRouterImpl,
wire.Bind(new(status3.PipelineStatusRouter), new(*status3.PipelineStatusRouterImpl)),
pipeline5.NewDevtronAppAutoCompleteRouterImpl,
wire.Bind(new(pipeline5.DevtronAppAutoCompleteRouter), new(*pipeline5.DevtronAppAutoCompleteRouterImpl)),
workflow2.NewAppWorkflowRouterImpl,
wire.Bind(new(workflow2.AppWorkflowRouter), new(*workflow2.AppWorkflowRouterImpl)),

pipeline.NewCiCdPipelineOrchestrator,
wire.Bind(new(pipeline.CiCdPipelineOrchestrator), new(*pipeline.CiCdPipelineOrchestratorImpl)),
pipelineConfig.NewMaterialRepositoryImpl,
Expand Down Expand Up @@ -306,10 +334,15 @@ func InitializeApp() (*App, error) {
pipeline.NewGitRegistryConfigImpl,
wire.Bind(new(pipeline.GitRegistryConfig), new(*pipeline.GitRegistryConfigImpl)),

router.NewAppListingRouterImpl,
wire.Bind(new(router.AppListingRouter), new(*router.AppListingRouterImpl)),
restHandler.NewAppListingRestHandlerImpl,
wire.Bind(new(restHandler.AppListingRestHandler), new(*restHandler.AppListingRestHandlerImpl)),
appList.NewAppFilteringRouterImpl,
wire.Bind(new(appList.AppFilteringRouter), new(*appList.AppFilteringRouterImpl)),
appList2.NewAppFilteringRestHandlerImpl,
wire.Bind(new(appList2.AppFilteringRestHandler), new(*appList2.AppFilteringRestHandlerImpl)),

appList.NewAppListingRouterImpl,
wire.Bind(new(appList.AppListingRouter), new(*appList.AppListingRouterImpl)),
appList2.NewAppListingRestHandlerImpl,
wire.Bind(new(appList2.AppListingRestHandler), new(*appList2.AppListingRestHandlerImpl)),
app.NewAppListingServiceImpl,
wire.Bind(new(app.AppListingService), new(*app.AppListingServiceImpl)),
repository.NewAppListingRepositoryImpl,
Expand Down Expand Up @@ -361,28 +394,9 @@ func InitializeApp() (*App, error) {
repository2.NewServiceClientImpl,
wire.Bind(new(repository2.ServiceClient), new(*repository2.ServiceClientImpl)),
wire.Bind(new(connector.Pump), new(*connector.PumpImpl)),
restHandler.NewArgoApplicationRestHandlerImpl,
wire.Bind(new(restHandler.ArgoApplicationRestHandler), new(*restHandler.ArgoApplicationRestHandlerImpl)),
router.NewApplicationRouterImpl,
wire.Bind(new(router.ApplicationRouter), new(*router.ApplicationRouterImpl)),

//app.GetConfig,

router.NewCDRouterImpl,
wire.Bind(new(router.CDRouter), new(*router.CDRouterImpl)),
restHandler.NewCDRestHandlerImpl,
wire.Bind(new(restHandler.CDRestHandler), new(*restHandler.CDRestHandlerImpl)),

ArgoUtil.GetArgoConfig,
ArgoUtil.NewArgoSession,
ArgoUtil.NewResourceServiceImpl,
wire.Bind(new(ArgoUtil.ResourceService), new(*ArgoUtil.ResourceServiceImpl)),
//ArgoUtil.NewApplicationServiceImpl,
//wire.Bind(new(ArgoUtil.ApplicationService), new(ArgoUtil.ApplicationServiceImpl)),
//ArgoUtil.NewRepositoryService,
//wire.Bind(new(ArgoUtil.RepositoryService), new(ArgoUtil.RepositoryServiceImpl)),

//ArgoUtil.NewClusterServiceImpl,
//wire.Bind(new(ArgoUtil.ClusterService), new(ArgoUtil.ClusterServiceImpl)),
pipeline.GetEcrConfig,
//otel.NewOtelTracingServiceImpl,
//wire.Bind(new(otel.OtelTracingService), new(*otel.OtelTracingServiceImpl)),
Expand Down Expand Up @@ -514,8 +528,8 @@ func InitializeApp() (*App, error) {
appStoreRestHandler.NewAppStoreRouterImpl,
wire.Bind(new(appStoreRestHandler.AppStoreRouter), new(*appStoreRestHandler.AppStoreRouterImpl)),

restHandler.NewAppWorkflowRestHandlerImpl,
wire.Bind(new(restHandler.AppWorkflowRestHandler), new(*restHandler.AppWorkflowRestHandlerImpl)),
workflow.NewAppWorkflowRestHandlerImpl,
wire.Bind(new(workflow.AppWorkflowRestHandler), new(*workflow.AppWorkflowRestHandlerImpl)),

appWorkflow.NewAppWorkflowServiceImpl,
wire.Bind(new(appWorkflow.AppWorkflowService), new(*appWorkflow.AppWorkflowServiceImpl)),
Expand Down Expand Up @@ -712,13 +726,15 @@ func InitializeApp() (*App, error) {
wire.Bind(new(repository.WebhookEventDataRepository), new(*repository.WebhookEventDataRepositoryImpl)),
pipeline.NewWebhookEventDataConfigImpl,
wire.Bind(new(pipeline.WebhookEventDataConfig), new(*pipeline.WebhookEventDataConfigImpl)),
restHandler.NewWebhookDataRestHandlerImpl,
wire.Bind(new(restHandler.WebhookDataRestHandler), new(*restHandler.WebhookDataRestHandlerImpl)),
webhook.NewWebhookDataRestHandlerImpl,
wire.Bind(new(webhook.WebhookDataRestHandler), new(*webhook.WebhookDataRestHandlerImpl)),

router.NewAppRouterImpl,
wire.Bind(new(router.AppRouter), new(*router.AppRouterImpl)),
restHandler.NewAppRestHandlerImpl,
wire.Bind(new(restHandler.AppRestHandler), new(*restHandler.AppRestHandlerImpl)),
app3.NewAppRouterImpl,
wire.Bind(new(app3.AppRouter), new(*app3.AppRouterImpl)),
appInfo2.NewAppInfoRouterImpl,
wire.Bind(new(appInfo2.AppInfoRouter), new(*appInfo2.AppInfoRouterImpl)),
appInfo.NewAppInfoRestHandlerImpl,
wire.Bind(new(appInfo.AppInfoRestHandler), new(*appInfo.AppInfoRestHandlerImpl)),

app.NewAppCrudOperationServiceImpl,
wire.Bind(new(app.AppCrudOperationService), new(*app.AppCrudOperationServiceImpl)),
Expand All @@ -737,8 +753,8 @@ func InitializeApp() (*App, error) {
// util2.NewGoJsonSchemaCustomFormatChecker,

//history starts
restHandler.NewPipelineHistoryRestHandlerImpl,
wire.Bind(new(restHandler.PipelineHistoryRestHandler), new(*restHandler.PipelineHistoryRestHandlerImpl)),
history.NewPipelineHistoryRestHandlerImpl,
wire.Bind(new(history.PipelineHistoryRestHandler), new(*history.PipelineHistoryRestHandlerImpl)),

repository3.NewConfigMapHistoryRepositoryImpl,
wire.Bind(new(repository3.ConfigMapHistoryRepository), new(*repository3.ConfigMapHistoryRepositoryImpl)),
Expand Down Expand Up @@ -827,8 +843,8 @@ func InitializeApp() (*App, error) {
cron.NewCiTriggerCronImpl,
wire.Bind(new(cron.CiTriggerCron), new(*cron.CiTriggerCronImpl)),

restHandler.NewPipelineStatusTimelineRestHandlerImpl,
wire.Bind(new(restHandler.PipelineStatusTimelineRestHandler), new(*restHandler.PipelineStatusTimelineRestHandlerImpl)),
status2.NewPipelineStatusTimelineRestHandlerImpl,
wire.Bind(new(status2.PipelineStatusTimelineRestHandler), new(*status2.PipelineStatusTimelineRestHandlerImpl)),

status.NewPipelineStatusTimelineServiceImpl,
wire.Bind(new(status.PipelineStatusTimelineService), new(*status.PipelineStatusTimelineServiceImpl)),
Expand Down
Loading