Skip to content

feat: add a --new option to ssh command #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oneirocosm merged 1 commit into from
Feb 11, 2025
Merged

feat: add a --new option to ssh command #1946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions cmd/wsh/cmd/wshcmd-ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import (
"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
)

var identityFiles []string
var (
identityFiles []string
newBlock bool
)

var sshCmd = &cobra.Command{
Use: "ssh",
Expand All @@ -25,6 +28,7 @@ var sshCmd = &cobra.Command{

func init() {
sshCmd.Flags().StringArrayVarP(&identityFiles, "identityfile", "i", []string{}, "add an identity file for publickey authentication")
sshCmd.Flags().BoolVarP(&newBlock, "new", "n", false, "create a new terminal block with this connection")
rootCmd.AddCommand(sshCmd)
}

Expand All @@ -35,10 +39,11 @@ func sshRun(cmd *cobra.Command, args []string) (rtnErr error) {

sshArg := args[0]
blockId := RpcContext.BlockId
if blockId == "" {
if blockId == "" && !newBlock {
return fmt.Errorf("cannot determine blockid (not in JWT)")
}
// first, make a connection independent of the block

// Create connection request
connOpts := wshrpc.ConnRequest{
Host: sshArg,
LogBlockId: blockId,
Expand All @@ -48,7 +53,30 @@ func sshRun(cmd *cobra.Command, args []string) (rtnErr error) {
}
wshclient.ConnConnectCommand(RpcClient, connOpts, &wshrpc.RpcOpts{Timeout: 60000})

// now, with that made, it will be straightforward to connect
if newBlock {
// Create a new block with the SSH connection
createMeta := map[string]any{
waveobj.MetaKey_View: "term",
waveobj.MetaKey_Controller: "shell",
waveobj.MetaKey_Connection: sshArg,
}
if RpcContext.Conn != "" {
createMeta[waveobj.MetaKey_Connection] = RpcContext.Conn
}
createBlockData := wshrpc.CommandCreateBlockData{
BlockDef: &waveobj.BlockDef{
Meta: createMeta,
},
}
oref, err := wshclient.CreateBlockCommand(RpcClient, createBlockData, nil)
if err != nil {
return fmt.Errorf("creating new terminal block: %w", err)
}
WriteStdout("new terminal block created with connection to %q: %s\n", sshArg, oref)
return nil
}

// Update existing block with the new connection
data := wshrpc.CommandSetMetaData{
ORef: waveobj.MakeORef(waveobj.OType_Block, blockId),
Meta: map[string]any{
Expand Down
Loading