From eb484e1acb4b0939d340dc5ed5bd4e8f74a430d9 Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Wed, 8 Jan 2025 17:44:42 +0200 Subject: [PATCH 1/3] adjustments --- scanpullrequest/scanpullrequest.go | 2 +- scanrepository/scanrepository.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scanpullrequest/scanpullrequest.go b/scanpullrequest/scanpullrequest.go index 875263355..b4fc962ce 100644 --- a/scanpullrequest/scanpullrequest.go +++ b/scanpullrequest/scanpullrequest.go @@ -154,7 +154,7 @@ func auditPullRequest(repoConfig *utils.Repository, client vcsclient.VcsClient) defer func() { if issuesCollection != nil { - xsc.SendScanEndedEvent(scanDetails.XrayVersion, scanDetails.XscVersion, scanDetails.ServerDetails, scanDetails.MultiScanId, scanDetails.StartTime, issuesCollection.GetAllIssuesCount(true), err) + xsc.SendScanEndedEvent(scanDetails.XrayVersion, scanDetails.XscVersion, scanDetails.ServerDetails, scanDetails.MultiScanId, scanDetails.StartTime, issuesCollection.GetAllIssuesCount(true), &scanDetails.ResultContext, err) } }() diff --git a/scanrepository/scanrepository.go b/scanrepository/scanrepository.go index 8c339109f..5d1b8e7e6 100644 --- a/scanrepository/scanrepository.go +++ b/scanrepository/scanrepository.go @@ -105,7 +105,7 @@ func (cfp *ScanRepositoryCmd) scanAndFixBranch(repository *utils.Repository) (er totalFindings := 0 defer func() { - xsc.SendScanEndedEvent(cfp.scanDetails.XrayVersion, cfp.scanDetails.XscVersion, cfp.scanDetails.ServerDetails, cfp.scanDetails.MultiScanId, cfp.scanDetails.StartTime, totalFindings, err) + xsc.SendScanEndedEvent(cfp.scanDetails.XrayVersion, cfp.scanDetails.XscVersion, cfp.scanDetails.ServerDetails, cfp.scanDetails.MultiScanId, cfp.scanDetails.StartTime, totalFindings, &cfp.scanDetails.ResultContext, err) }() for i := range repository.Projects { From 676b57841fcb9096aa0d256a22339e74fe9b0cfe Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Wed, 8 Jan 2025 17:47:56 +0200 Subject: [PATCH 2/3] go mod --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index bcf863b62..22ad61150 100644 --- a/go.mod +++ b/go.mod @@ -118,12 +118,12 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.14.0 +replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81 // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev +replace github.com/jfrog/jfrog-client-go => github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86 // replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go dev diff --git a/go.sum b/go.sum index b5e5d68ae..cd130abe5 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,10 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81 h1:/p86LSiLsDQcuT6YKZsPMs7UQfldYevLXgRdnZnjP3Y= +github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81/go.mod h1:EX3hjQAHeNpqNqFu819J+TSkFW1/g4g7/s4RfW/CqP8= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86 h1:isYtQXWvk/tLNgFFu3QoWhArArK0IL8rxXUGC8vv++w= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/forPelevin/gomoji v1.2.0 h1:9k4WVSSkE1ARO/BWywxgEUBvR/jMnao6EZzrql5nxJ8= @@ -131,10 +135,6 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-core/v2 v2.57.6 h1:kI5BqDW8Q4R5HkTUPSAObTqyIgQ9z7DqeFYGOEC1zPk= github.com/jfrog/jfrog-cli-core/v2 v2.57.6/go.mod h1:h5pzOZUb5ChGcGrXCYr3nPyXcTZjeGW2Rm1Zceo8Afg= -github.com/jfrog/jfrog-cli-security v1.14.0 h1:mGm/ya0Qh0YdBS7ATgmQi1r8MEkbM8Hh/ml4UPkuu/4= -github.com/jfrog/jfrog-cli-security v1.14.0/go.mod h1:KGfZVb4je4fiWm+OTNWdyi8V3c2TAkNDZHxsUUEM2GE= -github.com/jfrog/jfrog-client-go v1.49.0 h1:NaTK6+LQBEJafL//6ntnS/eVx1dZMJnxydALwWHKORQ= -github.com/jfrog/jfrog-client-go v1.49.0/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA= github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= From 2fac6531b5784120ffda2282aef2a721d866d109 Mon Sep 17 00:00:00 2001 From: Eran Turgeman Date: Sun, 12 Jan 2025 11:32:34 +0200 Subject: [PATCH 3/3] Go mod --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 22ad61150..0528a523d 100644 --- a/go.mod +++ b/go.mod @@ -118,12 +118,12 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81 +replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20250112092641-48f95de65f41 // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev -replace github.com/jfrog/jfrog-client-go => github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86 +replace github.com/jfrog/jfrog-client-go => github.com/eranturgeman/jfrog-client-go v0.0.0-20250112092141-9aa3d0a6016e // replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go dev diff --git a/go.sum b/go.sum index cd130abe5..123fa0dbe 100644 --- a/go.sum +++ b/go.sum @@ -55,10 +55,10 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81 h1:/p86LSiLsDQcuT6YKZsPMs7UQfldYevLXgRdnZnjP3Y= -github.com/eranturgeman/jfrog-cli-security v0.0.0-20250108154221-efd90014dd81/go.mod h1:EX3hjQAHeNpqNqFu819J+TSkFW1/g4g7/s4RfW/CqP8= -github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86 h1:isYtQXWvk/tLNgFFu3QoWhArArK0IL8rxXUGC8vv++w= -github.com/eranturgeman/jfrog-client-go v0.0.0-20250108153559-0eb6195ace86/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= +github.com/eranturgeman/jfrog-cli-security v0.0.0-20250112092641-48f95de65f41 h1:U9La/5MHpQoSOlhs2cIUrFyoPP73QKQ7Wq7Fi5EuFpQ= +github.com/eranturgeman/jfrog-cli-security v0.0.0-20250112092641-48f95de65f41/go.mod h1:OAVEccjAIDZJTuZ4DmawegJ/WnzFXf6xBFiWvnPlbPQ= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250112092141-9aa3d0a6016e h1:spRZuyinFDk2vjlmajTNvnhj827/wcJuXc7mquRQ8bQ= +github.com/eranturgeman/jfrog-client-go v0.0.0-20250112092141-9aa3d0a6016e/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/forPelevin/gomoji v1.2.0 h1:9k4WVSSkE1ARO/BWywxgEUBvR/jMnao6EZzrql5nxJ8=