Updates lint output to print detail instead of description

Signed-off-by: Talon Bowler <talon.bowler@docker.com>
moby · Jun 17, 2024 · 9305c60 · 9305c60
1 parent 5642608
commit 9305c60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/frontend/dockerfile/linter/linter.go b/frontend/dockerfile/linter/linter.go
@@ -91,8 +91,12 @@ func (rule *LinterRule[F]) Run(warn LintWarnFunc, location []parser.Range, txt .
 	warn(rule.Name, rule.Description, rule.URL, short, location)
 }
 
-func LintFormatShort(rulename, msg string, startLine int) string {
-	return fmt.Sprintf("%s: %s (line %d)", rulename, msg, startLine)
+func LintFormatShort(rulename, msg string, line int) string {
+	msg = fmt.Sprintf("%s: %s", rulename, msg)
+	if line > 0 {
+		msg = fmt.Sprintf("%s (line %d)", msg, line)
+	}
+	return msg
 }
 
 type LintWarnFunc func(rulename, description, url, fmtmsg string, location []parser.Range)
diff --git a/frontend/subrequests/lint/lint.go b/frontend/subrequests/lint/lint.go
@@ -173,7 +173,7 @@ func PrintLintViolations(dt []byte, w io.Writer) error {
 		if warning.URL != "" {
 			fmt.Fprintf(w, " - %s", warning.URL)
 		}
-		fmt.Fprintf(w, "\n%s\n", warning.Description)
+		fmt.Fprintf(w, "\n%s\n", warning.Detail)
 
 		if warning.Location.SourceIndex < 0 {
 			continue