Skip to content

feat(cli): use coder connect in coder ssh --stdio, if available #17572

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
merged 10 commits into from
Apr 30, 2025
Merged

feat(cli): use coder connect in coder ssh --stdio, if available #17572

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a862472
feat(cli): use coder connect in `coder ssh`, if available
ethanndickson Apr 28, 2025
d8e1c90
fix windows tests
ethanndickson Apr 28, 2025
578ebb0
rename flag, extra test
ethanndickson Apr 28, 2025
be118e6
reduce scope
ethanndickson Apr 29, 2025
bb75fa2
review
ethanndickson Apr 29, 2025
00f18af
typo
ethanndickson Apr 29, 2025
4ce57b7
fix tests
ethanndickson Apr 29, 2025
e46a084
fixup
ethanndickson Apr 30, 2025
76603ed
review
ethanndickson Apr 30, 2025
8c05023
fmt
ethanndickson Apr 30, 2025
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
Prev Previous commit
Next Next commit
review
  • Loading branch information
@ethanndickson
ethanndickson committed Apr 29, 2025
commit bb75fa27deedc26d326a9907be347338cfe3659b
11 changes: 10 additions & 1 deletion cli/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,14 +1504,23 @@ func runCoderConnectStdio(ctx context.Context, addr string, stdin io.Reader, std
return err
}

agentssh.Bicopy(ctx, conn, &cliutil.ReaderWriterConn{
agentssh.Bicopy(ctx, conn, &StdioRwc{
Reader: stdin,
Writer: stdout,
})

return nil
}

type StdioRwc struct {
io.Reader
io.Writer
}

func (*StdioRwc) Close() error {
return nil
}

func writeCoderConnectNetInfo(ctx context.Context, networkInfoDir string) error {
fs, ok := ctx.Value("fs").(afero.Fs)
if !ok {
Expand Down
3 changes: 1 addition & 2 deletions cli/ssh_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/quartz"

"github.com/coder/coder/v2/cli/cliutil"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/testutil"
)
Expand Down Expand Up @@ -258,7 +257,7 @@ func TestCoderConnectStdio(t *testing.T) {
close(stdioDone)
}()

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down
17 changes: 8 additions & 9 deletions cli/ssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import (
agentproto "github.com/coder/coder/v2/agent/proto"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/cli/cliui"
"github.com/coder/coder/v2/cli/cliutil"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbfake"
Expand Down Expand Up @@ -474,7 +473,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -543,7 +542,7 @@ func TestSSH(t *testing.T) {
signer, err := agentssh.CoderSigner(keySeed)
assert.NoError(t, err)

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -606,7 +605,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -774,7 +773,7 @@ func TestSSH(t *testing.T) {
// have access to the shell.
_ = agenttest.New(t, client.URL, authToken)

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: proxyCommandStdoutR,
Writer: clientStdinW,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -836,7 +835,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -895,7 +894,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -1083,7 +1082,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down Expand Up @@ -1742,7 +1741,7 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

conn, channels, requests, err := ssh.NewClientConn(&cliutil.ReaderWriterConn{
conn, channels, requests, err := ssh.NewClientConn(&testutil.ReaderWriterConn{
Reader: serverOutput,
Writer: clientInput,
}, "", &ssh.ClientConfig{
Expand Down
2 changes: 1 addition & 1 deletion cli/cliutil/stdioconn.go → testutil/rwconn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cliutil
package testutil

import (
"io"
Expand Down