fix(BRE2-829): external nodes should not be part of ls by default (#327)

* fix(BRE2-829): external nodes should not be part of the ls command by default

* review feedback: don't print deviceId, fix tests

Author: patelspratik

pkg/cmd/ls/ls.go

@@ -58,10 +58,17 @@ func NewCmdLs(t *terminal.Terminal, loginLsStore LsStore, noLoginLsStore LsStore
 		Short:       "List instances within active org",
 		Long: `List instances within your active org. List all instances if no active org is set.
 
+Subcommands:
+  instances  List cloud instances
+  nodes      List external nodes only
+  orgs       List organizations
+
 When stdout is piped, outputs instance names only (one per line) for easy chaining
 with other commands like stop, start, or delete.`,
 		Example: `
   brev ls
+  brev ls instances
+  brev ls nodes
   brev ls --json
   brev ls | grep running | brev stop
   brev ls orgs
@@ -110,7 +117,7 @@ with other commands like stop, start, or delete.`,
 			return nil
 		},
 		Args:      cmderrors.TransformToValidationError(cobra.MinimumNArgs(0)),
-		ValidArgs: []string{"orgs", "workspaces", "nodes"},
+		ValidArgs: []string{"orgs", "workspaces", "nodes", "instances"},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := RunLs(t, loginLsStore, args, org, showAll, jsonOutput)
 			if err != nil {
@@ -243,6 +250,12 @@ func handleLsArg(ls *Ls, arg string, user *entity.User, org *entity.Organization
 			return breverrors.WrapAndTrace(err)
 		}
 		return nil
+	} else if util.IsSingularOrPlural(arg, "instance") {
+		err := ls.RunInstances(org, user, showAll)
+		if err != nil {
+			return breverrors.WrapAndTrace(err)
+		}
+		return nil
 	}
 	return nil
 }
@@ -480,9 +493,13 @@ func (ls Ls) RunWorkspaces(org *entity.Organization, user *entity.User, showAll
 		ls.ShowUserWorkspaces(org, orgs, user, allWorkspaces, gpuLookup)
 	}
 
-	// Also show external nodes in the default listing
-	ls.showNodesSection(org)
+	return nil
+}
 
+func (ls Ls) RunInstances(org *entity.Organization, user *entity.User, showAll bool) error {
+	if err := ls.RunWorkspaces(org, user, showAll); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -712,7 +729,6 @@ func getStatusColoredText(t *terminal.Terminal, status string) string {
 type NodeInfo struct {
 	Name           string `json:"name"`
 	ExternalNodeID string `json:"external_node_id"`
-	DeviceID       string `json:"device_id"`
 	OrgID          string `json:"org_id"`
 	Status         string `json:"status"`
 }
@@ -760,32 +776,12 @@ func (ls Ls) RunNodes(org *entity.Organization) error {
 	return nil
 }
 
-// showNodesSection appends external nodes to the default `brev ls` output.
-// Errors are silently ignored so that a ListNodes failure doesn't break the
-// workspace listing.
-func (ls Ls) showNodesSection(org *entity.Organization) {
-	nodes, err := ls.listNodes(org)
-	if err != nil || len(nodes) == 0 {
-		return
-	}
-
-	if ls.jsonOutput || ls.piped {
-		// JSON and piped modes are already handled per-section; skip here to
-		// avoid duplicating output when the user runs `brev ls nodes` explicitly.
-		return
-	}
-
-	ls.terminal.Vprintf("\nExternal Nodes (%d):\n", len(nodes))
-	displayNodesTable(ls.terminal, nodes)
-}
-
 func (ls Ls) outputNodesJSON(nodes []*nodev1.ExternalNode) error {
 	var infos []NodeInfo
 	for _, n := range nodes {
 		infos = append(infos, NodeInfo{
 			Name:           n.GetName(),
 			ExternalNodeID: n.GetExternalNodeId(),
-			DeviceID:       n.GetDeviceId(),
 			OrgID:          n.GetOrganizationId(),
 			Status:         nodeConnectionStatus(n),
 		})