refactor(tags): send build id and run as dedicated field (#107)

Also removed duplicate code in tmp dir create Co-authored-by: oranmoshai <oran.moshai@aquasec.com>
aquasecurity · May 12, 2022 · 711e0d7 · 711e0d7
1 parent 7578ae2
commit 711e0d7
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 240 deletions.
diff --git a/pkg/buildClient/upload.go b/pkg/buildClient/upload.go
@@ -28,17 +28,6 @@ func (bc *TwirpClient) Upload(results []*buildsecurity.Result, tags map[string]s
 	buildSystem := metadata.GetBuildSystem()
 
 	run, buildID := metadata.GetBuildInfo(buildSystem)
-	// add tags only if not exist and allow override
-	if _, ok := tags["run"]; !ok {
-		if run != "" {
-			tags["run"] = run
-		}
-	}
-	if _, ok := tags["build_id"]; !ok {
-		if buildID != "" {
-			tags["build_id"] = buildID
-		}
-	}
 
 	createScanReq := &buildsecurity.CreateScanReq{
 		RepositoryID: bc.repoId,
@@ -49,6 +38,8 @@ func (bc *TwirpClient) Upload(results []*buildsecurity.Result, tags map[string]s
 		System:       buildSystem,
 		Tags:         tags,
 		TriggeredBy:  scanner.MatchTriggeredBy(bc.c.String("triggered-by")),
+		Run:          run,
+		BuildID:      buildID,
 	}
 
 	_, err = client.CreateScan(ctx, createScanReq)

diff --git a/pkg/proto/buildsecurity.proto b/pkg/proto/buildsecurity.proto
@@ -44,6 +44,8 @@ message CreateScanReq {
   repeated Result Results = 7;
   map<string, string> Tags = 8;
   TriggeredByEnum TriggeredBy = 9;
+  string Run = 10;
+  string BuildID = 11;
 }
 
 enum TriggeredByEnum {