feat(BRE2-756): brev shell external node support

Author: patelspratik

pkg/cmd/shell/shell.go

@@ -1,16 +1,23 @@
 package shell
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 	"time"
 
+	nodev1 "buf.build/gen/go/brevdev/devplane/protocolbuffers/go/devplaneapi/v1"
+	"connectrpc.com/connect"
+
 	"github.com/brevdev/brev-cli/pkg/analytics"
 	"github.com/brevdev/brev-cli/pkg/cmd/completions"
 	"github.com/brevdev/brev-cli/pkg/cmd/hello"
 	"github.com/brevdev/brev-cli/pkg/cmd/refresh"
+	"github.com/brevdev/brev-cli/pkg/cmd/register"
 	"github.com/brevdev/brev-cli/pkg/cmd/util"
+	"github.com/brevdev/brev-cli/pkg/config"
 	"github.com/brevdev/brev-cli/pkg/entity"
 	breverrors "github.com/brevdev/brev-cli/pkg/errors"
 	"github.com/brevdev/brev-cli/pkg/store"
@@ -44,6 +51,7 @@ type ShellStore interface {
 	refresh.RefreshStore
 	GetOrganizations(options *store.GetOrganizationsOptions) ([]entity.Organization, error)
 	GetWorkspaces(organizationID string, options *store.GetWorkspacesOptions) ([]entity.Workspace, error)
+	GetAccessToken() (string, error)
 }
 
 func NewCmdShell(t *terminal.Terminal, store ShellStore, noLoginStartStore ShellStore) *cobra.Command {
@@ -78,7 +86,12 @@ func runShellCommand(t *terminal.Terminal, sstore ShellStore, workspaceNameOrID
 	s := t.NewSpinner()
 	workspace, err := util.GetUserWorkspaceByNameOrIDErr(sstore, workspaceNameOrID)
 	if err != nil {
-		return breverrors.WrapAndTrace(err)
+		// Workspace not found — try external nodes.
+		node, nodeErr := findExternalNode(sstore, workspaceNameOrID)
+		if nodeErr != nil || node == nil {
+			return breverrors.WrapAndTrace(err) // return original workspace error
+		}
+		return shellIntoExternalNode(t, sstore, node)
 	}
 
 	if workspace.Status == "STOPPED" { // we start the env for the user
@@ -144,6 +157,87 @@ func runShellCommand(t *terminal.Terminal, sstore ShellStore, workspaceNameOrID
 	return nil
 }
 
+func findExternalNode(sstore ShellStore, name string) (*nodev1.ExternalNode, error) {
+	org, err := sstore.GetActiveOrganizationOrDefault()
+	if err != nil {
+		return nil, breverrors.WrapAndTrace(err)
+	}
+	client := register.NewNodeServiceClient(sstore, config.GlobalConfig.GetBrevPublicAPIURL())
+	resp, err := client.ListNodes(context.Background(), connect.NewRequest(&nodev1.ListNodesRequest{
+		OrganizationId: org.ID,
+	}))
+	if err != nil {
+		return nil, breverrors.WrapAndTrace(err)
+	}
+	for _, node := range resp.Msg.GetItems() {
+		if strings.EqualFold(node.GetName(), name) {
+			return node, nil
+		}
+	}
+	return nil, nil
+}
+
+func shellIntoExternalNode(t *terminal.Terminal, sstore ShellStore, node *nodev1.ExternalNode) error {
+	user, err := sstore.GetCurrentUser()
+	if err != nil {
+		return breverrors.WrapAndTrace(err)
+	}
+
+	var linuxUser string
+	for _, access := range node.GetSshAccess() {
+		if access.GetUserId() == user.ID {
+			linuxUser = access.GetLinuxUser()
+			break
+		}
+	}
+	if linuxUser == "" {
+		return breverrors.New(fmt.Sprintf("you don't have SSH access to node %q — try running: brev grant-ssh", node.GetName()))
+	}
+
+	var sshPort *nodev1.Port
+	for _, p := range node.GetPorts() {
+		if p.GetProtocol() == nodev1.PortProtocol_PORT_PROTOCOL_SSH {
+			sshPort = p
+			break
+		}
+	}
+	if sshPort == nil {
+		return breverrors.New(fmt.Sprintf("no SSH port configured for node %q", node.GetName()))
+	}
+
+	hostname := sshPort.GetHostname()
+	if hostname == "" {
+		return breverrors.New(fmt.Sprintf("SSH port has no hostname for node %q", node.GetName()))
+	}
+	port := sshPort.GetPortNumber()
+
+	target := fmt.Sprintf("%s@%s", linuxUser, hostname)
+	t.Vprintf("Connecting to external node %q as %s on port %d...\n", node.GetName(), linuxUser, port)
+
+	return runSSHWithPort(target, port)
+}
+
+func runSSHWithPort(target string, port int32) error {
+	sshAgentEval := "eval $(ssh-agent -s)"
+	cmd := fmt.Sprintf("%s && ssh -p %d %s", sshAgentEval, port, target)
+
+	sshCmd := exec.Command("bash", "-c", cmd) //nolint:gosec //cmd is constructed from API data
+	sshCmd.Stderr = os.Stderr
+	sshCmd.Stdout = os.Stdout
+	sshCmd.Stdin = os.Stdin
+
+	err := hello.SetHasRunShell(true)
+	if err != nil {
+		return breverrors.WrapAndTrace(err)
+	}
+
+	err = sshCmd.Run()
+	if err != nil {
+		return breverrors.WrapAndTrace(err)
+	}
+	return nil
+}
+
 func runSSH(sshAlias string) error {
 	sshAgentEval := "eval $(ssh-agent -s)"
 	cmd := fmt.Sprintf("%s && ssh %s", sshAgentEval, sshAlias)