[ND-7649] - fix pipeline monitor when staus is aborted

Author: mihaichitic

pkg/api/pipeline/status/status.go

@@ -0,0 +1,15 @@
+package status
+
+// Workflow status values.
+const (
+	WorkflowQueued     = "queued"
+	WorkflowThrottled  = "throttled"
+	WorkflowInProgress = "in_progress"
+	WorkflowSuccess    = "success"
+
+	WorkflowFailing = "failing"
+	WorkflowFailed  = "failed"
+
+	WorkflowAborting = "aborting"
+	WorkflowAborted  = "aborted"
+)

pkg/api/workflow_job/status/status.go

@@ -1,24 +1,10 @@
 package status
 
-// Workflow status values.
-const (
-	WorkflowQueued     = "queued"
-	WorkflowThrottled  = "throttled"
-	WorkflowInProgress = "in_progress"
-	WorkflowSuccess    = "success"
-
-	WorkflowFailing = "failing"
-	WorkflowFailed  = "failed"
-
-	WorkflowAborting = "aborting"
-	WorkflowAborted  = "aborted"
-)
-
 // Job status values.
 const (
-	JobPending     = "pending"
-	JobQueued      = "queued"
-	JobInProgress  = "in_progress"
+	JobPending    = "pending"
+	JobQueued     = "queued"
+	JobInProgress = "in_progress"
 
 	JobFailed      = "failed"
 	JobAbortFailed = "abort_failed"

pkg/formatter/stylish.workflow_job_logs.go

@@ -26,7 +26,7 @@ func statusIcon(status string) string {
 	case wfstatus.JobFailed, wfstatus.JobAbortFailed: // JobFailed same value as StepFailed
 		return color.New(color.FgRed).Sprint("✘")
 	case wfstatus.JobAborting, wfstatus.JobAborted:
-		return color.New(color.FgRed).Sprint("⊘")
+		return color.New(color.FgRed, color.Bold).Sprint("⊘")
 	case wfstatus.JobInProgress:
 		return color.New(color.FgCyan).Sprint("▶︎")
 	case wfstatus.JobPending, wfstatus.JobQueued:

pkg/progress/progress.pipeline.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"time"
 
+	pstatus "bunnyshell.com/cli/pkg/api/pipeline/status"
 	"bunnyshell.com/sdk"
 	"github.com/briandowns/spinner"
 )
@@ -73,12 +74,14 @@ func (p *Progress) UpdatePipeline(workflow *sdk.WorkflowItem) (bool, error) {
 	)
 
 	switch workflow.GetStatus() {
-	case StatusInProgress, StatusPending:
+	case pstatus.WorkflowInProgress, pstatus.WorkflowAborting, pstatus.WorkflowFailing, pstatus.WorkflowThrottled, pstatus.WorkflowQueued:
 		return true, nil
-	case StatusSuccess:
+	case pstatus.WorkflowSuccess:
 		return false, nil
-	case StatusFailed:
+	case pstatus.WorkflowFailed:
 		return false, ErrPipeline
+	case pstatus.WorkflowAborted:
+		return false, ErrPipelineAborted
 	default:
 		return false, fmt.Errorf("%w: unknown status %s", ErrPipeline, workflow.GetStatus())
 	}
@@ -94,12 +97,14 @@ func (p *Progress) Stop() {
 
 func (p *Progress) getState(status string) PipelineStatus {
 	switch status {
-	case StatusSuccess:
+	case pstatus.WorkflowSuccess:
 		return PipelineFinished
-	case StatusInProgress, StatusPending:
+	case pstatus.WorkflowInProgress, pstatus.WorkflowAborting, pstatus.WorkflowFailing, pstatus.WorkflowThrottled, pstatus.WorkflowQueued:
 		return PipelineWorking
-	case StatusFailed:
+	case pstatus.WorkflowFailed:
 		return PipelineFailed
+	case pstatus.WorkflowAborted:
+		return PipelineAborted
 	}
 
 	return PipelineUnknownState

pkg/progress/vars.go

@@ -24,16 +24,10 @@ const (
 	PipelineWorking PipelineStatus = iota
 	PipelineFinished
 	PipelineFailed
+	PipelineAborted
 	PipelineUnknownState
 )
 
-const (
-	StatusSuccess    = "success"
-	StatusFailed     = "failed"
-	StatusInProgress = "in_progress"
-	StatusPending    = "pending"
-)
-
 const (
 	defaultSpinnerUpdate = 2000 * time.Millisecond
 	defaultProgressSet   = 69 // ∙∙●
@@ -43,7 +37,9 @@ var statusMap = map[PipelineStatus]string{
 	PipelineWorking:      color.New(color.FgCyan).Sprintf("»"),
 	PipelineFinished:     color.New(color.FgGreen).Sprintf("✔"),
 	PipelineFailed:       color.New(color.FgRed).Sprintf("✘"),
+	PipelineAborted:      color.New(color.FgRed, color.Bold).Sprintf("⊘"),
 	PipelineUnknownState: color.New(color.FgYellow).Sprintf("?"),
 }
 
 var ErrPipeline = errors.New("pipeline has encountered an error")
+var ErrPipelineAborted = errors.New("pipeline was aborted")