From 16256247d9c41cf4980c36db3841ddd674a04b58 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Thu, 27 Feb 2025 14:18:16 +0100
Subject: syz-ci: upload syz progs with coverage to gcs

---
 pkg/cover/html.go          |  2 ++
 pkg/cover/manager_to_ci.go | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkg')

diff --git a/pkg/cover/html.go b/pkg/cover/html.go
index 074f10815..ae4aa6c4b 100644
--- a/pkg/cover/html.go
+++ b/pkg/cover/html.go
@@ -277,6 +277,8 @@ type FileCoverage struct {
 }
 
 type ProgramCoverage struct {
+	Repo         string          `json:"repo,omitempty"`
+	Commit       string          `json:"commit,omitempty"`
 	Program      string          `json:"program"`
 	CoveredFiles []*FileCoverage `json:"coverage"`
 }
diff --git a/pkg/cover/manager_to_ci.go b/pkg/cover/manager_to_ci.go
index 4b6f1d9ef..511d6fc55 100644
--- a/pkg/cover/manager_to_ci.go
+++ b/pkg/cover/manager_to_ci.go
@@ -27,24 +27,24 @@ type dbCoverageRecord struct {
 	CoverageInfo
 }
 
-func writeJSLine(w io.Writer, covInfo dbCoverageRecord) error {
-	bs, err := json.Marshal(covInfo)
+func WriteJSLine[T any](w io.Writer, obj *T) error {
+	bs, err := json.Marshal(obj)
 	if err != nil {
-		return fmt.Errorf("failed to marshal covInfo: %w", err)
+		return fmt.Errorf("json.Marshal: %w", err)
 	}
 	bs = append(bs, '\n')
 	if _, err = w.Write(bs); err != nil {
-		return fmt.Errorf("failed to write js data: %w", err)
+		return fmt.Errorf("w.Write: %w", err)
 	}
 	return nil
 }
 
 func WriteCIJSONLine(w io.Writer, managerCover CoverageInfo, ciDetails CIDetails) error {
-	dbLine := dbCoverageRecord{
+	dbLine := &dbCoverageRecord{
 		CIDetails:    ciDetails,
 		CoverageInfo: managerCover,
 	}
-	if err := writeJSLine(w, dbLine); err != nil {
+	if err := WriteJSLine(w, dbLine); err != nil {
 		return fmt.Errorf("failed to serialize func line: %w", err)
 	}
 	return nil
-- 
cgit mrf-deployment