Merge pull request #6175 from devtron-labs/cdworkflow-runner-read

misc: added cd workflow runner read service

Author: ayu-devtron

pkg/eventProcessor/in/WorkflowEventProcessorService.go

@@ -73,6 +73,7 @@ type WorkflowEventProcessorImpl struct {
 	cdWorkflowService            cd.CdWorkflowService
 	cdWorkflowReadService        read.CdWorkflowReadService
 	cdWorkflowRunnerService      cd.CdWorkflowRunnerService
+	cdWorkflowRunnerReadService  read.CdWorkflowRunnerReadService
 	workflowDagExecutor          dag.WorkflowDagExecutor
 	argoUserService              argo.ArgoUserService
 	ciHandler                    pipeline.CiHandler
@@ -104,6 +105,7 @@ func NewWorkflowEventProcessorImpl(logger *zap.SugaredLogger,
 	cdWorkflowService cd.CdWorkflowService,
 	cdWorkflowReadService read.CdWorkflowReadService,
 	cdWorkflowRunnerService cd.CdWorkflowRunnerService,
+	cdWorkflowRunnerReadService read.CdWorkflowRunnerReadService,
 	workflowDagExecutor dag.WorkflowDagExecutor,
 	argoUserService argo.ArgoUserService,
 	ciHandler pipeline.CiHandler, cdHandler pipeline.CdHandler,
@@ -126,6 +128,7 @@ func NewWorkflowEventProcessorImpl(logger *zap.SugaredLogger,
 		cdWorkflowService:               cdWorkflowService,
 		cdWorkflowReadService:           cdWorkflowReadService,
 		cdWorkflowRunnerService:         cdWorkflowRunnerService,
+		cdWorkflowRunnerReadService:     cdWorkflowRunnerReadService,
 		argoUserService:                 argoUserService,
 		ciHandler:                       ciHandler,
 		cdHandler:                       cdHandler,
@@ -165,7 +168,7 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
 			impl.logger.Errorw("error while unmarshalling cdStageCompleteEvent object", "err", err, "msg", msg.Data)
 			return
 		}
-		wfr, err := impl.cdWorkflowRunnerService.FindWorkflowRunnerById(cdStageCompleteEvent.WorkflowRunnerId)
+		wfr, err := impl.cdWorkflowRunnerReadService.FindWorkflowRunnerById(cdStageCompleteEvent.WorkflowRunnerId)
 		if err != nil {
 			impl.logger.Errorw("could not get wf runner", "err", err)
 			return
@@ -991,7 +994,7 @@ func (impl *WorkflowEventProcessorImpl) validateConcurrentOrInvalidRequest(ctx c
 			return isValidRequest, err
 		}
 	} else {
-		isLatestRequest, err = impl.cdWorkflowRunnerService.CheckIfWfrLatest(cdWfr.Id, pipelineId)
+		isLatestRequest, err = impl.cdWorkflowRunnerReadService.CheckIfWfrLatest(cdWfr.Id, pipelineId)
 		if err != nil {
 			impl.logger.Errorw("error, CheckIfWfrLatest", "err", err, "cdWfrId", cdWfr.Id)
 			return isValidRequest, err

pkg/workflow/cd/CdWorkflowRunnerService.go

@@ -21,13 +21,10 @@ import (
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/adapter"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
-	"github.com/go-pg/pg"
 	"go.uber.org/zap"
 )
 
 type CdWorkflowRunnerService interface {
-	FindWorkflowRunnerById(wfrId int) (*bean.CdWorkflowRunnerDto, error)
-	CheckIfWfrLatest(wfrId, pipelineId int) (isLatest bool, err error)
 	UpdateWfr(dto *bean.CdWorkflowRunnerDto, updatedBy int) error
 	UpdateIsArtifactUploaded(wfrId int, isArtifactUploaded bool) error
 }
@@ -45,25 +42,6 @@ func NewCdWorkflowRunnerServiceImpl(logger *zap.SugaredLogger,
 	}
 }
 
-func (impl *CdWorkflowRunnerServiceImpl) FindWorkflowRunnerById(wfrId int) (*bean.CdWorkflowRunnerDto, error) {
-	cdWfr, err := impl.cdWorkflowRepository.FindWorkflowRunnerById(wfrId)
-	if err != nil {
-		impl.logger.Errorw("error in getting cd workflow runner by id", "err", err, "id", wfrId)
-		return nil, err
-	}
-	return adapter.ConvertCdWorkflowRunnerDbObjToDto(cdWfr), nil
-
-}
-
-func (impl *CdWorkflowRunnerServiceImpl) CheckIfWfrLatest(wfrId, pipelineId int) (isLatest bool, err error) {
-	isLatest, err = impl.cdWorkflowRepository.IsLatestCDWfr(wfrId, pipelineId)
-	if err != nil && err != pg.ErrNoRows {
-		impl.logger.Errorw("err in checking latest cd workflow runner", "err", err)
-		return false, err
-	}
-	return isLatest, nil
-}
-
 func (impl *CdWorkflowRunnerServiceImpl) UpdateWfr(dto *bean.CdWorkflowRunnerDto, updatedBy int) error {
 	runnerDbObj := adapter.ConvertCdWorkflowRunnerDtoToDbObj(dto)
 	runnerDbObj.UpdateAuditLog(int32(updatedBy))

pkg/workflow/cd/read/CdWorkflowRunnerReadService.go

@@ -0,0 +1,46 @@
+package read
+
+import (
+	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
+	"github.com/devtron-labs/devtron/pkg/workflow/cd/adapter"
+	"github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
+	"github.com/go-pg/pg"
+	"go.uber.org/zap"
+)
+
+type CdWorkflowRunnerReadService interface {
+	FindWorkflowRunnerById(wfrId int) (*bean.CdWorkflowRunnerDto, error)
+	CheckIfWfrLatest(wfrId, pipelineId int) (isLatest bool, err error)
+}
+
+type CdWorkflowRunnerReadServiceImpl struct {
+	logger               *zap.SugaredLogger
+	cdWorkflowRepository pipelineConfig.CdWorkflowRepository
+}
+
+func NewCdWorkflowRunnerReadServiceImpl(logger *zap.SugaredLogger,
+	cdWorkflowRepository pipelineConfig.CdWorkflowRepository) *CdWorkflowRunnerReadServiceImpl {
+	return &CdWorkflowRunnerReadServiceImpl{
+		logger:               logger,
+		cdWorkflowRepository: cdWorkflowRepository,
+	}
+}
+
+func (impl *CdWorkflowRunnerReadServiceImpl) FindWorkflowRunnerById(wfrId int) (*bean.CdWorkflowRunnerDto, error) {
+	cdWfr, err := impl.cdWorkflowRepository.FindWorkflowRunnerById(wfrId)
+	if err != nil {
+		impl.logger.Errorw("error in getting cd workflow runner by id", "err", err, "id", wfrId)
+		return nil, err
+	}
+	return adapter.ConvertCdWorkflowRunnerDbObjToDto(cdWfr), nil
+
+}
+
+func (impl *CdWorkflowRunnerReadServiceImpl) CheckIfWfrLatest(wfrId, pipelineId int) (isLatest bool, err error) {
+	isLatest, err = impl.cdWorkflowRepository.IsLatestCDWfr(wfrId, pipelineId)
+	if err != nil && err != pg.ErrNoRows {
+		impl.logger.Errorw("err in checking latest cd workflow runner", "err", err)
+		return false, err
+	}
+	return isLatest, nil
+}

pkg/workflow/cd/wire_workflowCd.go

@@ -30,4 +30,6 @@ var CdWorkflowWireSet = wire.NewSet(
 	wire.Bind(new(read.CdWorkflowReadService), new(*read.CdWorkflowReadServiceImpl)),
 	NewCdWorkflowRunnerServiceImpl,
 	wire.Bind(new(CdWorkflowRunnerService), new(*CdWorkflowRunnerServiceImpl)),
+	read.NewCdWorkflowRunnerReadServiceImpl,
+	wire.Bind(new(read.CdWorkflowRunnerReadService), new(*read.CdWorkflowRunnerReadServiceImpl)),
 )