cmd/vulnreport: further unify code of vulnreport regen and review

Change-Id: I1da43b41d7972860760121211de6f47abf0a2c30
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/595635
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>

Author: tatianab

cmd/vulnreport/creator.go

@@ -148,6 +148,7 @@ func (c *creator) reportFromMeta(ctx context.Context, meta *reportMeta) (*yamlRe
 		report.WithModulePath(meta.modulePath),
 		report.WithAliases(aliases),
 		report.WithReviewStatus(meta.reviewStatus),
+		report.WithUnexcluded(meta.unexcluded),
 	)
 
 	if meta.excluded != "" {
@@ -283,11 +284,11 @@ func aliases(iss *issues.Issue) (aliases []string) {
 // Data that can be combined with a source vulnerability
 // to create a new report.
 type reportMeta struct {
-	id           string
-	modulePath   string
-	aliases      []string
-	excluded     report.ExcludedReason
-	reviewStatus report.ReviewStatus
+	id                   string
+	modulePath           string
+	aliases              []string
+	excluded, unexcluded report.ExcludedReason
+	reviewStatus         report.ReviewStatus
 }
 
 const todo = "TODO: "

cmd/vulnreport/regenerate.go

@@ -66,23 +66,11 @@ func (u *regenerate) run(ctx context.Context, input any) (err error) {
 		}
 	}
 
-	var modulePath string
-	if len(oldR.Modules) > 0 {
-		modulePath = oldR.Modules[0].Module
-	}
-
-	r, err := u.reportFromMeta(ctx, &reportMeta{
-		id:           oldR.ID,
-		modulePath:   modulePath,
-		aliases:      oldR.Aliases(),
-		reviewStatus: oldR.ReviewStatus,
-	})
+	r, err := u.reportFromMeta(ctx, oldR.meta())
 	if err != nil {
 		return err
 	}
 
-	r.Unexcluded = oldR.Unexcluded
-
 	if !cmp.Equal(r, oldR,
 		cmpopts.IgnoreFields(report.SourceMeta{}, "Created"),
 		// VulnerableAt can change based on latest published version, so we don't
@@ -95,3 +83,18 @@ func (u *regenerate) run(ctx context.Context, input any) (err error) {
 
 	return nil
 }
+
+func (r *yamlReport) meta() *reportMeta {
+	var modulePath string
+	if len(r.Modules) > 0 {
+		modulePath = r.Modules[0].Module
+	}
+
+	return &reportMeta{
+		id:           r.ID,
+		modulePath:   modulePath,
+		aliases:      r.Aliases(),
+		reviewStatus: r.ReviewStatus,
+		unexcluded:   r.Unexcluded,
+	}
+}

cmd/vulnreport/review.go

@@ -47,19 +47,10 @@ func (u *review) skip(input any) string {
 }
 
 func (u *review) run(ctx context.Context, input any) (err error) {
-	oldR := input.(*yamlReport)
+	meta := input.(*yamlReport).meta()
+	meta.reviewStatus = report.Reviewed
 
-	var modulePath string
-	if len(oldR.Modules) > 0 {
-		modulePath = oldR.Modules[0].Module
-	}
-
-	r, err := u.reportFromMeta(ctx, &reportMeta{
-		id:           oldR.ID,
-		modulePath:   modulePath,
-		aliases:      oldR.Aliases(),
-		reviewStatus: report.Reviewed,
-	})
+	r, err := u.reportFromMeta(ctx, meta)
 	if err != nil {
 		return err
 	}

internal/report/new.go

@@ -32,6 +32,7 @@ func New(src Source, pc *proxy.Client, opts ...NewOption) *Report {
 	}
 	r.SourceMeta.Created = &cfg.Created
 	r.ReviewStatus = cfg.ReviewStatus
+	r.Unexcluded = cfg.Unexcluded
 
 	if r.hasExternalSource() {
 		r.addSourceAdvisory()
@@ -102,12 +103,19 @@ func WithReviewStatus(status ReviewStatus) NewOption {
 	}
 }
 
+func WithUnexcluded(reason ExcludedReason) NewOption {
+	return func(h *cfg) {
+		h.Unexcluded = reason
+	}
+}
+
 type cfg struct {
 	ModulePath   string
 	Aliases      []string
 	Created      time.Time
 	GoID         string
 	ReviewStatus ReviewStatus
+	Unexcluded   ExcludedReason
 }
 
 const PendingID = "GO-ID-PENDING"