Skip to content

Commit

Permalink
tlog: switch from golang.org/x/crypto/ssh/terminal to golang.org/x/term
Browse files Browse the repository at this point in the history
$ golangci-lint run

internal/tlog/log.go:13:2: SA1019: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (staticcheck)
	"golang.org/x/crypto/ssh/terminal"
  • Loading branch information
rfjakob committed Aug 19, 2021
1 parent 9c268fb commit 2a25c3a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ require (
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
)
6 changes: 3 additions & 3 deletions internal/tlog/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"log/syslog"
"os"

"golang.org/x/crypto/ssh/terminal"
"golang.org/x/term"
)

const (
Expand Down Expand Up @@ -106,7 +106,7 @@ var Warn *toggledLogger
var Fatal *toggledLogger

func init() {
if terminal.IsTerminal(int(os.Stdout.Fd())) {
if term.IsTerminal(int(os.Stdout.Fd())) {
ColorReset = "\033[0m"
ColorGrey = "\033[2m"
ColorRed = "\033[31m"
Expand Down Expand Up @@ -171,7 +171,7 @@ func PrintMasterkeyReminder(key []byte) {
// Quiet mode
return
}
if !terminal.IsTerminal(int(os.Stdout.Fd())) {
if !term.IsTerminal(int(os.Stdout.Fd())) {
// We don't want the master key to end up in a log file
Info.Printf("Not running on a terminal, suppressing master key display\n")
return
Expand Down

0 comments on commit 2a25c3a

Please sign in to comment.