diff --git a/general/summary/cli.go b/general/summary/cli.go index ccf5a7cce..c8ab9785e 100644 --- a/general/summary/cli.go +++ b/general/summary/cli.go @@ -173,7 +173,7 @@ func mapScanResults(commandSummary *commandsummary.CommandSummary) (err error) { } // Sets default non-scanned output scanResultsMap[commandsummary.NonScannedResult] = securityJobSummary.GetNonScannedResult() - commandsummary.ScanResultsMapping = scanResultsMap + commandsummary.StaticMarkdownConfig.SetScanResultsMapping(scanResultsMap) return nil } diff --git a/go.mod b/go.mod index bc2d4dbac..82b9c8f9c 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/docker/docker v27.1.2+incompatible github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 - github.com/jfrog/build-info-go v1.9.34 + github.com/jfrog/build-info-go v1.9.35 github.com/jfrog/gofrog v1.7.5 github.com/jfrog/jfrog-cli-artifactory v0.1.5 github.com/jfrog/jfrog-cli-core/v2 v2.55.4 @@ -171,9 +171,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240828151259-7cbc89381b06 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240829095200-1f14b0d8000d -replace github.com/jfrog/jfrog-cli-security => github.com/attiasas/jfrog-cli-security v0.0.0-20240828153447-585a642200dd +replace github.com/jfrog/jfrog-cli-security => github.com/attiasas/jfrog-cli-security v0.0.0-20240829084802-582a8a130ca2 // replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240806162439-01bb7dcd43fc diff --git a/go.sum b/go.sum index 0d0f15bf2..842c14863 100644 --- a/go.sum +++ b/go.sum @@ -643,8 +643,8 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE= 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-cli-security v0.0.0-20240828153447-585a642200dd h1:LjiXDcQktN2aduBFPt4oAtMPYXYmm95JEOBsSHbIFbU= -github.com/attiasas/jfrog-cli-security v0.0.0-20240828153447-585a642200dd/go.mod h1:Uj4RVVTRB/lrJt/cwIq+w6SbqJ/+ltWfehgb+OLfCxE= +github.com/attiasas/jfrog-cli-security v0.0.0-20240829084802-582a8a130ca2 h1:F81h35kcHEogIFpQqnZkRL6FxLlGG5rxLw4IBch3LJI= +github.com/attiasas/jfrog-cli-security v0.0.0-20240829084802-582a8a130ca2/go.mod h1:Uj4RVVTRB/lrJt/cwIq+w6SbqJ/+ltWfehgb+OLfCxE= github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -743,8 +743,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240828151259-7cbc89381b06 h1:wSvV8aA5qxfCcTo1RFvErKu3NeO5KBqY8sFoJl1dKxw= -github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240828151259-7cbc89381b06/go.mod h1:WRVczIRHrJV6xcQtjW5lGENl+qnDkn7qQMJ9s2/fT8E= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240829095200-1f14b0d8000d h1:+bbw3OXausN3BVCu4KLz8XbcJpBGTAwY7NnVxuEQvdQ= +github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20240829095200-1f14b0d8000d/go.mod h1:g4VChCFPZay8xceNfV/Lq6PLdeNkLnf6ZIb4HTtYeVw= 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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -940,8 +940,8 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.9.34 h1:bPnW58VpclbpBe/x8XEu/2BIviEOoJrJ5PkRRcmU3Co= -github.com/jfrog/build-info-go v1.9.34/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY= +github.com/jfrog/build-info-go v1.9.35 h1:P53Ckbuin0GYrq0LWMY0GZSptJcQwiUyW6lqTbXKdcc= +github.com/jfrog/build-info-go v1.9.35/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY= github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U= github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE= github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go index f37b33bcb..2c656a237 100644 --- a/utils/cliutils/commandsflags.go +++ b/utils/cliutils/commandsflags.go @@ -1829,7 +1829,7 @@ var commandFlags = map[string][]string{ }, Docker: { buildName, buildNumber, module, Project, - serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, + serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, vuln, }, DockerPush: { buildName, buildNumber, module, Project,