terminate workflow refactoring

Author: prakash100198

pkg/pipeline/CdHandler.go

@@ -175,7 +175,15 @@ func (impl *CdHandlerImpl) CancelStage(workflowRunnerId int, userId int32) (int,
 		}
 	}
 	// Terminate workflow
-	err = impl.workflowService.TerminateWorkflow(workflowRunner.ExecutorType, workflowRunner.Name, workflowRunner.Namespace, restConfig, isExtCluster, nil)
+	cancelWfDtoRequest := &types.CancelWfRequestDto{
+		ExecutorType: workflowRunner.ExecutorType,
+		Name:         workflowRunner.Name,
+		Namespace:    workflowRunner.Namespace,
+		RestConfig:   restConfig,
+		IsExt:        isExtCluster,
+		Environment:  nil,
+	}
+	err = impl.workflowService.TerminateWorkflow(cancelWfDtoRequest)
 	if err != nil {
 		impl.Logger.Error("cannot terminate wf runner", "err", err)
 		return 0, err

pkg/pipeline/CiHandler.go

@@ -604,9 +604,18 @@ func (impl *CiHandlerImpl) CancelBuild(workflowId int, forceAbort bool) (int, er
 			return 0, err
 		}
 	}
-
 	// Terminate workflow
-	err = impl.workflowService.TerminateWorkflow(workflow.ExecutorType, workflow.Name, workflow.Namespace, restConfig, isExt, env)
+	cancelWfDtoRequest := &types.CancelWfRequestDto{
+		ExecutorType: workflow.ExecutorType,
+		Name:         workflow.Name,
+		Namespace:    workflow.Namespace,
+		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

pkg/pipeline/WorkflowService.go

@@ -51,7 +51,7 @@ type WorkflowService interface {
 	GetWorkflowStatus(executorType cdWorkflow.WorkflowExecutorType, name string, namespace string, restConfig *rest.Config) (*types.WorkflowStatus, error)
 	// ListAllWorkflows(namespace string) (*v1alpha1.WorkflowList, error)
 	// UpdateWorkflow(wf *v1alpha1.Workflow) (*v1alpha1.Workflow, error)
-	TerminateWorkflow(executorType cdWorkflow.WorkflowExecutorType, name string, namespace string, restConfig *rest.Config, isExt bool, environment *repository.Environment) error
+	TerminateWorkflow(cancelWfDtoRequest *types.CancelWfRequestDto) error
 }
 
 type WorkflowServiceImpl struct {
@@ -352,24 +352,24 @@ func (impl *WorkflowServiceImpl) GetWorkflowStatus(executorType cdWorkflow.Workf
 	return wfStatus, err
 }
 
-func (impl *WorkflowServiceImpl) TerminateWorkflow(executorType cdWorkflow.WorkflowExecutorType, name string, namespace string, restConfig *rest.Config, isExt bool, environment *repository.Environment) error {
-	impl.Logger.Debugw("terminating wf", "name", name)
+func (impl *WorkflowServiceImpl) TerminateWorkflow(cancelWfDtoRequest *types.CancelWfRequestDto) error {
+	impl.Logger.Debugw("terminating wf", "name", cancelWfDtoRequest.Name)
 	var err error
-	if executorType != "" {
-		workflowExecutor := impl.getWorkflowExecutor(executorType)
+	if cancelWfDtoRequest.ExecutorType != "" {
+		workflowExecutor := impl.getWorkflowExecutor(cancelWfDtoRequest.ExecutorType)
 		if workflowExecutor == nil {
 			return errors.New("workflow executor not found")
 		}
-		if restConfig == nil {
-			restConfig = impl.config
+		if cancelWfDtoRequest.RestConfig == nil {
+			cancelWfDtoRequest.RestConfig = impl.config
 		}
-		err = workflowExecutor.TerminateWorkflow(name, namespace, restConfig)
+		err = workflowExecutor.TerminateWorkflow(cancelWfDtoRequest.Name, cancelWfDtoRequest.Namespace, cancelWfDtoRequest.RestConfig)
 	} else {
-		wfClient, err := impl.getWfClient(environment, namespace, isExt)
+		wfClient, err := impl.getWfClient(cancelWfDtoRequest.Environment, cancelWfDtoRequest.Namespace, cancelWfDtoRequest.IsExt)
 		if err != nil {
 			return err
 		}
-		err = util.TerminateWorkflow(context.Background(), wfClient, name)
+		err = util.TerminateWorkflow(context.Background(), wfClient, cancelWfDtoRequest.Name)
 	}
 	return err
 }

pkg/pipeline/types/CiCdConfig.go

@@ -25,6 +25,7 @@ import (
 	blob_storage "github.com/devtron-labs/common-lib/blob-storage"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
+	"github.com/devtron-labs/devtron/pkg/cluster/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	v12 "k8s.io/api/core/v1"
 	"k8s.io/client-go/rest"
@@ -37,6 +38,16 @@ import (
 	"time"
 )
 
+type CancelWfRequestDto struct {
+	ExecutorType cdWorkflow.WorkflowExecutorType
+	Name         string
+	Namespace    string
+	RestConfig   *rest.Config
+	IsExt        bool
+	Environment  *repository.Environment
+	ForceAbort   bool
+}
+
 // build infra configurations like ciTimeout,ciCpuLimit,ciMemLimit,ciCpuReq,ciMemReq are being managed by infraConfig service
 
 type CiCdConfig struct {