circular import fix

Author: iamayushm

pkg/deployment/trigger/devtronApps/HandlerService.go

@@ -21,8 +21,8 @@ import (
 	"context"
 	"github.com/devtron-labs/common-lib/async"
 	"github.com/devtron-labs/devtron/client/fluxcd"
-	status2 "github.com/devtron-labs/devtron/pkg/workflow/status"
 	service2 "github.com/devtron-labs/devtron/pkg/workflow/trigger/audit/service"
+	"github.com/devtron-labs/devtron/pkg/workflow/workflowStatusLatest"
 	"os"
 	"time"
 
@@ -175,7 +175,7 @@ type HandlerServiceImpl struct {
 	asyncRunnable                       *async.Runnable
 	workflowTriggerAuditService         service2.WorkflowTriggerAuditService
 	fluxCdDeploymentService             fluxcd.DeploymentService
-	workflowStatusUpdateService         status2.WorkflowStatusUpdateService
+	workflowStatusUpdateService         workflowStatusLatest.WorkflowStatusUpdateService
 }
 
 func NewHandlerServiceImpl(logger *zap.SugaredLogger,
@@ -241,7 +241,7 @@ func NewHandlerServiceImpl(logger *zap.SugaredLogger,
 	asyncRunnable *async.Runnable,
 	workflowTriggerAuditService service2.WorkflowTriggerAuditService,
 	fluxCdDeploymentService fluxcd.DeploymentService,
-	workflowStatusUpdateService status2.WorkflowStatusUpdateService) (*HandlerServiceImpl, error) {
+	workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService) (*HandlerServiceImpl, error) {
 	impl := &HandlerServiceImpl{
 		logger:                              logger,
 		cdWorkflowCommonService:             cdWorkflowCommonService,

pkg/pipeline/CdHandler.go

@@ -32,7 +32,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
 	bean5 "github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus/bean"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd"
-	"github.com/devtron-labs/devtron/pkg/workflow/status"
+	"github.com/devtron-labs/devtron/pkg/workflow/workflowStatusLatest"
 	"slices"
 	"strconv"
 	"strings"
@@ -91,7 +91,7 @@ type CdHandlerImpl struct {
 	deploymentConfigService      common2.DeploymentConfigService
 	workflowStageStatusService   workflowStatus.WorkFlowStageStatusService
 	cdWorkflowRunnerService      cd.CdWorkflowRunnerService
-	WorkflowStatusLatestService  status.WorkflowStatusLatestService
+	WorkflowStatusLatestService  workflowStatusLatest.WorkflowStatusLatestService
 	pipelineStageRepository      repository2.PipelineStageRepository
 }
 
@@ -107,7 +107,7 @@ func NewCdHandlerImpl(Logger *zap.SugaredLogger, userService user.UserService,
 	deploymentConfigService common2.DeploymentConfigService,
 	workflowStageStatusService workflowStatus.WorkFlowStageStatusService,
 	cdWorkflowRunnerService cd.CdWorkflowRunnerService,
-	WorkflowStatusLatestService status.WorkflowStatusLatestService,
+	WorkflowStatusLatestService workflowStatusLatest.WorkflowStatusLatestService,
 	pipelineStageRepository repository2.PipelineStageRepository,
 ) *CdHandlerImpl {
 	cdh := &CdHandlerImpl{

pkg/workflow/cd/CdWorkflowRunnerService.go

@@ -28,7 +28,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/adapter"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
-	"github.com/devtron-labs/devtron/pkg/workflow/status"
+	"github.com/devtron-labs/devtron/pkg/workflow/workflowStatusLatest"
 	"github.com/devtron-labs/devtron/util"
 	"github.com/go-pg/pg"
 	"go.uber.org/zap"
@@ -49,14 +49,14 @@ type CdWorkflowRunnerServiceImpl struct {
 	workflowStageService        workflowStatus.WorkFlowStageStatusService
 	transactionManager          sql.TransactionWrapper
 	config                      *types.CiConfig
-	workflowStatusUpdateService status.WorkflowStatusUpdateService
+	workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService
 }
 
 func NewCdWorkflowRunnerServiceImpl(logger *zap.SugaredLogger,
 	cdWorkflowRepository pipelineConfig.CdWorkflowRepository,
 	workflowStageService workflowStatus.WorkFlowStageStatusService,
 	transactionManager sql.TransactionWrapper,
-	workflowStatusUpdateService status.WorkflowStatusUpdateService) *CdWorkflowRunnerServiceImpl {
+	workflowStatusUpdateService workflowStatusLatest.WorkflowStatusUpdateService) *CdWorkflowRunnerServiceImpl {
 	impl := &CdWorkflowRunnerServiceImpl{
 		logger:                      logger,
 		cdWorkflowRepository:        cdWorkflowRepository,