Fix workspace list

coder · kylecarbs · Apr 12, 2022 · Apr 8, 2022 · Apr 8, 2022 · Apr 9, 2022
commit 8fecb67dccd403d1f84afabafc6259d99cfd6727
diff --git a/cli/configssh_test.go b/cli/configssh_test.go
@@ -123,7 +123,9 @@ func TestConfigSSH(t *testing.T) {
 
 	t.Log(tempFile.Name())
 	// #nosec
-	data, err := exec.Command("ssh", "-F", tempFile.Name(), "coder."+workspace.Name, "echo", "test").Output()
+	sshCmd := exec.Command("ssh", "-F", tempFile.Name(), "coder."+workspace.Name, "echo", "test")
+	sshCmd.Stderr = os.Stderr
+	data, err := sshCmd.Output()
 	require.NoError(t, err)
 	require.Equal(t, "test", strings.TrimSpace(string(data)))
 }
diff --git a/cli/workspacedelete.go b/cli/workspacedelete.go
@@ -32,19 +32,7 @@ func workspaceDelete() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			err = cliui.ProvisionerJob(cmd.Context(), cmd.OutOrStdout(), cliui.ProvisionerJobOptions{
-				Fetch: func() (codersdk.ProvisionerJob, error) {
-					build, err := client.WorkspaceBuild(cmd.Context(), build.ID)
-					return build.Job, err
-				},
-				Cancel: func() error {
-					return client.CancelWorkspaceBuild(cmd.Context(), build.ID)
-				},
-				Logs: func() (<-chan codersdk.ProvisionerJobLog, error) {
-					return client.WorkspaceBuildLogsAfter(cmd.Context(), build.ID, before)
-				},
-			})
-			return err
+			return cliui.WorkspaceBuild(cmd.Context(), cmd.OutOrStdout(), client, build.ID, before)
 		},
 	}
 }
diff --git a/cli/workspacelist.go b/cli/workspacelist.go
@@ -2,13 +2,12 @@ package cli
 
 import (
 	"fmt"
-	"text/tabwriter"
-	"time"
 
-	"github.com/fatih/color"
+	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -21,7 +20,6 @@ func workspaceList() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			start := time.Now()
 			workspaces, err := client.WorkspacesByUser(cmd.Context(), codersdk.Me)
 			if err != nil {
 				return err
@@ -34,27 +32,47 @@ func workspaceList() *cobra.Command {
 				return nil
 			}
 
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Workspaces found %s\n\n",
-				caret,
-				color.HiBlackString("[%dms]",
-					time.Since(start).Milliseconds()))
-
-			writer := tabwriter.NewWriter(cmd.OutOrStdout(), 0, 0, 4, ' ', 0)
-			_, _ = fmt.Fprintf(writer, "%s\t%s\t%s\t%s\t%s\n",
-				color.HiBlackString("Workspace"),
-				color.HiBlackString("Template"),
-				color.HiBlackString("Status"),
-				color.HiBlackString("Last Built"),
-				color.HiBlackString("Outdated"))
+			tableWriter := table.NewWriter()
+			tableWriter.SetStyle(table.StyleLight)
+			tableWriter.Style().Options.SeparateColumns = false
+			tableWriter.AppendHeader(table.Row{"Workspace", "Template", "Status", "Last Built", "Outdated"})
+
 			for _, workspace := range workspaces {
-				_, _ = fmt.Fprintf(writer, "%s\t%s\t%s\t%s\t%+v\n",
-					color.New(color.FgHiCyan).Sprint(workspace.Name),
-					color.WhiteString(workspace.TemplateName),
-					color.WhiteString(string(workspace.LatestBuild.Transition)),
-					color.WhiteString(workspace.LatestBuild.Job.CompletedAt.Format("January 2, 2006")),
-					workspace.Outdated)
+				status := ""
+				inProgress := false
+				if workspace.LatestBuild.Job.Status == codersdk.ProvisionerJobRunning ||
+					workspace.LatestBuild.Job.Status == codersdk.ProvisionerJobCanceling {
+					inProgress = true
+				}
+
+				switch workspace.LatestBuild.Transition {
+				case database.WorkspaceTransitionStart:
+					status = "start"
+					if inProgress {
+						status = "starting"
+					}
+				case database.WorkspaceTransitionStop:
+					status = "stop"
+					if inProgress {
+						status = "stopping"
+					}
+				case database.WorkspaceTransitionDelete:
+					status = "delete"
+					if inProgress {
+						status = "deleting"
+					}
+				}
+
+				tableWriter.AppendRow(table.Row{
+					cliui.Styles.Bold.Render(workspace.Name),
+					workspace.TemplateName,
+					status,
+					workspace.LatestBuild.Job.CreatedAt.Format("January 2, 2006"),
+					workspace.Outdated,
+				})
 			}
-			return writer.Flush()
+			_, err = fmt.Fprintf(cmd.OutOrStdout(), tableWriter.Render())
+			return err
 		},
 	}
 }