Small refactor in cmd flag docs generation

Just a little cleanup I wanted to do after creating the previous
commit.

Note that f.Deprecated and f.ShorthandDeprecated are both strings so
that's why I think we can just compare to "" rather than use len(..)
== 0, and also why I think we can skip the extra len > 0 check.

Author: simonbaird

internal/documentation/asciidoc/cli/cli.go

@@ -129,27 +129,26 @@ func options(flags *pflag.FlagSet) []option {
 	var result []option
 
 	flags.VisitAll(func(flag *pflag.Flag) {
-		if !(len(flag.ShorthandDeprecated) > 0) && len(flag.Shorthand) > 0 {
-			opt := option{
-				flag.Name,
-				flag.Shorthand,
-				flagDefValueMaybe(flag),
-				flag.Usage,
-			}
-			result = append(result, opt)
-		} else {
-			opt := option{
-				Name:         flag.Name,
-				DefaultValue: flagDefValueMaybe(flag),
-				Usage:        flag.Usage,
-			}
-			result = append(result, opt)
+		opt := option{
+			flag.Name,
+			flagShortHandMaybe(flag),
+			flagDefValueMaybe(flag),
+			flag.Usage,
 		}
+		result = append(result, opt)
 	})
 
 	return result
 }
 
+func flagShortHandMaybe(flag *pflag.Flag) string {
+	if flag.ShorthandDeprecated != "" {
+		// Don't show deprecated flag shorthand in the docs
+		return ""
+	}
+	return flag.Shorthand
+}
+
 func flagDefValueMaybe(flag *pflag.Flag) string {
 	// For `ec opa test` the default value for the --parallel flag is `runtime.NumCPU()`.
 	// We don't want to show that in the docs since it causes problems in the CI and it