update workflow type

devtron-labs · Aug 14, 2023 · d93ea13 · d93ea13
1 parent b3a4682
commit d93ea13
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/pkg/pipeline/ArgoWorkflowExecutor.go b/pkg/pipeline/ArgoWorkflowExecutor.go
@@ -74,13 +74,13 @@ func (impl *ArgoWorkflowExecutorImpl) ExecuteWorkflow(workflowTemplate bean.Work
 
 	entryPoint := workflowTemplate.WorkflowType
 	// get cm and cs argo step templates
-	templates, err := impl.getArgoTemplates(workflowTemplate.ConfigMaps, workflowTemplate.Secrets, workflowTemplate.WorkflowType == CiStage)
+	templates, err := impl.getArgoTemplates(workflowTemplate.ConfigMaps, workflowTemplate.Secrets, workflowTemplate.WorkflowType == CI_WORKFLOW_NAME)
 	if err != nil {
 		impl.logger.Errorw("error occurred while fetching argo templates and steps", "err", err)
 		return nil, err
 	}
 	if len(templates) > 0 {
-		if workflowTemplate.WorkflowType == CiStage {
+		if workflowTemplate.WorkflowType == CI_WORKFLOW_NAME {
 			entryPoint = CI_WORKFLOW_WITH_STAGES
 		} else {
 			entryPoint = CD_WORKFLOW_WITH_STAGES

diff --git a/pkg/pipeline/WorkflowService.go b/pkg/pipeline/WorkflowService.go
@@ -402,7 +402,7 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *Workflo
 
 	clusterConfig, err := impl.getClusterConfig(workflowRequest)
 	workflowTemplate.ClusterConfig = clusterConfig
-	workflowTemplate.WorkflowType = workflowRequest.GetEventTypeForWorkflowRequest()
+	workflowTemplate.WorkflowType = workflowRequest.GetWorkflowTypeForWorkflowRequest()
 	return workflowTemplate, nil
 }
 

diff --git a/pkg/pipeline/WorkflowUtils.go b/pkg/pipeline/WorkflowUtils.go
@@ -452,6 +452,19 @@ func (workflowRequest *WorkflowRequest) GetEventTypeForWorkflowRequest() string
 	}
 }
 
+func (workflowRequest *WorkflowRequest) GetWorkflowTypeForWorkflowRequest() string {
+	switch workflowRequest.Type {
+	case bean.CI_WORKFLOW_PIPELINE_TYPE:
+		return CI_WORKFLOW_NAME
+	case bean.JOB_WORKFLOW_PIPELINE_TYPE:
+		return CI_WORKFLOW_NAME
+	case bean.CD_WORKFLOW_PIPELINE_TYPE:
+		return CD_WORKFLOW_NAME
+	default:
+		return ""
+	}
+}
+
 func (workflowRequest *WorkflowRequest) getContainerEnvVariables(config *CiCdConfig, workflowJson []byte) (containerEnvVariables []v12.EnvVar) {
 	if workflowRequest.Type == bean.CI_WORKFLOW_PIPELINE_TYPE ||
 		workflowRequest.Type == bean.JOB_WORKFLOW_PIPELINE_TYPE {