Merge pull request #139 from trickest/fix/nil-completed-date-panic

Handle nil completed date for failed runs, add run duration function

Author: PolovinaD

cmd/get/json_output.go

@@ -81,12 +81,7 @@ func NewJSONRun(run *trickest.Run, subjobs []trickest.SubJob, taskGroupStatsMap
 		RunInsights:         run.RunInsights,
 		Machines:            run.Machines,
 		Parallelism:         run.Parallelism,
-	}
-
-	if run.Status == "RUNNING" {
-		jsonRun.Duration = trickest.Duration{Duration: time.Since(*run.StartedDate)}
-	} else {
-		jsonRun.Duration = trickest.Duration{Duration: run.CompletedDate.Sub(*run.StartedDate)}
+		Duration:            trickest.Duration{Duration: run.Duration()},
 	}
 
 	jsonRun.SubJobs = make([]JSONSubJob, len(subjobs))

cmd/help/help.go

@@ -168,11 +168,16 @@ func generateHelpMarkdown(workflow *trickest.Workflow, labeledPrimitiveNodes []*
 		sb.WriteString("|------------|-------------|----------|-----|\n")
 		for _, run := range runs {
 			machines := run.Parallelism
-			date := run.StartedDate.Format("2006-01-02 15:04")
-			duration := run.CompletedDate.Sub(*run.StartedDate)
-			durationStr := display.FormatDuration(duration)
+			dateStr := "N/A"
+			if run.StartedDate != nil {
+				dateStr = run.StartedDate.Format("2006-01-02 15:04")
+			}
+			durationStr := "N/A"
+			if duration := run.Duration(); duration > 0 {
+				durationStr = display.FormatDuration(duration)
+			}
 			runURL := fmt.Sprintf("%s?run=%s", workflowURL, run.ID)
-			sb.WriteString(fmt.Sprintf("| %s | %d | %s | [View](%s) |\n", date, machines, durationStr, runURL))
+			sb.WriteString(fmt.Sprintf("| %s | %d | %s | [View](%s) |\n", dateStr, machines, durationStr, runURL))
 		}
 		sb.WriteString("\n")
 		sb.WriteString("Use the `--machines` flag to set the number of machines (maximum parallelism) to run the workflow on.\n\n")

pkg/display/run/printer.go

@@ -68,31 +68,28 @@ func (p *RunPrinter) PrintAll(run *trickest.Run, subJobs []trickest.SubJob, vers
 		output.WriteString(p.formatKeyValue("Created",
 			run.CreatedDate.In(time.Local).Format(time.RFC1123)+" ("+FormatDuration(time.Since(*run.CreatedDate))+" ago)"))
 	}
-	if run.Status != "PENDING" {
-		if run.StartedDate != nil {
-			output.WriteString(p.formatKeyValue("Started",
-				run.StartedDate.In(time.Local).Format(time.RFC1123)+" ("+FormatDuration(time.Since(*run.StartedDate))+" ago)"))
-		}
+	if run.Status != "PENDING" && run.StartedDate != nil {
+		output.WriteString(p.formatKeyValue("Started",
+			run.StartedDate.In(time.Local).Format(time.RFC1123)+" ("+FormatDuration(time.Since(*run.StartedDate))+" ago)"))
 	}
-	if run.Finished {
+	if run.Finished && run.CompletedDate != nil {
 		output.WriteString(p.formatKeyValue("Finished",
 			run.CompletedDate.In(time.Local).Format(time.RFC1123)+" ("+FormatDuration(time.Since(*run.CompletedDate))+" ago)"))
 	}
 	output.WriteString("\n")
 
 	// Print duration and average duration
-	if run.Finished {
-		output.WriteString(p.formatKeyValue("Duration", FormatDuration(run.CompletedDate.Sub(*run.StartedDate))))
-	} else if run.Status == "RUNNING" {
-		output.WriteString(p.formatKeyValue("Duration", FormatDuration(time.Since(*run.StartedDate))))
+	durationStr := "N/A"
+	if duration := run.Duration(); duration > 0 {
+		durationStr = FormatDuration(duration)
 	}
-	if run.AverageDuration != nil {
-		if run.AverageDuration.Duration > 0 {
-			output.WriteString(p.formatKeyValue("Average Duration", FormatDuration(run.AverageDuration.Duration)))
-		} else {
-			output.WriteString(p.formatKeyValue("Average Duration", "N/A"))
-		}
+	output.WriteString(p.formatKeyValue("Duration", durationStr))
+
+	avgDurationStr := "N/A"
+	if run.AverageDuration != nil && run.AverageDuration.Duration > 0 {
+		avgDurationStr = FormatDuration(run.AverageDuration.Duration)
 	}
+	output.WriteString(p.formatKeyValue("Average Duration", avgDurationStr))
 	output.WriteString("\n")
 
 	// Print subjob insights

pkg/trickest/run.go

@@ -37,10 +37,19 @@ type Run struct {
 	UseStaticIPs        *bool              `json:"use_static_ips,omitempty"`
 	IPAddresses         []string           `json:"ip_addresses,omitempty"`
 	RunInsights         *RunSubJobInsights `json:"run_insights,omitempty"`
-	Duration            *Duration          `json:"duration,omitempty"`
 	AverageDuration     *Duration          `json:"average_duration,omitempty"`
 }
 
+func (r Run) Duration() time.Duration {
+	if r.StartedDate == nil {
+		return 0
+	}
+	if r.CompletedDate == nil {
+		return time.Since(*r.StartedDate)
+	}
+	return r.CompletedDate.Sub(*r.StartedDate)
+}
+
 // Duration is a custom type for duration that json marshals to "Xh Ym" or "Xm Ys" matching the web UI
 type Duration struct {
 	Duration time.Duration

pkg/trickest/workflow.go

@@ -335,8 +335,7 @@ func (c *Client) GetWorkflowRunsAverageDuration(ctx context.Context, workflowID
 
 	totalDuration := time.Duration(0)
 	for _, pastRun := range pastRuns {
-		duration := pastRun.CompletedDate.Sub(*pastRun.StartedDate)
-		totalDuration += duration
+		totalDuration += pastRun.Duration()
 	}
 	averageDuration := totalDuration / time.Duration(len(pastRuns))