commit 01979de09c1b299426bb94209b91c610d3cb9f54
author Jonathan Amsterdam <jba@google.com> Wed Feb 02 15:36:54 2022 -0500
committer Jonathan Amsterdam <jba@google.com> Wed Feb 02 22:16:01 2022 +0000
tree 0231fff681259c952964d5ea83c28f00cf6c7363
parent 2552b96be617ffde19d8f5da7e3a4a81a6529726

cmd/vulnreport: fix reformats too

Change-Id: Ia819984bc614db5c09cbaa253ecee1f2e597b506
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/382516
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
Reviewed-by: Julie Qiu <julie@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>

cmd/vulnreport/main.go

diff --git a/cmd/vulnreport/main.go b/cmd/vulnreport/main.go
index 1818484..ba94870 100644
--- a/cmd/vulnreport/main.go
+++ b/cmd/vulnreport/main.go
@@ -40,8 +40,7 @@
 		fmt.Fprintf(flag.CommandLine.Output(), "  create [githubIssueNumber]: creates a new vulnerability YAML report\n")
 		fmt.Fprintf(flag.CommandLine.Output(), "  lint [filename.yaml]: lints a vulnerability YAML report\n")
 		fmt.Fprintf(flag.CommandLine.Output(), "  newcve [filename.yaml]: creates a CVE report from the provided YAML report\n")
-		fmt.Fprintf(flag.CommandLine.Output(), "  fix [filename.yaml]: fixes a YAML report\n")
-		fmt.Fprintf(flag.CommandLine.Output(), "  formats [filename.yaml]: reformats a YAML report\n")
+		fmt.Fprintf(flag.CommandLine.Output(), "  fix [filename.yaml]: fixes and reformats a YAML report\n")
 		flag.PrintDefaults()
 	}
 
@@ -82,10 +81,6 @@
 		if err := fix(name); err != nil {
 			log.Fatal(err)
 		}
-	case "format":
-		if err := format(name); err != nil {
-			log.Fatal(err)
-		}
 	default:
 		flag.Usage()
 		log.Fatalf("unsupported command: %q", cmd)
@@ -175,34 +170,20 @@
 	return nil
 }
 
-func format(filename string) (err error) {
-	derrors.Wrap(&err, "format(%q)", filename)
-	r, err := report.Read(filename)
-	if err != nil {
-		return err
-	}
-	return r.Write(filename)
-}
-
 func fix(filename string) (err error) {
 	defer derrors.Wrap(&err, "fix(%q)", filename)
 	r, err := report.Read(filename)
 	if err != nil {
 		return err
 	}
-	fixed := false
 	if lints := r.Lint(); len(lints) > 0 {
 		r.Fix()
-		fixed = true
 	}
-	added, err := addExportedReportSymbols(r)
-	if err != nil {
+	if _, err := addExportedReportSymbols(r); err != nil {
 		return err
 	}
-	if fixed || added {
-		return r.Write(filename)
-	}
-	return nil
+	// Write unconditionally in order to format.
+	return r.Write(filename)
 }
 
 func addExportedReportSymbols(r *report.Report) (bool, error) {