Skip to content

Commit 604baa8

Browse files
committed
Remove WorkflowStatusLatestService usage and fallback logic from CiHandlerImpl. Streamline CI status fetching through existing repository methods.
1 parent bc7e274 commit 604baa8

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

pkg/pipeline/CiHandler.go

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import (
4949
"github.com/devtron-labs/devtron/pkg/pipeline/executors"
5050
"github.com/devtron-labs/devtron/pkg/pipeline/types"
5151
"github.com/devtron-labs/devtron/pkg/resourceGroup"
52-
workflowStatusLatest "github.com/devtron-labs/devtron/pkg/workflow/status"
5352
"github.com/devtron-labs/devtron/util/rbac"
5453
"github.com/go-pg/pg"
5554
"go.uber.org/zap"
@@ -98,15 +97,13 @@ type CiHandlerImpl struct {
9897
config *types.CiConfig
9998
k8sCommonService k8sPkg.K8sCommonService
10099
workFlowStageStatusService workflowStatus.WorkFlowStageStatusService
101-
workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService
102100
}
103101

104102
func NewCiHandlerImpl(Logger *zap.SugaredLogger, ciService CiService, ciPipelineMaterialRepository pipelineConfig.CiPipelineMaterialRepository, gitSensorClient gitSensor.Client, ciWorkflowRepository pipelineConfig.CiWorkflowRepository,
105103
ciArtifactRepository repository.CiArtifactRepository, userService user.UserService, eventClient client.EventClient, eventFactory client.EventFactory, ciPipelineRepository pipelineConfig.CiPipelineRepository,
106104
appListingRepository repository.AppListingRepository, cdPipelineRepository pipelineConfig.PipelineRepository, enforcerUtil rbac.EnforcerUtil, resourceGroupService resourceGroup.ResourceGroupService, envRepository repository2.EnvironmentRepository,
107105
imageTaggingService imageTagging.ImageTaggingService, k8sCommonService k8sPkg.K8sCommonService, appWorkflowRepository appWorkflow.AppWorkflowRepository, customTagService CustomTagService,
108106
workFlowStageStatusService workflowStatus.WorkFlowStageStatusService,
109-
workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService,
110107
) *CiHandlerImpl {
111108
cih := &CiHandlerImpl{
112109
Logger: Logger,
@@ -129,7 +126,6 @@ func NewCiHandlerImpl(Logger *zap.SugaredLogger, ciService CiService, ciPipeline
129126
appWorkflowRepository: appWorkflowRepository,
130127
k8sCommonService: k8sCommonService,
131128
workFlowStageStatusService: workFlowStageStatusService,
132-
workflowStatusUpdateService: workflowStatusUpdateService,
133129
}
134130
config, err := types.GetCiConfig()
135131
if err != nil {
@@ -648,16 +644,10 @@ func (impl *CiHandlerImpl) stateChanged(status string, podStatus string, msg str
648644
}
649645

650646
func (impl *CiHandlerImpl) FetchCiStatusForTriggerViewV1(appId int) ([]*pipelineConfig.CiWorkflowStatus, error) {
651-
// Try to use the optimized workflow status latest service first
652-
ciWorkflowStatuses, err := impl.workflowStatusUpdateService.FetchCiStatusForTriggerViewOptimized(appId)
653-
if err != nil {
654-
impl.Logger.Errorw("error in fetching ci status from optimized service, falling back to old method", "appId", appId, "err", err)
655-
// Fallback to old method if optimized service fails
656-
ciWorkflowStatuses, err = impl.ciWorkflowRepository.FIndCiWorkflowStatusesByAppId(appId)
657-
if err != nil && !util.IsErrNoRows(err) {
658-
impl.Logger.Errorw("err in fetching ciWorkflowStatuses from ciWorkflowRepository", "appId", appId, "err", err)
659-
return ciWorkflowStatuses, err
660-
}
647+
ciWorkflowStatuses, err := impl.ciWorkflowRepository.FIndCiWorkflowStatusesByAppId(appId)
648+
if err != nil && !util.IsErrNoRows(err) {
649+
impl.Logger.Errorw("err in fetching ciWorkflowStatuses from ciWorkflowRepository", "appId", appId, "err", err)
650+
return ciWorkflowStatuses, err
661651
}
662652

663653
return ciWorkflowStatuses, err

0 commit comments

Comments
 (0)