Fix windows types

spikecurtis · spikecurtis · commit 50060d83556e · 2023-04-24T08:46:23.000Z
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -22,7 +22,7 @@ var (
 )
 
 // See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session
-func newPty(opt ...Option) (PTY, error) {
+func newPty(opt ...Option) (*ptyWindows, error) {
 	var opts ptyOptions
 	for _, o := range opt {
 		o(&opts)
diff --git a/pty/start_windows.go b/pty/start_windows.go
@@ -17,7 +17,7 @@ import (
 
 // Allocates a PTY and starts the specified command attached to it.
 // See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session#creating-the-hosted-process
-func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error) {
+func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTYCmd, _ Process, retErr error) {
 	var opts startOptions
 	for _, o := range opt {
 		o(&opts)
@@ -46,18 +46,17 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error
 		return nil, nil, err
 	}
 
-	pty, err := newPty(opts.ptyOpts...)
+	winPty, err := newPty(opts.ptyOpts...)
 	if err != nil {
 		return nil, nil, err
 	}
 	defer func() {
 		if retErr != nil {
 			// we hit some error finishing setup; close pty, so
 			// we don't leak the kernel resources associated with it
-			_ = pty.Close()
+			_ = winPty.Close()
 		}
 	}()
-	winPty := pty.(*ptyWindows)
 	if winPty.opts.sshReq != nil {
 		cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_TTY=%s", winPty.Name()))
 	}
@@ -130,7 +129,7 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error
 		return nil, nil, errI
 	}
 	go wp.waitInternal()
-	return pty, wp, nil
+	return winPty, wp, nil
 }
 
 // Taken from: https://github.com/microsoft/hcsshim/blob/7fbdca16f91de8792371ba22b7305bf4ca84170a/internal/exec/exec.go#L476

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ var (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session`
`25`		`-func newPty(opt ...Option) (PTY, error) {`
	`25`	`+func newPty(opt ...Option) (*ptyWindows, error) {`
`26`	`26`	`var opts ptyOptions`
`27`	`27`	`for _, o := range opt {`
`28`	`28`	`o(&opts)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`
`18`	`18`	`// Allocates a PTY and starts the specified command attached to it.`
`19`	`19`	`// See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session#creating-the-hosted-process`
`20`		`-func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error) {`
	`20`	`+func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTYCmd, _ Process, retErr error) {`
`21`	`21`	`var opts startOptions`
`22`	`22`	`for _, o := range opt {`
`23`	`23`	`o(&opts)`
`@@ -46,18 +46,17 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error`
`46`	`46`	`return nil, nil, err`
`47`	`47`	`}`
`48`	`48`
`49`		`- pty, err := newPty(opts.ptyOpts...)`
	`49`	`+ winPty, err := newPty(opts.ptyOpts...)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return nil, nil, err`
`52`	`52`	`}`
`53`	`53`	`defer func() {`
`54`	`54`	`if retErr != nil {`
`55`	`55`	`// we hit some error finishing setup; close pty, so`
`56`	`56`	`// we don't leak the kernel resources associated with it`
`57`		`- _ = pty.Close()`
	`57`	`+ _ = winPty.Close()`
`58`	`58`	`}`
`59`	`59`	`}()`
`60`		`- winPty := pty.(*ptyWindows)`
`61`	`60`	`if winPty.opts.sshReq != nil {`
`62`	`61`	`cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_TTY=%s", winPty.Name()))`
`63`	`62`	`}`
`@@ -130,7 +129,7 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error`
`130`	`129`	`return nil, nil, errI`
`131`	`130`	`}`
`132`	`131`	`go wp.waitInternal()`
`133`		`- return pty, wp, nil`
	`132`	`+ return winPty, wp, nil`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`// Taken from: https://github.com/microsoft/hcsshim/blob/7fbdca16f91de8792371ba22b7305bf4ca84170a/internal/exec/exec.go#L476`