TerminateDanglingWorkflow func in systemworkflowexec and argoworkflowexec

Author: prakash100198

pkg/pipeline/CiHandler.go

@@ -612,13 +612,16 @@ func (impl *CiHandlerImpl) CancelBuild(workflowId int, forceAbort bool) (int, er
 		RestConfig:   restConfig,
 		IsExt:        isExt,
 		Environment:  env,
-		ForceAbort:   forceAbort,
 	}
 	// Terminate workflow
 	err = impl.workflowService.TerminateWorkflow(cancelWfDtoRequest)
 	if err != nil && forceAbort {
 		impl.Logger.Errorw("error in terminating workflow, with force abort flag flag as true", "workflowName", workflow.Name, "err", err)
-		//ignoring error in case of force abort later updating workflow with force abort
+		err1 := impl.workflowService.TerminateDanglingWorkflows(cancelWfDtoRequest)
+		if err1 != nil {
+			impl.Logger.Errorw("error in terminating dangling workflows", "cancelWfDtoRequest", cancelWfDtoRequest, "err", err)
+			return 0, err1
+		}
 	} else if err != nil && strings.Contains(err.Error(), "cannot find workflow") {
 		return 0, &util.ApiError{Code: "200", HttpStatusCode: http.StatusBadRequest, UserMessage: err.Error()}
 	} else if err != nil {

pkg/pipeline/WorkflowService.go

@@ -52,6 +52,7 @@ type WorkflowService interface {
 	// ListAllWorkflows(namespace string) (*v1alpha1.WorkflowList, error)
 	// UpdateWorkflow(wf *v1alpha1.Workflow) (*v1alpha1.Workflow, error)
 	TerminateWorkflow(cancelWfDtoRequest *types.CancelWfRequestDto) error
+	TerminateDanglingWorkflows(cancelWfDtoRequest *types.CancelWfRequestDto) error
 }
 
 type WorkflowServiceImpl struct {
@@ -373,6 +374,29 @@ func (impl *WorkflowServiceImpl) TerminateWorkflow(cancelWfDtoRequest *types.Can
 	}
 	return err
 }
+
+func (impl *WorkflowServiceImpl) TerminateDanglingWorkflows(cancelWfDtoRequest *types.CancelWfRequestDto) error {
+	impl.Logger.Debugw("terminating dangling wf", "name", cancelWfDtoRequest.Name)
+	var err error
+	if cancelWfDtoRequest.ExecutorType != "" {
+		workflowExecutor := impl.getWorkflowExecutor(cancelWfDtoRequest.ExecutorType)
+		if workflowExecutor == nil {
+			return errors.New("workflow executor not found")
+		}
+		if cancelWfDtoRequest.RestConfig == nil {
+			cancelWfDtoRequest.RestConfig = impl.config
+		}
+		err = workflowExecutor.TerminateWorkflow(cancelWfDtoRequest.Name, cancelWfDtoRequest.Namespace, cancelWfDtoRequest.RestConfig)
+	} else {
+		wfClient, err := impl.getWfClient(cancelWfDtoRequest.Environment, cancelWfDtoRequest.Namespace, cancelWfDtoRequest.IsExt)
+		if err != nil {
+			return err
+		}
+		err = util.TerminateWorkflow(context.Background(), wfClient, cancelWfDtoRequest.Name)
+	}
+	return err
+}
+
 func (impl *WorkflowServiceImpl) getRuntimeEnvClientInstance(environment *repository.Environment) (v1alpha12.WorkflowInterface, error) {
 	restConfig, err, _ := impl.k8sCommonService.GetRestConfigByClusterId(context.Background(), environment.ClusterId)
 	if err != nil {

pkg/pipeline/executors/ArgoWorkflowExecutor.go

@@ -59,6 +59,7 @@ type WorkflowExecutor interface {
 	TerminateWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) error
 	GetWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) (*unstructured.UnstructuredList, error)
 	GetWorkflowStatus(workflowName string, namespace string, clusterConfig *rest.Config) (*types.WorkflowStatus, error)
+	TerminateDanglingWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) error
 }
 
 type ArgoWorkflowExecutor interface {
@@ -89,6 +90,10 @@ func (impl *ArgoWorkflowExecutorImpl) TerminateWorkflow(workflowName string, nam
 	return err
 }
 
+func (impl *ArgoWorkflowExecutorImpl) TerminateDanglingWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) error {
+
+}
+
 func (impl *ArgoWorkflowExecutorImpl) ExecuteWorkflow(workflowTemplate bean.WorkflowTemplate) (*unstructured.UnstructuredList, error) {
 
 	entryPoint := workflowTemplate.WorkflowType

pkg/pipeline/executors/SystemWorkflowExecutor.go

@@ -114,6 +114,10 @@ func (impl *SystemWorkflowExecutorImpl) TerminateWorkflow(workflowName string, n
 	return err
 }
 
+func (impl *SystemWorkflowExecutorImpl) TerminateDanglingWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) error {
+
+}
+
 func (impl *SystemWorkflowExecutorImpl) GetWorkflow(workflowName string, namespace string, clusterConfig *rest.Config) (*unstructured.UnstructuredList, error) {
 	templatesList := &unstructured.UnstructuredList{}
 	_, clientset, err := impl.k8sUtil.GetK8sConfigAndClientsByRestConfig(clusterConfig)