chore: server header specifies if wsproxy (#8432)

Emyrk · web-flow · commit e9d7a230fa7c · 2023-07-12T12:07:36.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -234,7 +234,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				filesRateLimit = -1
 			}
 
-			PrintLogo(inv)
+			PrintLogo(inv, "Coder")
 			logger, logCloser, err := BuildLogger(inv, cfg)
 			if err != nil {
 				return xerrors.Errorf("make logger: %w", err)
@@ -1333,13 +1333,15 @@ func newProvisionerDaemon(
 }
 
 // nolint: revive
-func PrintLogo(inv *clibase.Invocation) {
+func PrintLogo(inv *clibase.Invocation, daemonTitle string) {
 	// Only print the logo in TTYs.
 	if !isTTYOut(inv) {
 		return
 	}
 
-	_, _ = fmt.Fprintf(inv.Stdout, "%s - Your Self-Hosted Remote Development Platform\n", cliui.DefaultStyles.Bold.Render("Coder "+buildinfo.Version()))
+	versionString := cliui.DefaultStyles.Bold.Render(daemonTitle + " " + buildinfo.Version())
+
+	_, _ = fmt.Fprintf(inv.Stdout, "%s - Your Self-Hosted Remote Development Platform\n", versionString)
 }
 
 func loadCertificates(tlsCertFiles, tlsKeyFiles []string) ([]tls.Certificate, error) {
diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go
@@ -108,7 +108,7 @@ func (*RootCmd) proxyServer() *clibase.Cmd {
 
 			go cli.DumpHandler(ctx)
 
-			cli.PrintLogo(inv)
+			cli.PrintLogo(inv, "Coder Workspace Proxy")
 			logger, logCloser, err := cli.BuildLogger(inv, cfg)
 			if err != nil {
 				return xerrors.Errorf("make logger: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`234`	`234`	`filesRateLimit = -1`
`235`	`235`	`}`
`236`	`236`
`237`		`- PrintLogo(inv)`
	`237`	`+ PrintLogo(inv, "Coder")`
`238`	`238`	`logger, logCloser, err := BuildLogger(inv, cfg)`
`239`	`239`	`if err != nil {`
`240`	`240`	`return xerrors.Errorf("make logger: %w", err)`
`@@ -1333,13 +1333,15 @@ func newProvisionerDaemon(`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`	`1335`	`// nolint: revive`
`1336`		`-func PrintLogo(inv *clibase.Invocation) {`
	`1336`	`+func PrintLogo(inv *clibase.Invocation, daemonTitle string) {`
`1337`	`1337`	`// Only print the logo in TTYs.`
`1338`	`1338`	`if !isTTYOut(inv) {`
`1339`	`1339`	`return`
`1340`	`1340`	`}`
`1341`	`1341`
`1342`		`- _, _ = fmt.Fprintf(inv.Stdout, "%s - Your Self-Hosted Remote Development Platform\n", cliui.DefaultStyles.Bold.Render("Coder "+buildinfo.Version()))`
	`1342`	`+ versionString := cliui.DefaultStyles.Bold.Render(daemonTitle + " " + buildinfo.Version())`
	`1343`	`+`
	`1344`	`+ _, _ = fmt.Fprintf(inv.Stdout, "%s - Your Self-Hosted Remote Development Platform\n", versionString)`
`1343`	`1345`	`}`
`1344`	`1346`
`1345`	`1347`	`func loadCertificates(tlsCertFiles, tlsKeyFiles []string) ([]tls.Certificate, error) {`