Rename console -> cons to avoid shadowing

bryphe-coder · bryphe-coder · commit 3604bef031ba · 2022-02-16T00:41:01.000Z
diff --git a/cli/clitest/clitest_test.go b/cli/clitest/clitest_test.go
@@ -21,11 +21,11 @@ func TestCli(t *testing.T) {
 	client := coderdtest.New(t)
 	cmd, config := clitest.New(t)
 	clitest.SetupConfig(t, client, config)
-	testConsole := console.New(t, cmd)
+	cons := console.New(t, cmd)
 	go func() {
 		err := cmd.Execute()
 		require.NoError(t, err)
 	}()
-	_, err := testConsole.ExpectString("coder")
+	_, err := cons.ExpectString("coder")
 	require.NoError(t, err)
 }
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -26,7 +26,7 @@ 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")
-		console := console.New(t, root)
+		cons := console.New(t, root)
 		go func() {
 			err := root.Execute()
 			require.NoError(t, err)
@@ -42,12 +42,12 @@ func TestLogin(t *testing.T) {
 		for i := 0; i < len(matches); i += 2 {
 			match := matches[i]
 			value := matches[i+1]
-			_, err := console.ExpectString(match)
+			_, err := cons.ExpectString(match)
 			require.NoError(t, err)
-			_, err = console.SendLine(value)
+			_, err = cons.SendLine(value)
 			require.NoError(t, err)
 		}
-		_, err := console.ExpectString("Welcome to Coder")
+		_, err := cons.ExpectString("Welcome to Coder")
 		require.NoError(t, err)
 	})
 }
diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go
@@ -73,7 +73,7 @@ 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)
+		cons := console.New(t, cmd)
 		closeChan := make(chan struct{})
 		go func() {
 			err := cmd.Execute()
@@ -91,9 +91,9 @@ func TestProjectCreate(t *testing.T) {
 		for i := 0; i < len(matches); i += 2 {
 			match := matches[i]
 			value := matches[i+1]
-			_, err := console.ExpectString(match)
+			_, err := cons.ExpectString(match)
 			require.NoError(t, err)
-			_, err = console.SendLine(value)
+			_, err = cons.SendLine(value)
 			require.NoError(t, err)
 		}
 		<-closeChan
diff --git a/cli/workspacecreate_test.go b/cli/workspacecreate_test.go
@@ -36,7 +36,7 @@ func TestWorkspaceCreate(t *testing.T) {
 		cmd, root := clitest.New(t, "workspaces", "create", project.Name)
 		clitest.SetupConfig(t, client, root)
 
-		console := console.New(t, cmd)
+		cons := console.New(t, cmd)
 		closeChan := make(chan struct{})
 		go func() {
 			err := cmd.Execute()
@@ -51,12 +51,12 @@ func TestWorkspaceCreate(t *testing.T) {
 		for i := 0; i < len(matches); i += 2 {
 			match := matches[i]
 			value := matches[i+1]
-			_, err := console.ExpectString(match)
+			_, err := cons.ExpectString(match)
 			require.NoError(t, err)
-			_, err = console.SendLine(value)
+			_, err = cons.SendLine(value)
 			require.NoError(t, err)
 		}
-		_, err := console.ExpectString("Create")
+		_, err := cons.ExpectString("Create")
 		require.NoError(t, err)
 		<-closeChan
 	})
diff --git a/console/console.go b/console/console.go
@@ -105,14 +105,14 @@ func NewConsole(opts ...Opt) (*Console, error) {
 	closers := []io.Closer{consolePty}
 	reader := consolePty.Reader()
 
-	console := &Console{
+	cons := &Console{
 		opts:       options,
 		pty:        consolePty,
 		runeReader: bufio.NewReaderSize(reader, utf8.UTFMax),
 		closers:    closers,
 	}
 
-	return console, nil
+	return cons, nil
 }
 
 // Tty returns an input Tty for accepting input

Original file line number	Diff line number	Diff line change
`@@ -105,14 +105,14 @@ func NewConsole(opts ...Opt) (*Console, error) {`
`105`	`105`	`closers := []io.Closer{consolePty}`
`106`	`106`	`reader := consolePty.Reader()`
`107`	`107`
`108`		`- console := &Console{`
	`108`	`+ cons := &Console{`
`109`	`109`	`opts: options,`
`110`	`110`	`pty: consolePty,`
`111`	`111`	`runeReader: bufio.NewReaderSize(reader, utf8.UTFMax),`
`112`	`112`	`closers: closers,`
`113`	`113`	`}`
`114`	`114`
`115`		`- return console, nil`
	`115`	`+ return cons, nil`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// Tty returns an input Tty for accepting input`