Skip to content

Commit a5bf261

Browse files
kartik-579kartik-579
committed
wip
1 parent 6bd6815 commit a5bf261

24 files changed

+237
-238
lines changed

‎api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ func (handler *PipelineConfigRestHandlerImpl) TriggerCiPipeline(w http.ResponseW
740740
ciTriggerRequest.TriggeredBy = userId
741741
handler.Logger.Infow("request payload, TriggerCiPipeline", "payload", ciTriggerRequest)
742742
response := make(map[string]string)
743-
resp, err := handler.ciTriggerService.HandleCIManual(ciTriggerRequest)
743+
resp, err := handler.ciHandlerService.HandleCIManual(ciTriggerRequest)
744744
if errors.Is(err, bean1.ErrImagePathInUse) {
745745
handler.Logger.Errorw("service err duplicate image tag, TriggerCiPipeline", "err", err, "payload", ciTriggerRequest)
746746
common.WriteJsonResp(w, err, err, http.StatusConflict)
@@ -974,7 +974,7 @@ func (handler *PipelineConfigRestHandlerImpl) DownloadCiWorkflowArtifacts(w http
974974
}
975975
//RBAC
976976

977-
file, err := handler.ciTriggerService.DownloadCiWorkflowArtifacts(pipelineId, buildId)
977+
file, err := handler.ciHandlerService.DownloadCiWorkflowArtifacts(pipelineId, buildId)
978978
defer file.Close()
979979
if err != nil {
980980
handler.Logger.Errorw("service err, DownloadCiWorkflowArtifacts", "err", err, "pipelineId", pipelineId, "buildId", buildId)
@@ -1029,7 +1029,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetHistoricBuildLogs(w http.Respon
10291029
return
10301030
}
10311031
//RBAC
1032-
resp, err := handler.ciTriggerService.GetHistoricBuildLogs(workflowId, nil)
1032+
resp, err := handler.ciHandlerService.GetHistoricBuildLogs(workflowId, nil)
10331033
if err != nil {
10341034
handler.Logger.Errorw("service err, GetHistoricBuildLogs", "err", err, "pipelineId", pipelineId, "workflowId", workflowId)
10351035
common.WriteJsonResp(w, err, resp, http.StatusInternalServerError)
@@ -1168,7 +1168,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetBuildLogs(w http.ResponseWriter
11681168
return
11691169
}
11701170
}
1171-
logsReader, cleanUp, err := handler.ciTriggerService.GetRunningWorkflowLogs(workflowId)
1171+
logsReader, cleanUp, err := handler.ciHandlerService.GetRunningWorkflowLogs(workflowId)
11721172
if err != nil {
11731173
handler.Logger.Errorw("service err, GetBuildLogs", "err", err, "pipelineId", pipelineId, "workflowId", workflowId, "lastEventId", lastEventId)
11741174
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -1611,7 +1611,7 @@ func (handler *PipelineConfigRestHandlerImpl) CancelWorkflow(w http.ResponseWrit
16111611

16121612
//RBAC
16131613

1614-
resp, err := handler.ciTriggerService.CancelBuild(workflowId, forceAbort)
1614+
resp, err := handler.ciHandlerService.CancelBuild(workflowId, forceAbort)
16151615
if err != nil {
16161616
handler.Logger.Errorw("service err, CancelWorkflow", "err", err, "workflowId", workflowId, "pipelineId", pipelineId)
16171617
if util.IsErrNoRows(err) {

‎api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetPrePostDeploymentLogs(w http.Re
16431643
}
16441644
//RBAC CHECK
16451645

1646-
logsReader, cleanUp, err := handler.cdTriggerService.GetRunningWorkflowLogs(environmentId, pipelineId, workflowId)
1646+
logsReader, cleanUp, err := handler.cdHandlerService.GetRunningWorkflowLogs(environmentId, pipelineId, workflowId)
16471647
if err != nil {
16481648
handler.Logger.Errorw("service err, GetPrePostDeploymentLogs", "err", err, "appId", appId, "environmentId", environmentId, "pipelineId", pipelineId, "workflowId", workflowId)
16491649
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -1768,7 +1768,7 @@ func (handler *PipelineConfigRestHandlerImpl) DownloadArtifacts(w http.ResponseW
17681768
}
17691769
//RBAC CHECK
17701770

1771-
file, err := handler.cdTriggerService.DownloadCdWorkflowArtifacts(buildId)
1771+
file, err := handler.cdHandlerService.DownloadCdWorkflowArtifacts(buildId)
17721772
defer file.Close()
17731773

17741774
if err != nil {
@@ -1952,7 +1952,7 @@ func (handler *PipelineConfigRestHandlerImpl) CancelStage(w http.ResponseWriter,
19521952
}
19531953
//RBAC
19541954

1955-
resp, err := handler.cdTriggerService.CancelStage(workflowRunnerId, forceAbort, userId)
1955+
resp, err := handler.cdHandlerService.CancelStage(workflowRunnerId, forceAbort, userId)
19561956
if err != nil {
19571957
handler.Logger.Errorw("service err, CancelStage", "err", err, "pipelineId", pipelineId, "workflowRunnerId", workflowRunnerId)
19581958
if util.IsErrNoRows(err) {

‎api/restHandler/app/pipeline/configure/PipelineConfigRestHandler.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ type PipelineConfigRestHandlerImpl struct {
140140
teamReadService read3.TeamReadService
141141
environmentRepository repository2.EnvironmentRepository
142142
chartReadService read5.ChartReadService
143-
ciTriggerService trigger.Service
144-
cdTriggerService devtronApps.TriggerService
143+
ciHandlerService trigger.HandlerService
144+
cdHandlerService devtronApps.HandlerService
145145
}
146146

147147
func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger *zap.SugaredLogger,
@@ -176,8 +176,8 @@ func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger
176176
teamReadService read3.TeamReadService,
177177
EnvironmentRepository repository2.EnvironmentRepository,
178178
chartReadService read5.ChartReadService,
179-
ciTriggerService trigger.Service,
180-
cdTriggerService devtronApps.TriggerService,
179+
ciHandlerService trigger.HandlerService,
180+
cdHandlerService devtronApps.HandlerService,
181181
) *PipelineConfigRestHandlerImpl {
182182
envConfig := &PipelineRestHandlerEnvConfig{}
183183
err := env.Parse(envConfig)
@@ -220,8 +220,8 @@ func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger
220220
teamReadService: teamReadService,
221221
environmentRepository: EnvironmentRepository,
222222
chartReadService: chartReadService,
223-
ciTriggerService: ciTriggerService,
224-
cdTriggerService: cdTriggerService,
223+
ciHandlerService: ciHandlerService,
224+
cdHandlerService: cdHandlerService,
225225
}
226226
}
227227

‎api/restHandler/app/pipeline/trigger/PipelineTriggerRestHandler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ type PipelineTriggerRestHandlerImpl struct {
6666
deploymentGroupService deploymentGroup.DeploymentGroupService
6767
deploymentConfigService pipeline.PipelineDeploymentConfigService
6868
deployedAppService deployedApp.DeployedAppService
69-
cdTriggerService devtronApps.TriggerService
69+
cdHandlerService devtronApps.HandlerService
7070
workflowEventPublishService out.WorkflowEventPublishService
7171
}
7272

@@ -75,7 +75,7 @@ func NewPipelineRestHandler(appService app.AppService, userAuthService user.User
7575
deploymentGroupService deploymentGroup.DeploymentGroupService,
7676
deploymentConfigService pipeline.PipelineDeploymentConfigService,
7777
deployedAppService deployedApp.DeployedAppService,
78-
cdTriggerService devtronApps.TriggerService,
78+
cdHandlerService devtronApps.HandlerService,
7979
workflowEventPublishService out.WorkflowEventPublishService) *PipelineTriggerRestHandlerImpl {
8080
pipelineHandler := &PipelineTriggerRestHandlerImpl{
8181
appService: appService,
@@ -88,7 +88,7 @@ func NewPipelineRestHandler(appService app.AppService, userAuthService user.User
8888
deploymentGroupService: deploymentGroupService,
8989
deploymentConfigService: deploymentConfigService,
9090
deployedAppService: deployedAppService,
91-
cdTriggerService: cdTriggerService,
91+
cdHandlerService: cdHandlerService,
9292
workflowEventPublishService: workflowEventPublishService,
9393
}
9494
return pipelineHandler
@@ -140,7 +140,7 @@ func (handler PipelineTriggerRestHandlerImpl) OverrideConfig(w http.ResponseWrit
140140
triggerContext := bean3.TriggerContext{
141141
Context: ctx,
142142
}
143-
mergeResp, helmPackageName, _, err := handler.cdTriggerService.ManualCdTrigger(triggerContext, &overrideRequest)
143+
mergeResp, helmPackageName, _, err := handler.cdHandlerService.ManualCdTrigger(triggerContext, &overrideRequest)
144144
span.End()
145145
if err != nil {
146146
handler.logger.Errorw("request err, OverrideConfig", "err", err, "payload", overrideRequest)

‎client/cron/CiTriggerCron.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ type CiTriggerCronImpl struct {
4242
pipelineStageRepository repository.PipelineStageRepository
4343
ciArtifactRepository repository2.CiArtifactRepository
4444
globalPluginRepository repository3.GlobalPluginRepository
45-
ciTriggerService trigger.Service
45+
ciHandlerService trigger.HandlerService
4646
}
4747

4848
func NewCiTriggerCronImpl(logger *zap.SugaredLogger, cfg *CiTriggerCronConfig, pipelineStageRepository repository.PipelineStageRepository,
4949
ciArtifactRepository repository2.CiArtifactRepository, globalPluginRepository repository3.GlobalPluginRepository, cronLogger *cron2.CronLoggerImpl,
50-
ciTriggerService trigger.Service) *CiTriggerCronImpl {
50+
ciHandlerService trigger.HandlerService) *CiTriggerCronImpl {
5151
cron := cron.New(
5252
cron.WithChain(cron.Recover(cronLogger)))
5353
cron.Start()
@@ -58,7 +58,7 @@ func NewCiTriggerCronImpl(logger *zap.SugaredLogger, cfg *CiTriggerCronConfig, p
5858
cfg: cfg,
5959
ciArtifactRepository: ciArtifactRepository,
6060
globalPluginRepository: globalPluginRepository,
61-
ciTriggerService: ciTriggerService,
61+
ciHandlerService: ciHandlerService,
6262
}
6363

6464
_, err := cron.AddFunc(fmt.Sprintf("@every %dm", cfg.SourceControllerCronTime), impl.TriggerCiCron)
@@ -104,7 +104,7 @@ func (impl *CiTriggerCronImpl) TriggerCiCron() {
104104
InvalidateCache: false,
105105
PipelineType: string(common.CI_JOB),
106106
}
107-
_, err = impl.ciTriggerService.HandleCIManual(ciTriggerRequest)
107+
_, err = impl.ciHandlerService.HandleCIManual(ciTriggerRequest)
108108
if err != nil {
109109
return
110110
}

‎pkg/build/git/gitWebhook/GitWebhookService.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ type GitWebhookService interface {
3434
type GitWebhookServiceImpl struct {
3535
logger *zap.SugaredLogger
3636
gitWebhookRepository repository.GitWebhookRepository
37-
ciTriggerService trigger.Service
37+
ciHandlerService trigger.HandlerService
3838
}
3939

4040
func NewGitWebhookServiceImpl(Logger *zap.SugaredLogger, gitWebhookRepository repository.GitWebhookRepository,
41-
ciTriggerService trigger.Service) *GitWebhookServiceImpl {
41+
ciHandlerService trigger.HandlerService) *GitWebhookServiceImpl {
4242
return &GitWebhookServiceImpl{
4343
logger: Logger,
4444
gitWebhookRepository: gitWebhookRepository,
45-
ciTriggerService: ciTriggerService,
45+
ciHandlerService: ciHandlerService,
4646
}
4747
}
4848

@@ -71,7 +71,7 @@ func (impl *GitWebhookServiceImpl) HandleGitWebhook(gitWebhookRequest gitSensor.
7171
}
7272
}
7373

74-
resp, err := impl.ciTriggerService.HandleCIWebhook(bean.GitCiTriggerRequest{
74+
resp, err := impl.ciHandlerService.HandleCIWebhook(bean.GitCiTriggerRequest{
7575
CiPipelineMaterial: ciPipelineMaterial,
7676
TriggeredBy: bean2.SYSTEM_USER_ID, // Automatic trigger, system user
7777
ExtraEnvironmentVariables: gitWebhookRequest.ExtraEnvironmentVariables,

0 commit comments

Comments
 (0)