Skip to content

Commit 0a0e1bb

Browse files
authored
Replace deprecated "golang.org/x/crypto/ssh/terminal" with "golang.org/x/term" (ava-labs#1464)
1 parent 755ad40 commit 0a0e1bb

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
5555
golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5
5656
golang.org/x/sync v0.1.0
57-
golang.org/x/term v0.5.0
57+
golang.org/x/term v0.7.0
5858
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
5959
gonum.org/v1/gonum v0.11.0
6060
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
@@ -125,7 +125,7 @@ require (
125125
go.uber.org/atomic v1.10.0 // indirect
126126
go.uber.org/multierr v1.8.0 // indirect
127127
golang.org/x/net v0.7.0 // indirect
128-
golang.org/x/sys v0.5.0 // indirect
128+
golang.org/x/sys v0.7.0 // indirect
129129
golang.org/x/text v0.7.0 // indirect
130130
gopkg.in/ini.v1 v1.66.4 // indirect
131131
gopkg.in/urfave/cli.v1 v1.20.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -685,12 +685,12 @@ golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBc
685685
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
686686
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
687687
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
688-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
689-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
688+
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
689+
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
690690
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
691691
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
692-
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
693-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
692+
golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
693+
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
694694
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
695695
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
696696
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

utils/logging/format.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010

1111
"go.uber.org/zap/zapcore"
12-
"golang.org/x/crypto/ssh/terminal"
12+
"golang.org/x/term"
1313
)
1414

1515
// Format modes available
@@ -59,7 +59,7 @@ func ToFormat(h string, fd uintptr) (Format, error) {
5959
case "JSON":
6060
return JSON, nil
6161
case "AUTO":
62-
if !terminal.IsTerminal(int(fd)) {
62+
if !term.IsTerminal(int(fd)) {
6363
return Plain, nil
6464
}
6565
return Colors, nil

0 commit comments

Comments
 (0)