Adds BUILD and SHELL columns to ls output (#225)

* Adds `BUILD` and `SHELL` columns to `ls` output

* Change helper function name to better reflect column

* Fix CI

* Update upload-artifact to v4

Author: nwmitchell

.github/workflows/fmt.yml

@@ -27,7 +27,7 @@ jobs:
 
 
       - name: install
-        run: make install
+        run: make install-tools
       - name: check fmt
         run: make fmtcheck
       # - name: Report Status

.github/workflows/legacy.yml

@@ -27,13 +27,13 @@ jobs:
       - name: Build
         run: make ci
       - name: Upload coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage.*
 
       - name: Upload dist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
           go-version: '1.22.6'
           cache: true
       - name: install
-        run: make install
+        run: make install-tools
       - name: lint
         run: make lint
       # - name: Report Status

.github/workflows/test.yml

@@ -25,17 +25,17 @@ jobs:
           go-version: '1.22.6'
           cache: true
       - name: install
-        run: make install
+        run: make install-tools
       - name: test
         run: make test
       - name: Upload coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage
           path: coverage.*
 
       - name: Upload dist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist

.github/workflows/vet.yml

@@ -25,7 +25,7 @@ jobs:
           go-version: '1.22.6'
           cache: true
       - name: install
-        run: make install
+        run: make install-tools
       - name: vet
         run: make vet
       # - name: Report Status

pkg/cmd/ls/ls.go

@@ -325,15 +325,6 @@ func (ls Ls) displayWorkspacesAndHelp(org *entity.Organization, otherOrgs []enti
 
 		displayLsResetBreadCrumb(ls.terminal, userWorkspaces)
 		// displayLsConnectBreadCrumb(ls.terminal, userWorkspaces)
-
-		// if !enableSSHCol {
-		// 	ls.terminal.Vprintf(ls.terminal.Green("Or ssh:\n"))
-		// 	for _, v := range userWorkspaces {
-		// 		if v.Status == entity.Running {
-		// 			ls.terminal.Vprintf(ls.terminal.Yellow("\tssh %s\n", v.GetLocalIdentifier()))
-		// 		}
-		// 	}
-		// }
 	}
 }
 
@@ -405,8 +396,6 @@ func displayProjects(t *terminal.Terminal, orgName string, projects []virtualpro
 	}
 }
 
-const enableSSHCol = false
-
 func getBrevTableOptions() table.Options {
 	options := table.OptionsDefault
 	options.DrawBorder = false
@@ -420,10 +409,7 @@ func displayWorkspacesTable(t *terminal.Terminal, workspaces []entity.Workspace,
 	ta := table.NewWriter()
 	ta.SetOutputMirror(os.Stdout)
 	ta.Style().Options = getBrevTableOptions()
-	header := table.Row{"Name", "Status", "ID", "Machine"}
-	if enableSSHCol {
-		header = table.Row{"Name", "Status", "SSH", "ID", "Machine"}
-	}
+	header := table.Row{"Name", "Status", "Build", "Shell", "ID", "Machine"}
 	ta.AppendHeader(header)
 	for _, w := range workspaces {
 		isShared := ""
@@ -432,15 +418,20 @@ func displayWorkspacesTable(t *terminal.Terminal, workspaces []entity.Workspace,
 		}
 		status := getWorkspaceDisplayStatus(w)
 		instanceString := utilities.GetInstanceString(w)
-		workspaceRow := []table.Row{{fmt.Sprintf("%s %s", w.Name, isShared), getStatusColoredText(t, status), w.ID, instanceString}}
-		if enableSSHCol {
-			workspaceRow = []table.Row{{w.Name, getStatusColoredText(t, status), w.GetLocalIdentifier(), w.ID, instanceString}}
-		}
+		workspaceRow := []table.Row{{fmt.Sprintf("%s %s", w.Name, isShared), getStatusColoredText(t, status), getStatusColoredText(t, string(w.VerbBuildStatus)), getStatusColoredText(t, getShellDisplayStatus(w)), w.ID, instanceString}}
 		ta.AppendRows(workspaceRow)
 	}
 	ta.Render()
 }
 
+func getShellDisplayStatus(w entity.Workspace) string {
+	status := entity.NotReady
+	if w.Status == entity.Running && w.VerbBuildStatus == entity.Completed {
+		status = entity.Ready
+	}
+	return status
+}
+
 func getWorkspaceDisplayStatus(w entity.Workspace) string {
 	status := w.Status
 	if w.Status == entity.Running && w.HealthStatus == entity.Unhealthy {
@@ -480,11 +471,11 @@ func displayProjectsTable(projects []virtualproject.VirtualProject) {
 
 func getStatusColoredText(t *terminal.Terminal, status string) string {
 	switch status {
-	case entity.Running:
+	case entity.Running, entity.Ready, string(entity.Completed):
 		return t.Green(status)
-	case entity.Starting, entity.Deploying, entity.Stopping:
+	case entity.Starting, entity.Deploying, entity.Stopping, string(entity.Building), string(entity.Pending):
 		return t.Yellow(status)
-	case entity.Failure, entity.Deleting, entity.Unhealthy:
+	case entity.Failure, entity.Deleting, entity.Unhealthy, string(entity.CreateFailed):
 		return t.Red(status)
 	default:
 		return status

pkg/entity/entity.go

@@ -259,6 +259,12 @@ const (
 	Unavailable = "UNAVAILABLE"
 )
 
+// Shell Status
+const (
+	NotReady = "NOT READY"
+	Ready    = "READY"
+)
+
 type WorkspaceGroup struct {
 	ID             string `json:"id"`
 	Name           string `json:"name"`