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

Execute audit command with progress bar #1569

Merged
merged 8 commits into from
Jun 23, 2022
Merged

Execute audit command with progress bar #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ff4731
Execute audit command with progress bar
omerzi Jun 15, 2022
adb6c71
added go.mod and go.sum
omerzi Jun 16, 2022
6571677
added go.mod and go.sum
omerzi Jun 16, 2022
6d33030
Merge remote-tracking branch 'omer/progressbar-audit' into progressba…
omerzi Jun 16, 2022
003b5de
Added progress bar execute for auditMvn command as well
omerzi Jun 16, 2022
ae11ab7
Added progress bar execute for auditMvn command as well
omerzi Jun 23, 2022
7e14b25
Added progress bar execute for auditMvn command as well
omerzi Jun 23, 2022
ec8c871
Merge remote-tracking branch 'omer/progressbar-audit' into progressba…
omerzi Jun 23, 2022
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
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 @@ -92,8 +92,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.3.1-0.20220620130614-83dda95caddf
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.3.1-0.20220623084021-a61432b84f63

replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.14.1-0.20220621123826-1e21b88b991f

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220621124242-4fe813879da6
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220623085425-26d8ddbd18ef
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,12 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
github.com/jedib0t/go-pretty/v6 v6.3.2 h1:+46BKrPFAyhAn3MTT3vzvZc+qvWAX23yviAlBG9zAxA=
github.com/jedib0t/go-pretty/v6 v6.3.2/go.mod h1:B1WBBWnJhW9jnk7GHxY+p9NlmNwf/KUb4hKsRk6BdBQ=
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
github.com/jfrog/build-info-go v1.3.1-0.20220620130614-83dda95caddf h1:LprYKtz11FL8WmNBwaGPHfSPcFTrR3UkWVUEcDmh2GQ=
github.com/jfrog/build-info-go v1.3.1-0.20220620130614-83dda95caddf/go.mod h1:S2x0YOFBqBYp22goGRXGfy3ut7XaespgroVJpD6fPwk=
github.com/jfrog/build-info-go v1.3.1-0.20220623084021-a61432b84f63 h1:q4vngc6HMcDpOggrCTuYnRzp/zG76d6M7OiKdn1v1A8=
github.com/jfrog/build-info-go v1.3.1-0.20220623084021-a61432b84f63/go.mod h1:S2x0YOFBqBYp22goGRXGfy3ut7XaespgroVJpD6fPwk=
github.com/jfrog/gofrog v1.1.2 h1:txts7zSFEGan3a8G+AJCrcq4a/z8PrCmZ7m6c7qaALg=
github.com/jfrog/gofrog v1.1.2/go.mod h1:9YN5v4LlsCfLIXpwQnzSf1wVtgjdHM20FzuIu58RMI4=
github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220621124242-4fe813879da6 h1:Jp3uRvcUkRPw4BglFcZhgTZOQoCx7pQ8QXAxyKi7h7E=
github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220621124242-4fe813879da6/go.mod h1:/PUSjB1NR6PF1LO9tcdbUnrA8YsFoRwsMAXx9Ntfk/o=
github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220623085425-26d8ddbd18ef h1:Yo2eCfMkWYniOF+iiyNjVrvWy0dYb9UByvgabKpAx2w=
github.com/jfrog/jfrog-cli-core/v2 v2.16.1-0.20220623085425-26d8ddbd18ef/go.mod h1:+3QQ+tf3L1a67JV4yyGJUP2s2pvlIQilxk/A15fTkJY=
github.com/jfrog/jfrog-client-go v1.14.1-0.20220621123826-1e21b88b991f h1:l+vtDv9wmgCyUnECIO2gtRuwirZ2ulrbDJm7VsYrDPQ=
github.com/jfrog/jfrog-client-go v1.14.1-0.20220621123826-1e21b88b991f/go.mod h1:s1sXsJo8sXngALx5hEd/w5U0INuKKFmZnNk6Tk/QXQE=
github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4=
Expand Down
16 changes: 8 additions & 8 deletions scan/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func AuditCmd(c *cli.Context) error {
}
}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditMvnCmd(c *cli.Context) error {
Expand All @@ -169,7 +169,7 @@ func AuditMvnCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Maven}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditGradleCmd(c *cli.Context) error {
Expand All @@ -180,7 +180,7 @@ func AuditGradleCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Gradle}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditNpmCmd(c *cli.Context) error {
Expand All @@ -191,7 +191,7 @@ func AuditNpmCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Npm}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditGoCmd(c *cli.Context) error {
Expand All @@ -202,7 +202,7 @@ func AuditGoCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Go}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditPipCmd(c *cli.Context) error {
Expand All @@ -213,7 +213,7 @@ func AuditPipCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Pip}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditPipenvCmd(c *cli.Context) error {
Expand All @@ -224,7 +224,7 @@ func AuditPipenvCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Pipenv}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func AuditNugetCmd(c *cli.Context) error {
Expand All @@ -235,7 +235,7 @@ func AuditNugetCmd(c *cli.Context) error {
}
technologies := []string{coreutils.Nuget}
auditCmd.SetTechnologies(technologies)
return commands.Exec(auditCmd)
return progressbar.ExecWithProgress(auditCmd, true)
}

func creatGenericAuditCmd(c *cli.Context) (*audit.GenericAuditCommand, error) {
Expand Down