Use golang.org/x/term

tklauser · tklauser · commit b586d5177862 · 2021-04-28T18:44:36.000+02:00
The golang.org/x/crypto/ssh/terminal package is deprecated and merely a
wrapper around golang.org/x/term. Use the latter directly.
diff --git a/go.mod b/go.mod
@@ -33,6 +33,7 @@ require (
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44
+	golang.org/x/term v0.0.0-20210422114643-f5beecf764ed
 	golang.org/x/text v0.3.4 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
diff --git a/go.sum b/go.sum
@@ -357,6 +357,8 @@ golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210422114643-f5beecf764ed h1:Ei4bQjjpYUsS4efOUz+5Nz++IVkHk87n2zBA0NxBWc0=
+golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/pkg/iostreams/iostreams.go b/pkg/iostreams/iostreams.go
@@ -17,7 +17,7 @@ import (
 	"github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
 	"github.com/muesli/termenv"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 type IOStreams struct {
@@ -332,7 +332,7 @@ func isCygwinTerminal(w io.Writer) bool {
 
 func terminalSize(w io.Writer) (int, int, error) {
 	if f, isFile := w.(*os.File); isFile {
-		return terminal.GetSize(int(f.Fd()))
+		return term.GetSize(int(f.Fd()))
 	}
 	return 0, 0, fmt.Errorf("%v is not a file", w)
 }
diff --git a/utils/terminal.go b/utils/terminal.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mattn/go-isatty"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 var IsTerminal = func(f *os.File) bool {
@@ -18,7 +18,7 @@ func IsCygwinTerminal(f *os.File) bool {
 
 var TerminalSize = func(w interface{}) (int, int, error) {
 	if f, isFile := w.(*os.File); isFile {
-		return terminal.GetSize(int(f.Fd()))
+		return term.GetSize(int(f.Fd()))
 	}
 
 	return 0, 0, fmt.Errorf("%v is not a file", w)

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ require (`
`33`	`33`	`golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897`
`34`	`34`	`golang.org/x/sync v0.0.0-20190423024810-112230192c58`
`35`	`35`	`golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44`
	`36`	`+ golang.org/x/term v0.0.0-20210422114643-f5beecf764ed`
`36`	`37`	`golang.org/x/text v0.3.4 // indirect`
`37`	`38`	`gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b`
`38`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/mattn/go-colorable"`
`18`	`18`	`"github.com/mattn/go-isatty"`
`19`	`19`	`"github.com/muesli/termenv"`
`20`		`- "golang.org/x/crypto/ssh/terminal"`
	`20`	`+ "golang.org/x/term"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type IOStreams struct {`
`@@ -332,7 +332,7 @@ func isCygwinTerminal(w io.Writer) bool {`
`332`	`332`
`333`	`333`	`func terminalSize(w io.Writer) (int, int, error) {`
`334`	`334`	`if f, isFile := w.(*os.File); isFile {`
`335`		`- return terminal.GetSize(int(f.Fd()))`
	`335`	`+ return term.GetSize(int(f.Fd()))`
`336`	`336`	`}`
`337`	`337`	`return 0, 0, fmt.Errorf("%v is not a file", w)`
`338`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`"github.com/mattn/go-isatty"`
`8`		`- "golang.org/x/crypto/ssh/terminal"`
	`8`	`+ "golang.org/x/term"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var IsTerminal = func(f *os.File) bool {`
`@@ -18,7 +18,7 @@ func IsCygwinTerminal(f *os.File) bool {`
`18`	`18`
`19`	`19`	`var TerminalSize = func(w interface{}) (int, int, error) {`
`20`	`20`	`if f, isFile := w.(*os.File); isFile {`
`21`		`- return terminal.GetSize(int(f.Fd()))`
	`21`	`+ return term.GetSize(int(f.Fd()))`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`return 0, 0, fmt.Errorf("%v is not a file", w)`