cmd/vulnreport: write partially fixed report in fix

In vulnreport fix, always write the report even if an error occurs. This ensures that any progress fix made is not lost. Change-Id: Iefddf5a175251c2d65f70b7d45ddede109c006f8 Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/506763 Run-TryBot: Tatiana Bradley <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Damien Neil <[email protected]>
golang · Jun 30, 2023 · d41b7b7 · d41b7b7
1 parent 4ab276f
commit d41b7b7
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/cmd/vulnreport/main.go b/cmd/vulnreport/main.go
@@ -720,6 +720,15 @@ func fix(ctx context.Context, filename string, ghsaClient *ghsa.Client, force bo
 	if err := r.CheckFilename(filename); err != nil {
 		return err
 	}
+
+	// We may make partial progress on fixing a report, so write the
+	// report even if a fatal error occurs somewhere.
+	defer func() {
+		if err := r.Write(filename); err != nil {
+			errlog.Println(err)
+		}
+	}()
+
 	if lints := r.Lint(); force || len(lints) > 0 {
 		r.Fix()
 	}
@@ -740,11 +749,6 @@ func fix(ctx context.Context, filename string, ghsaClient *ghsa.Client, force bo
 		}
 	}
 
-	// Write unconditionally in order to format.
-	if err := r.Write(filename); err != nil {
-		return err
-	}
-
 	if !r.IsExcluded() {
 		if err := writeOSV(r); err != nil {
 			return err