Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Breaks from security-cli changes #2732

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Fix Breaks from security-cli changes #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18f1174
update dependencies
eranturgeman Oct 21, 2024
996faca
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into fixing-…
eranturgeman Oct 22, 2024
f01c985
update to latest cli-security
eranturgeman Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions general/summary/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/commandsummary"
"github.com/jfrog/jfrog-cli-security/utils/results/output"
"github.com/jfrog/jfrog-cli/utils/cliutils"
"os"
"path/filepath"
Expand All @@ -13,7 +14,6 @@ import (
commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
securityUtils "github.com/jfrog/jfrog-cli-security/utils"
"github.com/jfrog/jfrog-client-go/utils/log"
"github.com/urfave/cli"
)
Expand Down Expand Up @@ -89,7 +89,7 @@ func aggregatedCodeScanningSarifs() error {
log.Debug("No sarif reports were found")
return nil
}
finalSarif, err := securityUtils.CombineSarifOutputFiles(files)
finalSarif, err := output.CombineSarifOutputFiles(files)
if err != nil {
return err
}
Expand Down Expand Up @@ -191,7 +191,7 @@ func invokeSectionMarkdownGeneration(section MarkdownSection) error {
}

func generateSecurityMarkdown() error {
securitySummary, err := securityUtils.NewSecurityJobSummary()
securitySummary, err := output.NewSecurityJobSummary()
if err != nil {
return fmt.Errorf("error generating security markdown: %w", err)
}
Expand Down Expand Up @@ -228,7 +228,7 @@ func mapScanResults() (err error) {
if err != nil {
return err
}
securityJobSummary := &securityUtils.SecurityJobSummary{}
securityJobSummary := &output.SecurityJobSummary{}
// Init scan result map
scanResultsMap := make(map[string]commandsummary.ScanResult)
// Set default not scanned component view
Expand All @@ -248,7 +248,7 @@ func mapScanResults() (err error) {

// Each scan result should be processed according to its index.
// To generate custom view for each scan type.
func processScan(index commandsummary.Index, filePath string, scannedName string, sec *securityUtils.SecurityJobSummary, scanResultsMap map[string]commandsummary.ScanResult) (map[string]commandsummary.ScanResult, error) {
func processScan(index commandsummary.Index, filePath string, scannedName string, sec *output.SecurityJobSummary, scanResultsMap map[string]commandsummary.ScanResult) (map[string]commandsummary.ScanResult, error) {
var res commandsummary.ScanResult
var err error
switch index {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/jfrog/jfrog-cli-artifactory v0.1.6
github.com/jfrog/jfrog-cli-core/v2 v2.56.3
github.com/jfrog/jfrog-cli-platform-services v1.3.0
github.com/jfrog/jfrog-cli-security v1.11.4
github.com/jfrog/jfrog-cli-security v1.12.0
github.com/jfrog/jfrog-client-go v1.47.2
github.com/jszwec/csvutil v1.10.0
github.com/manifoldco/promptui v0.9.0
Expand Down Expand Up @@ -175,4 +175,4 @@ require (

// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240918150101-ad5b10435a12

// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog dev
// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog dev
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ github.com/jfrog/jfrog-cli-core/v2 v2.56.3 h1:9ZZ7TGpobk4XShPzrHkRGfpYzs1w0rg7Hq
github.com/jfrog/jfrog-cli-core/v2 v2.56.3/go.mod h1:xL9b2DrH5FemiTuk2bfUBfbQYC/RvpBkPxxV6XxssXs=
github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA=
github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc=
github.com/jfrog/jfrog-cli-security v1.11.4 h1:aMNTcz/w75IfHfsNuJqoHu38+35L9JH8DnTEqOhW8Ao=
github.com/jfrog/jfrog-cli-security v1.11.4/go.mod h1:XRev43n6+C48UJGbRGCI5eqtQ4tF5T6hxnIa4+ULiMI=
github.com/jfrog/jfrog-cli-security v1.12.0 h1:TGQ0J4dSYA3Wi18oMnj2iGJzcLexCIvL+RnD7coFwGo=
github.com/jfrog/jfrog-cli-security v1.12.0/go.mod h1:XRev43n6+C48UJGbRGCI5eqtQ4tF5T6hxnIa4+ULiMI=
github.com/jfrog/jfrog-client-go v1.47.2 h1:Lu+2n4EU+MzNfotV1VOvF/ZQIWsQJg11Z4YSVhumFy0=
github.com/jfrog/jfrog-client-go v1.47.2/go.mod h1:fx2fq5XwZ7e2pzpBB9pXsP8+ZdKLB8g+A6fjGU6F2XI=
github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=
Expand Down
Loading