From 7e224d12e13b82218157a0ac85c744e81f1b0a9f Mon Sep 17 00:00:00 2001 From: "Jorge L. Fatta" Date: Mon, 5 Apr 2021 20:07:54 -0300 Subject: [PATCH] fix: escape sequences on windows powershell (#234) * fix: escape sequences on windows powershell * cleanup binaries * Update init_windows.go * Update internal/cli/root.go Co-authored-by: Rita Zerrizuela Co-authored-by: Rita Zerrizuela --- go.mod | 3 ++- internal/ansi/init.go | 7 +++++++ internal/ansi/init_windows.go | 21 +++++++++++++++++++++ internal/cli/root.go | 6 ++++++ vendor/modules.txt | 1 + 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 internal/ansi/init.go create mode 100644 internal/ansi/init_windows.go diff --git a/go.mod b/go.mod index 750ccea27..fbadf69ce 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/golang/mock v1.5.0 github.com/golang/snappy v0.0.3 // indirect github.com/google/go-cmp v0.5.5 + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/klauspost/compress v1.11.9 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/lestrrat-go/jwx v1.1.4 @@ -33,7 +34,7 @@ require ( github.com/zalando/go-keyring v0.1.1 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 - golang.org/x/sys v0.0.0-20210305023407-0d6cb8bd5a4b // indirect + golang.org/x/sys v0.0.0-20210305023407-0d6cb8bd5a4b golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/text v0.3.5 // indirect gopkg.in/auth0.v5 v5.11.0 diff --git a/internal/ansi/init.go b/internal/ansi/init.go new file mode 100644 index 000000000..034691cc3 --- /dev/null +++ b/internal/ansi/init.go @@ -0,0 +1,7 @@ +// +build !windows + +package ansi + +// InitConsole initializes any platform-specific aspect of the terminal. +// This method will run for all except Windows. +func InitConsole() {} diff --git a/internal/ansi/init_windows.go b/internal/ansi/init_windows.go new file mode 100644 index 000000000..bcf4f3ca7 --- /dev/null +++ b/internal/ansi/init_windows.go @@ -0,0 +1,21 @@ +package ansi + +import ( + "golang.org/x/sys/windows" +) + +// InitConsole configures the standard output and error streams +// on Windows systems. This is necessary to enable colored and ANSI output. +// This is the Windows implementation of ansi/init.go. +func InitConsole() { + setWindowsConsoleMode(windows.Stdout, windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING) + setWindowsConsoleMode(windows.Stderr, windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING) +} + +func setWindowsConsoleMode(handle windows.Handle, flags uint32) { + var mode uint32 + // set the console mode if not already there: + if err := windows.GetConsoleMode(handle, &mode); err == nil { + _ = windows.SetConsoleMode(handle, mode|flags) + } +} diff --git a/internal/cli/root.go b/internal/cli/root.go index 4225429b8..1b5ae10bc 100644 --- a/internal/cli/root.go +++ b/internal/cli/root.go @@ -5,6 +5,7 @@ import ( "fmt" "os" + "github.com/auth0/auth0-cli/internal/ansi" "github.com/auth0/auth0-cli/internal/buildinfo" "github.com/auth0/auth0-cli/internal/display" "github.com/auth0/auth0-cli/internal/instrumentation" @@ -107,6 +108,11 @@ func Execute() { } }() + // platform specific terminal initialization: + // this should run for all commands, + // for most of the architectures there's no requirements: + ansi.InitConsole() + if err := rootCmd.ExecuteContext(context.TODO()); err != nil { cli.renderer.Heading("error") cli.renderer.Errorf(err.Error()) diff --git a/vendor/modules.txt b/vendor/modules.txt index 05788cb14..0874637d1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -116,6 +116,7 @@ github.com/hashicorp/hcl/json/token # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap # github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 +## explicit github.com/kballard/go-shellquote # github.com/klauspost/compress v1.11.9 ## explicit