fixup! Update golden files

ammario · ammario · commit ae42a13b4211 · 2023-02-17T23:48:55.000Z
diff --git a/cli/testdata/coder_--help.golden b/cli/testdata/coder_--help.golden
@@ -51,7 +51,6 @@ Auth Flags:
       --token string          Specify an authentication token. For security reasons setting
                               CODER_SESSION_TOKEN is preferred.
                               Consumes $CODER_SESSION_TOKEN
-
 Other Flags:
       --global-config coder   Path to the global coder config directory.
                               Consumes $CODER_CONFIG_DIR (default "~/.config/coderv2")
diff --git a/cli/testdata/coder_agent_--help.golden b/cli/testdata/coder_agent_--help.golden
@@ -4,13 +4,11 @@ Usage:
 Auth Flags:
       --auth string            Specify the authentication type to use for the agent.
                                Consumes $CODER_AGENT_AUTH (default "token")
-
 Operability Flags:
       --log-dir string         Specify the location for the agent log files.
                                Consumes $CODER_AGENT_LOG_DIR (default "/tmp")
       --pprof-address string   The address to serve pprof.
                                Consumes $CODER_AGENT_PPROF_ADDRESS (default "127.0.0.1:6060")
-
 Other Flags:
   -h, --help                   help for agent
       --no-reap                Do not start a process reaper.
diff --git a/cli/testdata/coder_scaletest_create-workspaces_--help.golden b/cli/testdata/coder_scaletest_create-workspaces_--help.golden
@@ -24,7 +24,6 @@ Operability Flags:
                                              server is configured with the exact same tracing
                                              configuration as the client.
                                              Consumes $CODER_LOADTEST_TRACE_PROPAGATE
-
 Other Flags:
       --cleanup-concurrency int              Number of concurrent cleanup jobs to run. 0 means
                                              unlimited.
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -146,7 +146,6 @@ Networking Flags:
                                                           use for workspace applications in
                                                           the form "*.example.com".
                                                           Consumes $CODER_WILDCARD_ACCESS_URL
-
 Auth Flags:
       --disable-password-auth coder server create-admin   Disable password authentication.
                                                           This is recommended for security
@@ -245,7 +244,6 @@ Auth Flags:
                                                           --disable-session-expiry-refresh.
                                                           Consumes $CODER_MAX_SESSION_EXPIRY
                                                           (default 24h0m0s)
-
 Operability Flags:
       --log-human string                                  Output human-readable logs to a
                                                           given file.
@@ -289,7 +287,6 @@ Operability Flags:
                                                           flag was supplied, debug-level logs
                                                           will be included.
                                                           Consumes $CODER_TRACE_CAPTURE_LOGS
-
 Provisioning Flags:
       --provisioner-daemon-poll-interval duration         Time to wait before polling for a
                                                           new job.
@@ -309,7 +306,6 @@ Provisioning Flags:
                                                           tasks that are stuck.
                                                           Consumes
                                                           $CODER_PROVISIONER_FORCE_CANCEL_INTERVAL (default 10m0s)
-
 Other Flags:
       --cache-dir string                                  The directory to cache temporary
                                                           files. If unspecified and
diff --git a/cli/usage.go b/cli/usage.go
@@ -156,8 +156,23 @@ func categorizeFlags(usageOutput string) string {
 	}
 	flushCurrentFlag()
 
+	var prevBody string
+
 	for _, cat := range flagCategories {
 		if buf, ok := categories[cat.name]; ok {
+			// If the last line of the previous category is a single-line flag,
+			// then it isn't indented, and an additional newline is necessary to
+			// make the output readable.
+			if prevBody != "" {
+				prevBodyLines := strings.Split(strings.TrimSpace(prevBody), "\n")
+				if len(prevBodyLines) > 0 {
+					lastLine := prevBodyLines[len(prevBodyLines)-1]
+					if strings.HasPrefix(strings.TrimSpace(lastLine), "-") {
+						_, _ = out.WriteString("\n")
+					}
+				}
+			}
+
 			if len(categories) == 1 {
 				// Don't bother qualifying list if there's only one category.
 				_, _ = fmt.Fprintf(&out, "%s\n", usageHeader("Flags:"))
@@ -166,9 +181,7 @@ func categorizeFlags(usageOutput string) string {
 			}
 			body := buf.String()
 			_, _ = out.WriteString(body)
-			if !strings.HasSuffix(body, "\n\n") {
-				_, _ = out.WriteString("\n")
-			}
+			prevBody = body
 		}
 	}
 
