fix: cli/list: show extension in list output

johnstcn · johnstcn · commit 4b868d236781 · 2022-05-27T15:37:14.000+01:00
diff --git a/cli/list.go b/cli/list.go
@@ -86,28 +86,6 @@ func list() *cobra.Command {
 				}
 
 				duration := time.Now().UTC().Sub(workspace.LatestBuild.Job.CreatedAt).Truncate(time.Second)
-				if duration > time.Hour {
-					duration = duration.Truncate(time.Hour)
-				}
-				if duration > time.Minute {
-					duration = duration.Truncate(time.Minute)
-				}
-				days := 0
-				for duration.Hours() > 24 {
-					days++
-					duration -= 24 * time.Hour
-				}
-				durationDisplay := duration.String()
-				if days > 0 {
-					durationDisplay = fmt.Sprintf("%dd%s", days, durationDisplay)
-				}
-				if strings.HasSuffix(durationDisplay, "m0s") {
-					durationDisplay = durationDisplay[:len(durationDisplay)-2]
-				}
-				if strings.HasSuffix(durationDisplay, "h0m") {
-					durationDisplay = durationDisplay[:len(durationDisplay)-2]
-				}
-
 				autostartDisplay := "-"
 				if workspace.AutostartSchedule != "" {
 					if sched, err := schedule.Weekly(workspace.AutostartSchedule); err == nil {
@@ -117,15 +95,18 @@ func list() *cobra.Command {
 
 				autostopDisplay := "-"
 				if workspace.TTL != nil {
-					autostopDisplay = workspace.TTL.String()
+					autostopDisplay = durationDisplay(*workspace.TTL)
+					if has, ext := hasExtension(workspace); has {
+						autostopDisplay += fmt.Sprintf(" (+%s)", durationDisplay(ext))
+					}
 				}
 
 				user := usersByID[workspace.OwnerID]
 				tableWriter.AppendRow(table.Row{
 					user.Username + "/" + workspace.Name,
 					workspace.TemplateName,
 					status,
-					durationDisplay,
+					durationDisplay(duration),
 					workspace.Outdated,
 					autostartDisplay,
 					autostopDisplay,
@@ -139,3 +120,47 @@ func list() *cobra.Command {
 		"Specify a column to filter in the table.")
 	return cmd
 }
+
+func hasExtension(ws codersdk.Workspace) (bool, time.Duration) {
+	if ws.LatestBuild.Transition != codersdk.WorkspaceTransitionStart {
+		return false, 0
+	}
+	if ws.LatestBuild.Deadline.IsZero() {
+		return false, 0
+	}
+	if ws.TTL == nil {
+		return false, 0
+	}
+	delta := ws.LatestBuild.Deadline.Add(-*ws.TTL).Sub(ws.LatestBuild.UpdatedAt).Round(time.Minute)
+	if delta <= 0 {
+		return false, 0
+	}
+
+	return true, delta
+}
+
+func durationDisplay(d time.Duration) string {
+	duration := d
+	if duration > time.Hour {
+		duration = duration.Truncate(time.Hour)
+	}
+	if duration > time.Minute {
+		duration = duration.Truncate(time.Minute)
+	}
+	days := 0
+	for duration.Hours() > 24 {
+		days++
+		duration -= 24 * time.Hour
+	}
+	durationDisplay := duration.String()
+	if days > 0 {
+		durationDisplay = fmt.Sprintf("%dd%s", days, durationDisplay)
+	}
+	if strings.HasSuffix(durationDisplay, "m0s") {
+		durationDisplay = durationDisplay[:len(durationDisplay)-2]
+	}
+	if strings.HasSuffix(durationDisplay, "h0m") {
+		durationDisplay = durationDisplay[:len(durationDisplay)-2]
+	}
+	return durationDisplay
+}
