Add force-tty flag

bryphe-coder · bryphe-coder · commit 9922222dfe6a · 2022-02-12T04:47:23.000Z
diff --git a/cli/login.go b/cli/login.go
@@ -22,6 +22,11 @@ func login() *cobra.Command {
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			rawURL := args[0]
+			forceTty, err := cmd.Flags().GetBool(varForceTty)
+			if err != nil {
+				return xerrors.Errorf("get force tty flag: %s", err)
+			}
+
 			if !strings.HasPrefix(rawURL, "http://") && !strings.HasPrefix(rawURL, "https://") {
 				scheme := "https"
 				if strings.HasPrefix(rawURL, "localhost") {
@@ -44,7 +49,7 @@ func login() *cobra.Command {
 				return xerrors.Errorf("has initial user: %w", err)
 			}
 			if !hasInitialUser {
-				if !isTTY(cmd.InOrStdin()) {
+				if !forceTty && !isTTY(cmd.InOrStdin()) {
 					return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
 				}
 				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Your Coder deployment hasn't been set up!\n", color.HiBlackString(">"))
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -26,7 +26,7 @@ func TestLogin(t *testing.T) {
 		console, err := expect.NewConsole(expect.WithStdout(clitest.StdoutLogs(t)))
 		require.NoError(t, err)
 		client := coderdtest.New(t)
-		root, _ := clitest.New(t, "login", client.URL.String())
+		root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty")
 		root.SetIn(console.InTty())
 		root.SetOut(console.OutTty())
 		go func() {
diff --git a/cli/root.go b/cli/root.go
@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/url"
 	"os"
-	"runtime"
 	"strings"
 
 	"github.com/fatih/color"
@@ -22,6 +21,7 @@ import (
 
 const (
 	varGlobalConfig = "global-config"
+	varForceTty     = "force-tty"
 )
 
 func Root() *cobra.Command {
@@ -66,6 +66,7 @@ func Root() *cobra.Command {
 	cmd.AddCommand(users())
 
 	cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coder"), "Path to the global `coder` config directory")
+	cmd.PersistentFlags().Bool(varForceTty, false, "Force the `coder` command to run as if connected to a TTY")
 
 	return cmd
 }
@@ -110,11 +111,6 @@ func createConfig(cmd *cobra.Command) config.Root {
 // This accepts a reader to work with Cobra's "InOrStdin"
 // function for simple testing.
 func isTTY(reader io.Reader) bool {
-	// TODO(Bryan): Is there a reliable way to check this on windows?
-	if runtime.GOOS == "windows" {
-		return true
-	}
-
 	file, ok := reader.(*os.File)
 	if !ok {
 		return false
