More lint fixes

coder · bryphe-coder · Feb 15, 2022 · Feb 11, 2022 · Feb 11, 2022 · Feb 11, 2022
commit b949301b99c971d13e7a8a1d814aead83365dc44
diff --git a/expect/console.go b/expect/console.go
@@ -46,17 +46,17 @@ type ConsoleOpts struct {
 	Logger          *log.Logger
 	Stdouts         []io.Writer
 	Closers         []io.Closer
-	ExpectObservers []ExpectObserver
+	ExpectObservers []Observer
 	SendObservers   []SendObserver
 }
 
-// ExpectObserver provides an interface for a function callback that will
+// Observer provides an interface for a function callback that will
 // be called after each Expect operation.
 // matchers will be the list of active matchers when an error occurred,
 //   or a list of matchers that matched `buf` when err is nil.
 // buf is the captured output that was matched against.
 // err is error that might have occurred. May be nil.
-type ExpectObserver func(matchers []Matcher, buf string, err error)
+type Observer func(matchers []Matcher, buf string, err error)
 
 // SendObserver provides an interface for a function callback that will
 // be called after each Send operation.
@@ -97,7 +97,7 @@ func WithLogger(logger *log.Logger) ConsoleOpt {
 }
 
 // WithExpectObserver adds an ExpectObserver to allow monitoring Expect operations.
-func WithExpectObserver(observers ...ExpectObserver) ConsoleOpt {
+func WithExpectObserver(observers ...Observer) ConsoleOpt {
 	return func(opts *ConsoleOpts) error {
 		opts.ExpectObservers = append(opts.ExpectObservers, observers...)
 		return nil
@@ -124,12 +124,12 @@ func NewConsole(opts ...ConsoleOpt) (*Console, error) {
 		}
 	}
 
-	pty, err := pty.New()
+	consolePty, err := pty.New()
 	if err != nil {
 		return nil, err
 	}
-	closers := append(options.Closers, pty)
-	reader := pty.Reader()
+	closers := append(options.Closers, consolePty)
+	reader := consolePty.Reader()
 
 	passthroughPipe, err := NewPassthroughPipe(reader)
 	if err != nil {
@@ -139,7 +139,7 @@ func NewConsole(opts ...ConsoleOpt) (*Console, error) {
 
 	console := &Console{
 		opts:            options,
-		pty:             pty,
+		pty:             consolePty,
 		passthroughPipe: passthroughPipe,
 		runeReader:      bufio.NewReaderSize(passthroughPipe, utf8.UTFMax),
 		closers:         closers,

diff --git a/expect/expect.go b/expect/expect.go
@@ -46,8 +46,8 @@ func (c *Console) ExpectEOF() (string, error) {
 // expecting input yet, it will be blocked. Sends are queued up in tty's
 // internal buffer so that the next Expect will read the remaining bytes (i.e.
 // rest of prompt) as well as its conditions.
-func (c *Console) Expect(opts ...ExpectOpt) (string, error) {
-	var options ExpectOpts
+func (c *Console) Expect(opts ...Opt) (string, error) {
+	var options Opts
 	for _, opt := range opts {
 		if err := opt(&options); err != nil {
 			return "", err

diff --git a/expect/expect_opt.go b/expect/expect_opt.go
@@ -24,18 +24,18 @@ import (
 	"time"
 )
 
-// ExpectOpt allows settings Expect options.
-type ExpectOpt func(*ExpectOpts) error
+// Opt allows settings Expect options.
+type Opt func(*Opts) error
 
 // ConsoleCallback is a callback function to execute if a match is found for
 // the chained matcher.
 type ConsoleCallback func(buf *bytes.Buffer) error
 
 // Then returns an Expect condition to execute a callback if a match is found
 // for the chained matcher.
-func (eo ExpectOpt) Then(consoleCallback ConsoleCallback) ExpectOpt {
-	return func(opts *ExpectOpts) error {
-		var options ExpectOpts
+func (eo Opt) Then(consoleCallback ConsoleCallback) Opt {
+	return func(opts *Opts) error {
+		var options Opts
 		err := eo(&options)
 		if err != nil {
 			return err
@@ -51,15 +51,15 @@ func (eo ExpectOpt) Then(consoleCallback ConsoleCallback) ExpectOpt {
 	}
 }
 
-// ExpectOpts provides additional options on Expect.
-type ExpectOpts struct {
+// Opts provides additional options on Expect.
+type Opts struct {
 	Matchers    []Matcher
 	ReadTimeout *time.Duration
 }
 
 // Match sequentially calls Match on all matchers in ExpectOpts and returns the
 // first matcher if a match exists, otherwise nil.
-func (eo ExpectOpts) Match(v interface{}) Matcher {
+func (eo Opts) Match(v interface{}) Matcher {
 	for _, matcher := range eo.Matchers {
 		if matcher.Match(v) {
 			return matcher
@@ -189,7 +189,7 @@ func (rm *regexpMatcher) Criteria() interface{} {
 // allMatcher fulfills the Matcher interface to match a group of ExpectOpt
 // against any value.
 type allMatcher struct {
-	options ExpectOpts
+	options Opts
 }
 
 func (am *allMatcher) Match(v interface{}) bool {
@@ -215,9 +215,9 @@ func (am *allMatcher) Criteria() interface{} {
 
 // All adds an Expect condition to exit if the content read from Console's tty
 // matches all of the provided ExpectOpt, in any order.
-func All(expectOpts ...ExpectOpt) ExpectOpt {
-	return func(opts *ExpectOpts) error {
-		var options ExpectOpts
+func All(expectOpts ...Opt) Opt {
+	return func(opts *Opts) error {
+		var options Opts
 		for _, opt := range expectOpts {
 			if err := opt(&options); err != nil {
 				return err
@@ -233,8 +233,8 @@ func All(expectOpts ...ExpectOpt) ExpectOpt {
 
 // String adds an Expect condition to exit if the content read from Console's
 // tty contains any of the given strings.
-func String(strs ...string) ExpectOpt {
-	return func(opts *ExpectOpts) error {
+func String(strs ...string) Opt {
+	return func(opts *Opts) error {
 		for _, str := range strs {
 			opts.Matchers = append(opts.Matchers, &stringMatcher{
 				str: str,
@@ -246,8 +246,8 @@ func String(strs ...string) ExpectOpt {
 
 // Regexp adds an Expect condition to exit if the content read from Console's
 // tty matches the given Regexp.
-func Regexp(res ...*regexp.Regexp) ExpectOpt {
-	return func(opts *ExpectOpts) error {
+func Regexp(res ...*regexp.Regexp) Opt {
+	return func(opts *Opts) error {
 		for _, re := range res {
 			opts.Matchers = append(opts.Matchers, &regexpMatcher{
 				re: re,
@@ -260,8 +260,8 @@ func Regexp(res ...*regexp.Regexp) ExpectOpt {
 // RegexpPattern adds an Expect condition to exit if the content read from
 // Console's tty matches the given Regexp patterns. Expect returns an error if
 // the patterns were unsuccessful in compiling the Regexp.
-func RegexpPattern(ps ...string) ExpectOpt {
-	return func(opts *ExpectOpts) error {
+func RegexpPattern(ps ...string) Opt {
+	return func(opts *Opts) error {
 		var res []*regexp.Regexp
 		for _, p := range ps {
 			re, err := regexp.Compile(p)
@@ -276,8 +276,8 @@ func RegexpPattern(ps ...string) ExpectOpt {
 
 // Error adds an Expect condition to exit if reading from Console's tty returns
 // one of the provided errors.
-func Error(errs ...error) ExpectOpt {
-	return func(opts *ExpectOpts) error {
+func Error(errs ...error) Opt {
+	return func(opts *Opts) error {
 		for _, err := range errs {
 			opts.Matchers = append(opts.Matchers, &errorMatcher{
 				err: err,
@@ -289,7 +289,7 @@ func Error(errs ...error) ExpectOpt {
 
 // EOF adds an Expect condition to exit if io.EOF is returned from reading
 // Console's tty.
-func EOF(opts *ExpectOpts) error {
+func EOF(opts *Opts) error {
 	return Error(io.EOF)(opts)
 }
 
@@ -298,7 +298,7 @@ func EOF(opts *ExpectOpts) error {
 // on Linux while reading from the ptm after the pts is closed.
 // Further Reading:
 // https://github.com/kr/pty/issues/21#issuecomment-129381749
-func PTSClosed(opts *ExpectOpts) error {
+func PTSClosed(opts *Opts) error {
 	opts.Matchers = append(opts.Matchers, &pathErrorMatcher{
 		pathError: os.PathError{
 			Op:   "read",

diff --git a/expect/expect_opt_test.go b/expect/expect_opt_test.go
@@ -27,9 +27,11 @@ import (
 )
 
 func TestExpectOptString(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     string
 		expected bool
 	}{
@@ -60,8 +62,11 @@ func TestExpectOptString(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)
 
@@ -80,9 +85,11 @@ func TestExpectOptString(t *testing.T) {
 }
 
 func TestExpectOptRegexp(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     string
 		expected bool
 	}{
@@ -113,8 +120,11 @@ func TestExpectOptRegexp(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)
 
@@ -133,9 +143,11 @@ func TestExpectOptRegexp(t *testing.T) {
 }
 
 func TestExpectOptRegexpPattern(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     string
 		expected bool
 	}{
@@ -166,8 +178,11 @@ func TestExpectOptRegexpPattern(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)
 
@@ -186,9 +201,11 @@ func TestExpectOptRegexpPattern(t *testing.T) {
 }
 
 func TestExpectOptError(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     error
 		expected bool
 	}{
@@ -219,8 +236,11 @@ func TestExpectOptError(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)
 
@@ -235,14 +255,16 @@ func TestExpectOptError(t *testing.T) {
 }
 
 func TestExpectOptThen(t *testing.T) {
+	t.Parallel()
+
 	var (
 		errFirst  = errors.New("first")
 		errSecond = errors.New("second")
 	)
 
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     string
 		match    bool
 		expected error
@@ -290,8 +312,11 @@ func TestExpectOptThen(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)
 
@@ -318,9 +343,11 @@ func TestExpectOptThen(t *testing.T) {
 }
 
 func TestExpectOptAll(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		title    string
-		opt      ExpectOpt
+		opt      Opt
 		data     string
 		expected bool
 	}{
@@ -387,8 +414,10 @@ func TestExpectOptAll(t *testing.T) {
 	}
 
 	for _, test := range tests {
+		test := test
 		t.Run(test.title, func(t *testing.T) {
-			var options ExpectOpts
+			t.Parallel()
+			var options Opts
 			err := test.opt(&options)
 			require.Nil(t, err)