add watch attrib to simple-json

jfrog · Dec 2, 2024 · c2a2622 · c2a2622
1 parent b90ff34
commit c2a2622
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -112,7 +112,7 @@ require (
 )
 
 // attiasas:add_repo_context_scan_graph
-replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20241128151327-a53eeb4aff37
+replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20241202080241-23f62508099d
 
 // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
 

diff --git a/go.sum b/go.sum
@@ -22,8 +22,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/attiasas/jfrog-client-go v0.0.0-20241128151327-a53eeb4aff37 h1:bpoLV/u11AWWx1zhgt7vhxnj3tgEWHROwE0X6cLkm20=
-github.com/attiasas/jfrog-client-go v0.0.0-20241128151327-a53eeb4aff37/go.mod h1:1a7bmQHkRmPEza9wva2+WVrYzrGbosrMymq57kyG5gU=
+github.com/attiasas/jfrog-client-go v0.0.0-20241202080241-23f62508099d h1:fiImxqhkajkfANzZHJ4vE9cT99t8oRfhZlb15ndioGg=
+github.com/attiasas/jfrog-client-go v0.0.0-20241202080241-23f62508099d/go.mod h1:1a7bmQHkRmPEza9wva2+WVrYzrGbosrMymq57kyG5gU=
 github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs=
 github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=

diff --git a/utils/formats/simplejsonapi.go b/utils/formats/simplejsonapi.go
@@ -47,6 +47,7 @@ type VulnerabilityOrViolationRow struct {
 	FixedVersions            []string                  `json:"fixedVersions"`
 	Cves                     []CveRow                  `json:"cves"`
 	IssueId                  string                    `json:"issueId"`
+	Watch                    string                    `json:"watch,omitempty"`
 	References               []string                  `json:"references"`
 	ImpactPaths              [][]ComponentRow          `json:"impactPaths"`
 	JfrogResearchInformation *JfrogResearchInformation `json:"jfrogResearchInformation"`

diff --git a/utils/results/conversion/simplejsonparser/simplejsonparser.go b/utils/results/conversion/simplejsonparser/simplejsonparser.go
@@ -228,6 +228,7 @@ func addSimpleJsonSecurityViolation(securityViolationsRows *[]formats.Vulnerabil
 				},
 				FixedVersions:            fixedVersion,
 				Cves:                     cves,
+				Watch:                    violation.WatchName,
 				IssueId:                  violation.IssueId,
 				References:               violation.References,
 				JfrogResearchInformation: convertJfrogResearchInformation(violation.ExtendedInformation),