cli: rollback x/crypto/ssh/terminal->x/term

canonical · Jun 29, 2023 · 6a34f53 · 6a34f53
1 parent bc316ad
commit 6a34f53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internals/cli/cli.go b/internals/cli/cli.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/canonical/go-flags"
 
-	"golang.org/x/term"
+	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/canonical/pebble/client"
 	"github.com/canonical/pebble/internals/logger"
@@ -39,7 +39,7 @@ var (
 	Stdout io.Writer = os.Stdout
 	Stderr io.Writer = os.Stderr
 	// overridden for testing
-	ReadPassword = term.ReadPassword
+	ReadPassword = terminal.ReadPassword
 	// set to logger.Panicf in testing
 	noticef = logger.Noticef
 )
@@ -255,8 +255,8 @@ func Parser(cli *client.Client) *flags.Parser {
 }
 
 var (
-	isStdinTTY  = term.IsTerminal(0)
-	isStdoutTTY = term.IsTerminal(1)
+	isStdinTTY  = terminal.IsTerminal(0)
+	isStdoutTTY = terminal.IsTerminal(1)
 	osExit      = os.Exit
 )
 

diff --git a/internals/cli/format.go b/internals/cli/format.go
@@ -26,7 +26,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"golang.org/x/term"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 type unicodeMixin struct {
@@ -150,7 +150,7 @@ var termSize = termSizeImpl
 
 func termSizeImpl() (width, height int) {
 	if f, ok := Stdout.(*os.File); ok {
-		width, height, _ = term.GetSize(int(f.Fd()))
+		width, height, _ = terminal.GetSize(int(f.Fd()))
 	}
 
 	if width <= 0 {