workflow status message fix (#6536)

Author: Shivam-nagar23

pkg/eventProcessor/in/WorkflowEventProcessorService.go

@@ -474,7 +474,7 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDWorkflowStatusUpdate() error
 				return
 			}
 		}
-		wfrId, status, stateChanged, err := impl.cdHandler.UpdateWorkflow(wfStatus)
+		wfrId, status, stateChanged, wfStatusMessage, err := impl.cdHandler.UpdateWorkflow(wfStatus)
 		impl.logger.Debugw("cd UpdateWorkflow for wfStatus", "wfrId", wfrId, "status", status, "wfStatus", wfStatus)
 		if err != nil {
 			impl.logger.Errorw("error in cd workflow status update", "wfrId", wfrId, "status", status, "wfStatus", wfStatus, "err", err)
@@ -501,7 +501,7 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDWorkflowStatusUpdate() error
 			wfStatusInEvent := string(wfStatus.Phase)
 			if wfStatusInEvent == string(v1alpha1.NodeSucceeded) || wfStatusInEvent == string(v1alpha1.NodeFailed) || wfStatusInEvent == string(v1alpha1.NodeError) {
 				// the re-trigger should only happen when we get a pod deleted event.
-				if executors.CheckIfReTriggerRequired(status, wfr.Message, wfr.Status) {
+				if executors.CheckIfReTriggerRequired(status, wfStatusMessage, wfr.Status) {
 					err = impl.workflowDagExecutor.HandleCdStageReTrigger(wfr)
 					if err != nil {
 						// check if this log required or not

pkg/pipeline/CdHandler.go

@@ -60,7 +60,7 @@ const (
 )
 
 type CdHandler interface {
-	UpdateWorkflow(workflowStatus eventProcessorBean.CiCdStatus) (int, string, bool, error)
+	UpdateWorkflow(workflowStatus eventProcessorBean.CiCdStatus) (int, string, bool, string, error)
 	GetCdBuildHistory(appId int, environmentId int, pipelineId int, offset int, size int) ([]pipelineBean.CdWorkflowWithArtifact, error)
 	FetchCdWorkflowDetails(appId int, environmentId int, pipelineId int, buildId int) (types.WorkflowResponse, error)
 	FetchCdPrePostStageStatus(pipelineId int) ([]pipelineBean.CdWorkflowWithArtifact, error)
@@ -129,23 +129,23 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, userService user.UserService,
 	return cdh
 }
 
-func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus eventProcessorBean.CiCdStatus) (int, string, bool, error) {
+func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus eventProcessorBean.CiCdStatus) (int, string, bool, string, error) {
 	wfStatusRs := impl.extractWorkflowStatus(workflowStatus)
 	workflowName, status, podStatus, message, podName := wfStatusRs.WorkflowName, wfStatusRs.Status, wfStatusRs.PodStatus, wfStatusRs.Message, wfStatusRs.PodName
 	impl.Logger.Debugw("cd workflow status update event for", "wf ", workflowName, "status", status)
 	if workflowName == "" {
-		return 0, "", false, errors.New("invalid wf name")
+		return 0, "", false, "", errors.New("invalid wf name")
 	}
 	workflowId, err := strconv.Atoi(workflowName[:strings.Index(workflowName, "-")])
 	if err != nil {
 		impl.Logger.Errorw("invalid wf status update req", "workflowName", workflowName, "err", err)
-		return 0, "", false, err
+		return 0, "", false, "", err
 	}
 
 	savedWorkflow, err := impl.cdWorkflowRepository.FindPreOrPostCdWorkflowRunnerById(workflowId)
 	if err != nil {
 		impl.Logger.Error("cannot get saved wf", "workflowId", workflowId, "err", err)
-		return 0, "", false, err
+		return 0, "", false, "", err
 	}
 
 	cdArtifactLocationFormat := impl.config.GetArtifactLocationFormat()
@@ -173,22 +173,22 @@ func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus eventProcessorBean.CiCd
 		err = impl.cdWorkflowRunnerService.UpdateCdWorkflowRunnerWithStage(savedWorkflow)
 		if err != nil {
 			impl.Logger.Errorw("update wf failed for id", "wfId", savedWorkflow.Id, "err", err)
-			return savedWorkflow.Id, "", true, err
+			return savedWorkflow.Id, "", true, "", err
 		}
 		appId := savedWorkflow.CdWorkflow.Pipeline.AppId
 		envId := savedWorkflow.CdWorkflow.Pipeline.EnvironmentId
 		envDeploymentConfig, err := impl.deploymentConfigService.GetConfigForDevtronApps(appId, envId)
 		if err != nil {
 			impl.Logger.Errorw("error in fetching environment deployment config by appId and envId", "appId", appId, "envId", envId, "err", err)
-			return savedWorkflow.Id, savedWorkflow.Status, true, err
+			return savedWorkflow.Id, savedWorkflow.Status, true, "", err
 		}
 		globalUtil.TriggerCDMetrics(pipelineAdapter.GetTriggerMetricsFromRunnerObj(savedWorkflow, envDeploymentConfig), impl.config.ExposeCDMetrics)
 		if string(v1alpha1.NodeError) == savedWorkflow.Status || string(v1alpha1.NodeFailed) == savedWorkflow.Status {
 			impl.Logger.Warnw("cd stage failed for workflow", "wfId", savedWorkflow.Id)
 		}
-		return savedWorkflow.Id, savedWorkflow.Status, true, nil
+		return savedWorkflow.Id, savedWorkflow.Status, true, message, nil
 	}
-	return savedWorkflow.Id, status, false, nil
+	return savedWorkflow.Id, status, false, message, nil
 }
 
 func (impl *CdHandlerImpl) extractWorkflowStatus(workflowStatus eventProcessorBean.CiCdStatus) *types.WorkflowStatus {