Remaining lint fixes

bryphe-coder · bryphe-coder · commit 8d7d782460cf · 2022-02-12T04:36:54.000Z
diff --git a/expect/expect_opt.go b/expect/expect_opt.go
@@ -16,6 +16,7 @@ package expect
 
 import (
 	"bytes"
+	"errors"
 	"io"
 	"os"
 	"regexp"
@@ -123,7 +124,7 @@ func (em *errorMatcher) Match(v interface{}) bool {
 	if !ok {
 		return false
 	}
-	return err == em.err
+	return errors.Is(err, em.err)
 }
 
 func (em *errorMatcher) Criteria() interface{} {
diff --git a/expect/expect_opt_test.go b/expect/expect_opt_test.go
@@ -16,12 +16,12 @@ package expect_test
 
 import (
 	"bytes"
-	"errors"
 	"io"
 	"regexp"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"golang.org/x/xerrors"
 
 	. "github.com/coder/coder/expect"
 )
@@ -258,8 +258,8 @@ func TestExpectOptThen(t *testing.T) {
 	t.Parallel()
 
 	var (
-		errFirst  = errors.New("first")
-		errSecond = errors.New("second")
+		errFirst  = xerrors.New("first")
+		errSecond = xerrors.New("second")
 	)
 
 	tests := []struct {
diff --git a/expect/expect_test.go b/expect/expect_test.go
@@ -49,8 +49,7 @@ func Prompt(in io.Reader, out io.Writer) error {
 			"What is Netflix backwards?", "xilfteN",
 		},
 	} {
-
-		_, err := fmt.Fprint(out, fmt.Sprintf("%s: ", survey.Prompt))
+		_, err := fmt.Fprintf(out, "%s: ", survey.Prompt)
 		if err != nil {
 			return err
 		}
diff --git a/expect/passthrough_pipe.go b/expect/passthrough_pipe.go
@@ -53,7 +53,6 @@ func NewPassthroughPipe(reader io.Reader) (*PassthroughPipe, error) {
 			// If we are unable to close the pipe, and the pipe isn't already closed,
 			// the caller will hang indefinitely.
 			panic(err)
-			return
 		}
 
 		// When an error is read from reader, we need it to passthrough the err to
@@ -91,11 +90,11 @@ func (pp *PassthroughPipe) Close() error {
 	return pp.reader.Close()
 }
 
-func (pp *PassthroughPipe) SetReadDeadline(t time.Time) error {
+func (pp *PassthroughPipe) SetReadDeadline(deadline time.Time) error {
 	// TODO(Bryan): Is there a way to set read deadlines on Windows?
 	if runtime.GOOS == "windows" {
 		return nil
-	} else {
-		return pp.reader.SetReadDeadline(t)
 	}
+
+	return pp.reader.SetReadDeadline(deadline)
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ package expect`
`16`	`16`
`17`	`17`	`import (`
`18`	`18`	`"bytes"`
	`19`	`+ "errors"`
`19`	`20`	`"io"`
`20`	`21`	`"os"`
`21`	`22`	`"regexp"`
`@@ -123,7 +124,7 @@ func (em *errorMatcher) Match(v interface{}) bool {`
`123`	`124`	`if !ok {`
`124`	`125`	`return false`
`125`	`126`	`}`
`126`		`- return err == em.err`
	`127`	`+ return errors.Is(err, em.err)`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`func (em *errorMatcher) Criteria() interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ func NewPassthroughPipe(reader io.Reader) (*PassthroughPipe, error) {`
`53`	`53`	`// If we are unable to close the pipe, and the pipe isn't already closed,`
`54`	`54`	`// the caller will hang indefinitely.`
`55`	`55`	`panic(err)`
`56`		`- return`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`// When an error is read from reader, we need it to passthrough the err to`
`@@ -91,11 +90,11 @@ func (pp *PassthroughPipe) Close() error {`
`91`	`90`	`return pp.reader.Close()`
`92`	`91`	`}`
`93`	`92`
`94`		`-func (pp *PassthroughPipe) SetReadDeadline(t time.Time) error {`
	`93`	`+func (pp *PassthroughPipe) SetReadDeadline(deadline time.Time) error {`
`95`	`94`	`// TODO(Bryan): Is there a way to set read deadlines on Windows?`
`96`	`95`	`if runtime.GOOS == "windows" {`
`97`	`96`	`return nil`
`98`		`- } else {`
`99`		`- return pp.reader.SetReadDeadline(t)`
`100`	`97`	`}`
	`98`	`+`
	`99`	`+ return pp.reader.SetReadDeadline(deadline)`
`101`	`100`	`}`