Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion cmd/machine/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ func StartSSHSession(ctx context.Context, options StartSSHSessionOptions) error
TransportSide: transport.SideProvider,
Metadata: transport.LogMetadata{Mode: "machine", TransportImpl: "callback"},
Handler: func(ctx context.Context) error {
sshClient, err := devssh.ClientFromConn(conn, options.User, nil)
sshClient, err := devssh.ClientFromManagedConn(ctx, conn, devssh.ManagedClientOptions{
User: options.User,
})
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion cmd/workspace/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,9 @@ func (cmd *SSHCmd) startProxyTunnel(
Workspace: client.Workspace(), TransportImpl: "callback",
},
Handler: func(ctx context.Context) error {
containerClient, err := devssh.ClientFromConn(conn, cmd.User, nil)
containerClient, err := devssh.ClientFromManagedConn(
ctx, conn, devssh.ManagedClientOptions{User: cmd.User},
)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ type ProxyClient interface {
// Ssh starts an ssh tunnel to the workspace container
Ssh(ctx context.Context, options SshOptions) error

// OpenSSHTransport starts an SSH transport whose stdin/stdout carry the
// persistent SSH protocol.
// OpenSSHTransport starts a managed SSH transport whose peer may still be
// bootstrapping when the connection is returned. Use the managed SSH dialer.
OpenSSHTransport(
ctx context.Context,
options SSHTransportOptions,
Expand Down
2 changes: 1 addition & 1 deletion pkg/devcontainer/sshtunnel/sshtunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func runSSHTunnel(ctx context.Context, p sshTunnelParams) (*config2.Result, erro
defer func() { log.Debugf("tunnel: setup complete elapsed=%s", time.Since(start)) }()

log.Debug("creating SSH client")
sshClient, err := devssh.ClientFromConn(p.conn, "", nil)
sshClient, err := devssh.ClientFromManagedConn(ctx, p.conn, devssh.ManagedClientOptions{})
if err != nil {
return nil, fmt.Errorf("failed to create SSH client: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/ssh/helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func TestClientFromConn_SuccessfulHandshake(t *testing.T) {
clientEnd, err := net.Dial("tcp", listener.Addr().String())
require.NoError(t, err)
conn := &deadlineRecorder{Conn: clientEnd}
client, err := clientFromConn(conn, "test", nil, 5*time.Second)
client, err := ClientFromConn(conn, "test", nil)

require.NoError(t, err)
require.NotNil(t, client)
Expand Down
Loading
Loading