Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: Add support for executing processes with Windows ConPty #311

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 22 commits into from
Feb 17, 2022
Merged

feat: Add support for executing processes with Windows ConPty #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
54133fc
Initial agent
kylecarbs Feb 15, 2022
4da9c89
fix: Use buffered reader in peer to fix ShortBuffer
kylecarbs Feb 16, 2022
fbb02ec
Merge branch 'buffered' into agent
kylecarbs Feb 16, 2022
af5e3c2
SSH server works!
kylecarbs Feb 16, 2022
f8a733c
Start Windows support
kylecarbs Feb 16, 2022
72b6b09
Something works
kylecarbs Feb 17, 2022
722be6c
Refactor pty package to support Windows spawn
kylecarbs Feb 17, 2022
12ffaff
SSH server now works on Windows
kylecarbs Feb 17, 2022
e9381fa
Fix non-Windows
kylecarbs Feb 17, 2022
9a6a53d
Merge branch 'main' into agent
kylecarbs Feb 17, 2022
db73933
Fix Linux PTY render
kylecarbs Feb 17, 2022
d00bc29
FIx linux build tests
kylecarbs Feb 17, 2022
3121e10
Remove agent and wintest
kylecarbs Feb 17, 2022
cbbae07
Add test for Windows resize
kylecarbs Feb 17, 2022
91ea40a
Fix linting errors
kylecarbs Feb 17, 2022
3187b70
Add Windows environment variables
kylecarbs Feb 17, 2022
60bd0a4
Add strings import
kylecarbs Feb 17, 2022
80b443b
Add comment for attrs
kylecarbs Feb 17, 2022
57ef616
Merge branch 'pty' of github.com:coder/coder into pty
kylecarbs Feb 17, 2022
21a8efe
Add goleak
kylecarbs Feb 17, 2022
9edc014
Add require import
kylecarbs Feb 17, 2022
e2d1f95
Merge branch 'main' into pty
kylecarbs Feb 17, 2022
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: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"drpcserver",
"fatih",
"goleak",
"gossh",
"hashicorp",
"httpmw",
"isatty",
Expand All @@ -51,9 +52,12 @@
"protobuf",
"provisionerd",
"provisionersdk",
"ptty",
"ptytest",
"retrier",
"sdkproto",
"stretchr",
"tcpip",
"tfexec",
"tfstate",
"unconvert",
Expand Down
9 changes: 5 additions & 4 deletions cli/clitest/clitest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/console"
"github.com/coder/coder/pty/ptytest"
)

func TestMain(m *testing.M) {
Expand All @@ -21,11 +21,12 @@ func TestCli(t *testing.T) {
client := coderdtest.New(t)
cmd, config := clitest.New(t)
clitest.SetupConfig(t, client, config)
cons := console.New(t, cmd)
pty := ptytest.New(t)
cmd.SetIn(pty.Input())
cmd.SetOut(pty.Output())
go func() {
err := cmd.Execute()
require.NoError(t, err)
}()
_, err := cons.ExpectString("coder")
require.NoError(t, err)
pty.ExpectMatch("coder")
}
18 changes: 9 additions & 9 deletions cli/login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package cli_test
import (
"testing"

"github.com/stretchr/testify/require"

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/console"
"github.com/stretchr/testify/require"
"github.com/coder/coder/pty/ptytest"
)

func TestLogin(t *testing.T) {
Expand All @@ -26,7 +27,9 @@ func TestLogin(t *testing.T) {
// accurately detect Windows ptys when they are not attached to a process:
// https://github.com/mattn/go-isatty/issues/59
root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty")
cons := console.New(t, root)
pty := ptytest.New(t)
root.SetIn(pty.Input())
root.SetOut(pty.Output())
go func() {
err := root.Execute()
require.NoError(t, err)
Expand All @@ -42,12 +45,9 @@ func TestLogin(t *testing.T) {
for i := 0; i < len(matches); i += 2 {
match := matches[i]
value := matches[i+1]
_, err := cons.ExpectString(match)
require.NoError(t, err)
_, err = cons.SendLine(value)
require.NoError(t, err)
pty.ExpectMatch(match)
pty.WriteLine(value)
}
_, err := cons.ExpectString("Welcome to Coder")
require.NoError(t, err)
pty.ExpectMatch("Welcome to Coder")
})
}
22 changes: 11 additions & 11 deletions cli/projectcreate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/console"
"github.com/coder/coder/database"
"github.com/coder/coder/provisioner/echo"
"github.com/coder/coder/provisionersdk/proto"
"github.com/coder/coder/pty/ptytest"
)

func TestProjectCreate(t *testing.T) {
Expand All @@ -26,7 +26,9 @@ func TestProjectCreate(t *testing.T) {
cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho))
clitest.SetupConfig(t, client, root)
_ = coderdtest.NewProvisionerDaemon(t, client)
console := console.New(t, cmd)
pty := ptytest.New(t)
cmd.SetIn(pty.Input())
cmd.SetOut(pty.Output())
closeChan := make(chan struct{})
go func() {
err := cmd.Execute()
Expand All @@ -43,10 +45,8 @@ func TestProjectCreate(t *testing.T) {
for i := 0; i < len(matches); i += 2 {
match := matches[i]
value := matches[i+1]
_, err := console.ExpectString(match)
require.NoError(t, err)
_, err = console.SendLine(value)
require.NoError(t, err)
pty.ExpectMatch(match)
pty.WriteLine(value)
}
<-closeChan
})
Expand All @@ -73,7 +73,9 @@ func TestProjectCreate(t *testing.T) {
cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho))
clitest.SetupConfig(t, client, root)
coderdtest.NewProvisionerDaemon(t, client)
cons := console.New(t, cmd)
pty := ptytest.New(t)
cmd.SetIn(pty.Input())
cmd.SetOut(pty.Output())
closeChan := make(chan struct{})
go func() {
err := cmd.Execute()
Expand All @@ -91,10 +93,8 @@ func TestProjectCreate(t *testing.T) {
for i := 0; i < len(matches); i += 2 {
match := matches[i]
value := matches[i+1]
_, err := cons.ExpectString(match)
require.NoError(t, err)
_, err = cons.SendLine(value)
require.NoError(t, err)
pty.ExpectMatch(match)
pty.WriteLine(value)
}
<-closeChan
})
Expand Down
19 changes: 10 additions & 9 deletions cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/manifoldco/promptui"
"github.com/mattn/go-isatty"
"github.com/spf13/cobra"
"golang.org/x/xerrors"

"github.com/coder/coder/cli/config"
"github.com/coder/coder/coderd"
Expand Down Expand Up @@ -138,14 +137,9 @@ func isTTY(cmd *cobra.Command) bool {
}

func prompt(cmd *cobra.Command, prompt *promptui.Prompt) (string, error) {
var ok bool
prompt.Stdin, ok = cmd.InOrStdin().(io.ReadCloser)
if !ok {
return "", xerrors.New("stdin must be a readcloser")
}
prompt.Stdout, ok = cmd.OutOrStdout().(io.WriteCloser)
if !ok {
return "", xerrors.New("stdout must be a readcloser")
prompt.Stdin = io.NopCloser(cmd.InOrStdin())
prompt.Stdout = readWriteCloser{
Writer: cmd.OutOrStdout(),
}

// The prompt library displays defaults in a jarring way for the user
Expand Down Expand Up @@ -199,3 +193,10 @@ func prompt(cmd *cobra.Command, prompt *promptui.Prompt) (string, error) {

return value, err
}

// readWriteCloser fakes reads, writes, and closing!
type readWriteCloser struct {
io.Reader
io.Writer
io.Closer
}
18 changes: 9 additions & 9 deletions cli/workspacecreate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package cli_test
import (
"testing"

"github.com/stretchr/testify/require"

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/console"
"github.com/coder/coder/provisioner/echo"
"github.com/coder/coder/provisionersdk/proto"
"github.com/stretchr/testify/require"
"github.com/coder/coder/pty/ptytest"
)

func TestWorkspaceCreate(t *testing.T) {
Expand Down Expand Up @@ -36,7 +37,9 @@ func TestWorkspaceCreate(t *testing.T) {
cmd, root := clitest.New(t, "workspaces", "create", project.Name)
clitest.SetupConfig(t, client, root)

cons := console.New(t, cmd)
pty := ptytest.New(t)
cmd.SetIn(pty.Input())
cmd.SetOut(pty.Output())
closeChan := make(chan struct{})
go func() {
err := cmd.Execute()
Expand All @@ -51,13 +54,10 @@ func TestWorkspaceCreate(t *testing.T) {
for i := 0; i < len(matches); i += 2 {
match := matches[i]
value := matches[i+1]
_, err := cons.ExpectString(match)
require.NoError(t, err)
_, err = cons.SendLine(value)
require.NoError(t, err)
pty.ExpectMatch(match)
pty.WriteLine(value)
}
_, err := cons.ExpectString("Create")
require.NoError(t, err)
pty.ExpectMatch("Create")
<-closeChan
})
}
3 changes: 2 additions & 1 deletion coderd/projectimport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import (
"net/http"
"testing"

"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/database"
"github.com/coder/coder/provisioner/echo"
"github.com/coder/coder/provisionersdk/proto"
"github.com/stretchr/testify/require"
)

func TestPostProjectImportByOrganization(t *testing.T) {
Expand Down
5 changes: 3 additions & 2 deletions codersdk/projectimport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import (
"testing"
"time"

"github.com/google/uuid"
"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/provisioner/echo"
"github.com/coder/coder/provisionersdk/proto"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
)

func TestCreateProjectImportJob(t *testing.T) {
Expand Down
107 changes: 0 additions & 107 deletions console/conpty/conpty.go
View file
Open in desktop

This file was deleted.

Loading