Skip to content

Commit 6cfcda5

Browse files
ayu-devtronayu-devtron
committed
move cd functions to cdworkflow runner service
1 parent 1e7491a commit 6cfcda5

File tree

11 files changed

+144
-139
lines changed

11 files changed

+144
-139
lines changed

‎pkg/app/AppService.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
bean6 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/bean"
3939
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/read"
4040
bean4 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
41-
"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
41+
"github.com/devtron-labs/devtron/pkg/workflow/cd"
4242
"io/ioutil"
4343
"net/url"
4444
"path"
@@ -126,7 +126,7 @@ type AppServiceImpl struct {
126126
appListingService AppListingService
127127
deploymentConfigService common2.DeploymentConfigService
128128
envConfigOverrideReadService read.EnvConfigOverrideService
129-
workflowStageService workflowStatus.WorkFlowStageStatusService
129+
cdWorkflowRunnerService cd.CdWorkflowRunnerService
130130
}
131131

132132
type AppService interface {
@@ -167,7 +167,7 @@ func NewAppService(
167167
appListingService AppListingService,
168168
deploymentConfigService common2.DeploymentConfigService,
169169
envConfigOverrideReadService read.EnvConfigOverrideService,
170-
workflowStageService workflowStatus.WorkFlowStageStatusService) *AppServiceImpl {
170+
cdWorkflowRunnerService cd.CdWorkflowRunnerService) *AppServiceImpl {
171171
appServiceImpl := &AppServiceImpl{
172172
mergeUtil: mergeUtil,
173173
pipelineOverrideRepository: pipelineOverrideRepository,
@@ -197,7 +197,7 @@ func NewAppService(
197197
appListingService: appListingService,
198198
deploymentConfigService: deploymentConfigService,
199199
envConfigOverrideReadService: envConfigOverrideReadService,
200-
workflowStageService: workflowStageService,
200+
cdWorkflowRunnerService: cdWorkflowRunnerService,
201201
}
202202
return appServiceImpl
203203
}
@@ -1009,7 +1009,7 @@ func (impl *AppServiceImpl) UpdateCdWorkflowRunnerByACDObject(app *v1alpha1.Appl
10091009
}
10101010
wfr.UpdatedBy = 1
10111011
wfr.UpdatedOn = time.Now()
1012-
err = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(wfr)
1012+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(wfr)
10131013
if err != nil {
10141014
impl.logger.Errorw("error on update cd workflow runner", "wfr", wfr, "app", app, "err", err)
10151015
return err

‎pkg/deployment/trigger/devtronApps/PostStageTriggerService.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (impl *TriggerServiceImpl) TriggerPostStage(request bean.TriggerRequest) (*
119119
runner.Status = cdWorkflow.WorkflowFailed
120120
runner.Message = err.Error()
121121
runner.FinishedOn = time.Now()
122-
_ = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
122+
_ = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
123123
return nil, err
124124
}
125125

@@ -129,7 +129,7 @@ func (impl *TriggerServiceImpl) TriggerPostStage(request bean.TriggerRequest) (*
129129
runner.Status = cdWorkflow.WorkflowFailed
130130
runner.Message = err.Error()
131131
runner.FinishedOn = time.Now()
132-
_ = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
132+
_ = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
133133
return nil, err
134134
}
135135
manifestPushTempate, err := impl.getManifestPushTemplateForPostStage(request, envDevploymentConfig, jobHelmPackagePath, cdStageWorkflowRequest, cdWf, runner, pipeline, triggeredBy, triggeredAt)
@@ -143,7 +143,7 @@ func (impl *TriggerServiceImpl) TriggerPostStage(request bean.TriggerRequest) (*
143143
return nil, err
144144
}
145145
wfr.ImagePathReservationIds = pluginImagePathReservationIds
146-
err = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(&wfr)
146+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(&wfr)
147147
if err != nil {
148148
impl.logger.Error("error in updating image path reservation ids in cd workflow runner", "err", "err")
149149
}

‎pkg/deployment/trigger/devtronApps/PreStageTriggerService.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ func (impl *TriggerServiceImpl) TriggerPreStage(request bean.TriggerRequest) (*b
135135
runner.Status = cdWorkflow.WorkflowFailed
136136
runner.Message = err.Error()
137137
runner.FinishedOn = time.Now()
138-
_ = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
138+
_ = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
139139
return nil, err
140140
} else {
141141
runner.ImagePathReservationIds = imagePathReservationIds
142-
_ = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
142+
_ = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
143143
}
144144

145145
_, span = otel.Tracer("orchestrator").Start(ctx, "cdWorkflowService.SubmitWorkflow")
@@ -152,7 +152,7 @@ func (impl *TriggerServiceImpl) TriggerPreStage(request bean.TriggerRequest) (*b
152152
runner.Status = cdWorkflow.WorkflowFailed
153153
runner.Message = err.Error()
154154
runner.FinishedOn = time.Now()
155-
_ = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
155+
_ = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
156156
return nil, err
157157
}
158158
manifestPushTemplate, err := impl.getManifestPushTemplateForPreStage(ctx, envDeploymentConfig, pipeline, artifact, jobHelmPackagePath, cdWf, runner, triggeredBy, triggeredAt, request)
@@ -262,7 +262,7 @@ func (impl *TriggerServiceImpl) createStartingWfAndRunner(request bean.TriggerRe
262262
ReferenceId: request.TriggerContext.ReferenceId,
263263
}
264264
_, span := otel.Tracer("orchestrator").Start(ctx, "cdWorkflowRepository.SaveWorkFlowRunner")
265-
_, err = impl.workflowStageService.SaveCDWorkflowRunnerWithStage(runner)
265+
_, err = impl.cdWorkflowRunnerService.SaveCDWorkflowRunnerWithStage(runner)
266266
span.End()
267267
if err != nil {
268268
return nil, nil, err
@@ -311,7 +311,7 @@ func (impl *TriggerServiceImpl) checkVulnerabilityStatusAndFailWfIfNeeded(ctx co
311311
runner.FinishedOn = time.Now()
312312
runner.UpdatedOn = time.Now()
313313
runner.UpdatedBy = triggeredBy
314-
err = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
314+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
315315
if err != nil {
316316
impl.logger.Errorw("error in updating wfr status due to vulnerable image", "err", err)
317317
return err

‎pkg/deployment/trigger/devtronApps/TriggerService.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ import (
7474
"github.com/devtron-labs/devtron/pkg/pipeline/history"
7575
"github.com/devtron-labs/devtron/pkg/pipeline/repository"
7676
"github.com/devtron-labs/devtron/pkg/pipeline/types"
77-
"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
7877
"github.com/devtron-labs/devtron/pkg/plugin"
7978
security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
8079
read2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
@@ -173,7 +172,7 @@ type TriggerServiceImpl struct {
173172
gitOperationService git.GitOperationService
174173
attributeService attributes.AttributesService
175174
clusterRepository repository5.ClusterRepository
176-
workflowStageService workflowStatus.WorkFlowStageStatusService
175+
cdWorkflowRunnerService cd.CdWorkflowRunnerService
177176
}
178177

179178
func NewTriggerServiceImpl(logger *zap.SugaredLogger,
@@ -232,7 +231,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger,
232231
gitOperationService git.GitOperationService,
233232
attributeService attributes.AttributesService,
234233
clusterRepository repository5.ClusterRepository,
235-
workflowStageService workflowStatus.WorkFlowStageStatusService,
234+
cdWorkflowRunnerService cd.CdWorkflowRunnerService,
236235
) (*TriggerServiceImpl, error) {
237236
impl := &TriggerServiceImpl{
238237
logger: logger,
@@ -295,7 +294,7 @@ func NewTriggerServiceImpl(logger *zap.SugaredLogger,
295294
ciCdPipelineOrchestrator: ciCdPipelineOrchestrator,
296295
gitOperationService: gitOperationService,
297296
attributeService: attributeService,
298-
workflowStageService: workflowStageService,
297+
cdWorkflowRunnerService: cdWorkflowRunnerService,
299298

300299
clusterRepository: clusterRepository,
301300
}
@@ -522,7 +521,7 @@ func (impl *TriggerServiceImpl) ManualCdTrigger(triggerContext bean.TriggerConte
522521
AuditLog: sql.AuditLog{CreatedOn: triggeredAt, CreatedBy: overrideRequest.UserId, UpdatedOn: triggeredAt, UpdatedBy: overrideRequest.UserId},
523522
ReferenceId: triggerContext.ReferenceId,
524523
}
525-
savedWfr, err := impl.workflowStageService.SaveCDWorkflowRunnerWithStage(runner)
524+
savedWfr, err := impl.cdWorkflowRunnerService.SaveCDWorkflowRunnerWithStage(runner)
526525
if err != nil {
527526
impl.logger.Errorw("err in creating cdWorkflowRunner, ManualCdTrigger", "cdWorkflowId", cdWorkflowId, "err", err)
528527
return 0, "", nil, err
@@ -653,7 +652,7 @@ func (impl *TriggerServiceImpl) TriggerAutomaticDeployment(request bean.TriggerR
653652
AuditLog: sql.AuditLog{CreatedOn: triggeredAt, CreatedBy: triggeredBy, UpdatedOn: triggeredAt, UpdatedBy: triggeredBy},
654653
ReferenceId: request.TriggerContext.ReferenceId,
655654
}
656-
savedWfr, err := impl.workflowStageService.SaveCDWorkflowRunnerWithStage(runner)
655+
savedWfr, err := impl.cdWorkflowRunnerService.SaveCDWorkflowRunnerWithStage(runner)
657656
if err != nil {
658657
return err
659658
}

‎pkg/pipeline/CdHandler.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
util2 "github.com/devtron-labs/devtron/pkg/pipeline/util"
3535
"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
3636
bean5 "github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus/bean"
37+
"github.com/devtron-labs/devtron/pkg/workflow/cd"
3738
"os"
3839
"path/filepath"
3940
"strconv"
@@ -101,6 +102,7 @@ type CdHandlerImpl struct {
101102
customTagService CustomTagService
102103
deploymentConfigService common2.DeploymentConfigService
103104
workflowStageStatusService workflowStatus.WorkFlowStageStatusService
105+
cdWorkflowRunnerService cd.CdWorkflowRunnerService
104106
}
105107

106108
func NewCdHandlerImpl(Logger *zap.SugaredLogger, userService user.UserService,
@@ -115,6 +117,7 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, userService user.UserService,
115117
blobConfigStorageService BlobStorageConfigService, customTagService CustomTagService,
116118
deploymentConfigService common2.DeploymentConfigService,
117119
workflowStageStatusService workflowStatus.WorkFlowStageStatusService,
120+
cdWorkflowRunnerService cd.CdWorkflowRunnerService,
118121
) *CdHandlerImpl {
119122
cdh := &CdHandlerImpl{
120123
Logger: Logger,
@@ -136,6 +139,7 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, userService user.UserService,
136139
customTagService: customTagService,
137140
deploymentConfigService: deploymentConfigService,
138141
workflowStageStatusService: workflowStageStatusService,
142+
cdWorkflowRunnerService: cdWorkflowRunnerService,
139143
}
140144
config, err := types.GetCdConfig()
141145
if err != nil {
@@ -222,7 +226,7 @@ func (impl *CdHandlerImpl) CancelStage(workflowRunnerId int, forceAbort bool, us
222226
workflowRunner.Status = cdWorkflow2.WorkflowCancel
223227
workflowRunner.UpdatedOn = time.Now()
224228
workflowRunner.UpdatedBy = userId
225-
err = impl.workflowStageStatusService.UpdateCdWorkflowRunnerWithStage(workflowRunner)
229+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(workflowRunner)
226230
if err != nil {
227231
impl.Logger.Error("cannot update deleted workflow runner status, but wf deleted", "err", err)
228232
return 0, err
@@ -234,7 +238,7 @@ func (impl *CdHandlerImpl) updateWorkflowRunnerForForceAbort(workflowRunner *pip
234238
workflowRunner.Status = cdWorkflow2.WorkflowCancel
235239
workflowRunner.PodStatus = string(bean2.Failed)
236240
workflowRunner.Message = constants.FORCE_ABORT_MESSAGE_AFTER_STARTING_STAGE
237-
err := impl.workflowStageStatusService.UpdateCdWorkflowRunnerWithStage(workflowRunner)
241+
err := impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(workflowRunner)
238242
if err != nil {
239243
impl.Logger.Errorw("error in updating workflow status in cd workflow runner in force abort case", "err", err)
240244
return err
@@ -292,7 +296,7 @@ func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus v1alpha1.WorkflowStatus
292296
savedWorkflow.PodName = podName
293297
savedWorkflow.UpdateAuditLog(1)
294298
impl.Logger.Debugw("updating workflow ", "workflow", savedWorkflow)
295-
err = impl.workflowStageStatusService.UpdateCdWorkflowRunnerWithStage(savedWorkflow)
299+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(savedWorkflow)
296300
if err != nil {
297301
impl.Logger.Error("update wf failed for id " + strconv.Itoa(savedWorkflow.Id))
298302
return 0, "", err

‎pkg/pipeline/workflowStatus/WorkflowStageStatusService.go

Lines changed: 2 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
)
2424

2525
type WorkFlowStageStatusService interface {
26-
SaveCDWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) (*pipelineConfig.CdWorkflowRunner, error)
27-
UpdateCdWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) error
26+
//todo move read functions for ci and cd from here to their respective services. CiService and CdWorkflowRunnerService
2827
GetCiWorkflowStagesByWorkflowIds(wfIds []int) ([]*repository.WorkflowExecutionStage, error)
2928
GetPrePostWorkflowStagesByWorkflowIdAndType(wfId int, wfType string) ([]*repository.WorkflowExecutionStage, error)
3029
GetPrePostWorkflowStagesByWorkflowRunnerIdsList(wfIdWfTypeMap map[int]bean4.CdWorkflowWithArtifact) (map[int]map[string][]*bean2.WorkflowStageDto, error)
30+
3131
SaveWorkflowStages(wfId int, wfType, wfName string, tx *pg.Tx) error
3232
UpdateWorkflowStages(wfId int, wfType, wfName, wfStatus, podStatus, message, podName string, tx *pg.Tx) (string, string, error)
3333
ConvertDBWorkflowStageToMap(workflowStages []*repository.WorkflowExecutionStage, wfId int, status, podStatus, message, wfType string, startTime, endTime time.Time) map[string][]*bean2.WorkflowStageDto
@@ -47,7 +47,6 @@ func NewWorkflowStageFlowStatusServiceImpl(logger *zap.SugaredLogger,
4747
ciWorkflowRepository pipelineConfig.CiWorkflowRepository,
4848
cdWorkflowRepository pipelineConfig.CdWorkflowRepository,
4949
transactionManager sql.TransactionWrapper,
50-
config *types.CiCdConfig,
5150
) *WorkFlowStageStatusServiceImpl {
5251
wfStageServiceImpl := &WorkFlowStageStatusServiceImpl{
5352
logger: logger,
@@ -353,92 +352,6 @@ func (impl *WorkFlowStageStatusServiceImpl) GetPrePostWorkflowStagesByWorkflowRu
353352
return resp, nil
354353
}
355354

356-
func (impl *WorkFlowStageStatusServiceImpl) SaveCDWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) (*pipelineConfig.CdWorkflowRunner, error) {
357-
// implementation
358-
tx, err := impl.transactionManager.StartTx()
359-
if err != nil {
360-
impl.logger.Errorw("error in starting transaction to save default configurations", "workflowName", wfr.Name, "error", err)
361-
return wfr, err
362-
}
363-
364-
defer func() {
365-
dbErr := impl.transactionManager.RollbackTx(tx)
366-
if dbErr != nil {
367-
impl.logger.Errorw("error in rolling back transaction", "workflowName", wfr.Name, "error", dbErr)
368-
}
369-
}()
370-
if impl.config.EnableWorkflowExecutionStage {
371-
wfr.Status = cdWorkflow.WorkflowWaitingToStart
372-
}
373-
wfr, err = impl.cdWorkflowRepository.SaveWorkFlowRunnerWithTx(wfr, tx)
374-
if err != nil {
375-
impl.logger.Errorw("error in saving workflow", "payload", wfr, "error", err)
376-
return wfr, err
377-
}
378-
379-
if impl.config.EnableWorkflowExecutionStage {
380-
pipelineStageStatus := adapter.GetDefaultPipelineStatusForWorkflow(wfr.Id, wfr.WorkflowType.String())
381-
pipelineStageStatus, err = impl.workflowStatusRepository.SaveWorkflowStages(pipelineStageStatus, tx)
382-
if err != nil {
383-
impl.logger.Errorw("error in saving workflow stages", "workflowName", wfr.Name, "error", err)
384-
return wfr, err
385-
}
386-
}
387-
388-
err = impl.transactionManager.CommitTx(tx)
389-
if err != nil {
390-
impl.logger.Errorw("error in committing transaction", "workflowName", wfr.Name, "error", err)
391-
return wfr, err
392-
}
393-
return wfr, nil
394-
}
395-
396-
func (impl *WorkFlowStageStatusServiceImpl) UpdateCdWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) error {
397-
// implementation
398-
tx, err := impl.transactionManager.StartTx()
399-
if err != nil {
400-
impl.logger.Errorw("error in starting transaction to save default configurations", "workflowName", wfr.Name, "error", err)
401-
return err
402-
}
403-
404-
defer func() {
405-
dbErr := impl.transactionManager.RollbackTx(tx)
406-
if dbErr != nil {
407-
impl.logger.Errorw("error in rolling back transaction", "workflowName", wfr.Name, "error", dbErr)
408-
}
409-
}()
410-
411-
if impl.config.EnableWorkflowExecutionStage {
412-
if wfr.WorkflowType == bean.CD_WORKFLOW_TYPE_PRE || wfr.WorkflowType == bean.CD_WORKFLOW_TYPE_POST {
413-
pipelineStageStatus, updatedWfStatus, updatedPodStatus := impl.getUpdatedPipelineStagesForWorkflow(wfr.Id, wfr.WorkflowType.String(), wfr.Status, wfr.PodStatus, wfr.Message, wfr.PodName)
414-
pipelineStageStatus, err = impl.workflowStatusRepository.UpdateWorkflowStages(pipelineStageStatus, tx)
415-
if err != nil {
416-
impl.logger.Errorw("error in saving workflow stages", "workflowName", wfr.Name, "error", err)
417-
return err
418-
}
419-
wfr.Status = updatedWfStatus
420-
wfr.PodStatus = updatedPodStatus
421-
} else {
422-
impl.logger.Infow("workflow type not supported to update stage data", "workflowName", wfr.Name, "workflowType", wfr.WorkflowType)
423-
}
424-
}
425-
426-
//update workflow runner now with updatedWfStatus if applicable
427-
err = impl.cdWorkflowRepository.UpdateWorkFlowRunnerWithTx(wfr, tx)
428-
if err != nil {
429-
impl.logger.Errorw("error in saving workflow", "payload", wfr, "error", err)
430-
return err
431-
}
432-
433-
err = impl.transactionManager.CommitTx(tx)
434-
if err != nil {
435-
impl.logger.Errorw("error in committing transaction", "workflowName", wfr.Name, "error", err)
436-
return err
437-
}
438-
return nil
439-
440-
}
441-
442355
func (impl *WorkFlowStageStatusServiceImpl) ConvertDBWorkflowStageToMap(workflowStages []*repository.WorkflowExecutionStage, wfId int, status, podStatus, message, wfType string, startTime, endTime time.Time) map[string][]*bean2.WorkflowStageDto {
443356
wfMap := make(map[string][]*bean2.WorkflowStageDto)
444357
foundInDb := false

‎pkg/workflow/cd/CdWorkflowCommonService.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"github.com/devtron-labs/devtron/pkg/app/status"
3232
common2 "github.com/devtron-labs/devtron/pkg/deployment/common"
3333
"github.com/devtron-labs/devtron/pkg/pipeline/types"
34-
"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
3534
globalUtil "github.com/devtron-labs/devtron/util"
3635
"go.opentelemetry.io/otel"
3736
"go.uber.org/zap"
@@ -59,7 +58,7 @@ type CdWorkflowCommonServiceImpl struct {
5958
pipelineRepository pipelineConfig.PipelineRepository
6059
pipelineStatusTimelineRepository pipelineConfig.PipelineStatusTimelineRepository
6160
deploymentConfigService common2.DeploymentConfigService
62-
workflowStageService workflowStatus.WorkFlowStageStatusService
61+
cdWorkflowRunnerService CdWorkflowRunnerService
6362
}
6463

6564
func NewCdWorkflowCommonServiceImpl(logger *zap.SugaredLogger,
@@ -68,7 +67,7 @@ func NewCdWorkflowCommonServiceImpl(logger *zap.SugaredLogger,
6867
pipelineRepository pipelineConfig.PipelineRepository,
6968
pipelineStatusTimelineRepository pipelineConfig.PipelineStatusTimelineRepository,
7069
deploymentConfigService common2.DeploymentConfigService,
71-
workflowStageService workflowStatus.WorkFlowStageStatusService) (*CdWorkflowCommonServiceImpl, error) {
70+
cdWorkflowRunnerService CdWorkflowRunnerService) (*CdWorkflowCommonServiceImpl, error) {
7271
config, err := types.GetCdConfig()
7372
if err != nil {
7473
return nil, err
@@ -81,7 +80,7 @@ func NewCdWorkflowCommonServiceImpl(logger *zap.SugaredLogger,
8180
pipelineRepository: pipelineRepository,
8281
pipelineStatusTimelineRepository: pipelineStatusTimelineRepository,
8382
deploymentConfigService: deploymentConfigService,
84-
workflowStageService: workflowStageService,
83+
cdWorkflowRunnerService: cdWorkflowRunnerService,
8584
}, nil
8685
}
8786

@@ -175,7 +174,7 @@ func (impl *CdWorkflowCommonServiceImpl) MarkCurrentDeploymentFailed(runner *pip
175174
runner.Message = util.GetClientErrorDetailedMessage(releaseErr)
176175
runner.FinishedOn = time.Now()
177176
runner.UpdateAuditLog(triggeredBy)
178-
err1 := impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(runner)
177+
err1 := impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(runner)
179178
if err1 != nil {
180179
impl.logger.Errorw("error updating cd wf runner status", "err", releaseErr, "currentRunner", runner)
181180
return err1
@@ -227,7 +226,7 @@ func (impl *CdWorkflowCommonServiceImpl) UpdateNonTerminalStatusInRunner(ctx con
227226
}
228227
cdWfr.Status = status
229228
cdWfr.UpdateAuditLog(userId)
230-
err = impl.workflowStageService.UpdateCdWorkflowRunnerWithStage(cdWfr)
229+
err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(cdWfr)
231230
if err != nil {
232231
impl.logger.Errorw("error on update cd workflow runner, UpdateNonTerminalStatusInRunner", "cdWfr", cdWfr, "err", err)
233232
return err

0 commit comments

Comments
 (0)