fixup! fix(cli): speed up CLI over SSH (#7885) (#7888)

johnstcn · web-flow · commit 4f29f9abe3e2 · 2023-06-07T09:13:22.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -687,7 +687,7 @@ func formatExamples(examples ...example) string {
 				"  - " + padStyle.Render(e.Description + ":")[4:] + "\n\n    ",
 			)
 		}
-		// We add 1 space here because `cliui.Styles.Code` adds an extra
+		// We add 1 space here because `cliui.DefaultStyles.Code` adds an extra
 		// space. This makes the code block align at an even 2 or 6
 		// spaces for symmetry.
 		_, _ = sb.WriteString(" " + cliui.DefaultStyles.Code.Render(fmt.Sprintf("$ %s", e.Command)))
diff --git a/cli/server_slim.go b/cli/server_slim.go
@@ -30,7 +30,7 @@ func (r *RootCmd) Server(_ func(context.Context, *coderd.Options) (*coderd.API,
 }
 
 func serverUnsupported(w io.Writer) {
-	_, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.Styles.Code.Render("server"))
+	_, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.DefaultStyles.Code.Render("server"))
 	_, _ = fmt.Fprintln(w, "")
 	_, _ = fmt.Fprintln(w, "Please use a build of Coder from GitHub releases:")
 	_, _ = fmt.Fprintln(w, "  https://github.com/coder/coder/releases")
diff --git a/enterprise/cli/proxyserver_slim.go b/enterprise/cli/proxyserver_slim.go
@@ -29,7 +29,7 @@ func (r *RootCmd) proxyServer() *clibase.Cmd {
 }
 
 func serverUnsupported(w io.Writer) {
-	_, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.Styles.Code.Render("server"))
+	_, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.DefaultStyles.Code.Render("server"))
 	_, _ = fmt.Fprintln(w, "")
 	_, _ = fmt.Fprintln(w, "Please use a build of Coder from GitHub releases:")
 	_, _ = fmt.Fprintln(w, "  https://github.com/coder/coder/releases")

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ func formatExamples(examples ...example) string {`
`687`	`687`	`" - " + padStyle.Render(e.Description + ":")[4:] + "\n\n ",`
`688`	`688`	`)`
`689`	`689`	`}`
`690`		- // We add 1 space here because `cliui.Styles.Code` adds an extra
	`690`	+ // We add 1 space here because `cliui.DefaultStyles.Code` adds an extra
`691`	`691`	`// space. This makes the code block align at an even 2 or 6`
`692`	`692`	`// spaces for symmetry.`
`693`	`693`	`_, _ = sb.WriteString(" " + cliui.DefaultStyles.Code.Render(fmt.Sprintf("$ %s", e.Command)))`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (r RootCmd) Server(_ func(context.Context, coderd.Options) (*coderd.API,`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func serverUnsupported(w io.Writer) {`
`33`		`- _, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.Styles.Code.Render("server"))`
	`33`	`+ _, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.DefaultStyles.Code.Render("server"))`
`34`	`34`	`_, _ = fmt.Fprintln(w, "")`
`35`	`35`	`_, _ = fmt.Fprintln(w, "Please use a build of Coder from GitHub releases:")`
`36`	`36`	`_, _ = fmt.Fprintln(w, " https://github.com/coder/coder/releases")`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (r RootCmd) proxyServer() clibase.Cmd {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func serverUnsupported(w io.Writer) {`
`32`		`- _, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.Styles.Code.Render("server"))`
	`32`	`+ _, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", cliui.DefaultStyles.Code.Render("server"))`
`33`	`33`	`_, _ = fmt.Fprintln(w, "")`
`34`	`34`	`_, _ = fmt.Fprintln(w, "Please use a build of Coder from GitHub releases:")`
`35`	`35`	`_, _ = fmt.Fprintln(w, " https://github.com/coder/coder/releases")`