[devel] Use golang.org/x/term instead of golang.org/x/crypto/ssh/term…

…inal.
rapidloop · May 10, 2022 · e883544 · e883544
1 parent 728f5d6
commit e883544
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmd/pgmetrics/main.go b/cmd/pgmetrics/main.go
@@ -30,7 +30,7 @@ import (
 	"github.com/pborman/getopt"
 	"github.com/rapidloop/pgmetrics"
 	"github.com/rapidloop/pgmetrics/collector"
-	"golang.org/x/crypto/ssh/terminal"
+	"golang.org/x/term"
 )
 
 const usage = `pgmetrics collects PostgreSQL information and metrics.
@@ -348,7 +348,7 @@ func process(result *pgmetrics.Model, o options, args []string) {
 		}
 	}
 	usePager := o.output == "" && !o.nopager && pager != "" &&
-		terminal.IsTerminal(int(os.Stdout.Fd()))
+		term.IsTerminal(int(os.Stdout.Fd()))
 	if usePager {
 		cmd := exec.Command(pager)
 		pagerStdin, err := cmd.StdinPipe()

diff --git a/go.mod b/go.mod
@@ -10,8 +10,9 @@ require (
 	github.com/rapidloop/pq v1.1.1
 	github.com/xdg-go/stringprep v1.0.0 // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
 	golang.org/x/mod v0.5.1
+	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
 )
 
 go 1.13
diff --git a/go.sum b/go.sum
@@ -75,8 +75,9 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
+golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=