Skip to content

Commit

Permalink
renames
Browse files Browse the repository at this point in the history
  • Loading branch information
EyalDelarea committed Sep 11, 2023
1 parent f0264eb commit 4c3e95f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ require (

// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230828134416-f0db33dd9344

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911074043-ba311758818e
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911120123-ad5ad84c2f0e

// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911074043-ba311758818e h1:bD6EugKDqDqj4aAV31zGiy+lmupkip3hRcbwvpTig+s=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911074043-ba311758818e/go.mod h1:NNm941pX0BHru3kFTsVC9TIukhqvoABj/p6o1frdxF0=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911120123-ad5ad84c2f0e h1:6EV7DC68KXqyYkfMobM8zGBmDgTMGpi249yhlAp7xQc=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230911120123-ad5ad84c2f0e/go.mod h1:NNm941pX0BHru3kFTsVC9TIukhqvoABj/p6o1frdxF0=
github.com/forPelevin/gomoji v1.1.8 h1:JElzDdt0TyiUlecy6PfITDL6eGvIaxqYH1V52zrd0qQ=
github.com/forPelevin/gomoji v1.1.8/go.mod h1:8+Z3KNGkdslmeGZBC3tCrwMrcPy5GRzAD+gL9NAwMXg=
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
Expand Down
2 changes: 1 addition & 1 deletion scan/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func createAuditCmd(c *cli.Context) (*audit.AuditCommand, error) {
SetPrintExtendedTable(c.Bool(cliutils.ExtendedTable)).
SetMinSeverityFilter(minSeverity).
SetFixableOnly(c.Bool(cliutils.FixableOnly)).
SetThirdPartyContextualAnalysis(c.Bool(cliutils.ThirdPartyContextualAnalysis))
SetThirdPartyApplicabilityScan(c.Bool(cliutils.ThirdPartyDepsApplicability))

if c.String("watches") != "" {
auditCmd.SetWatches(splitByCommaAndTrim(c.String("watches")))
Expand Down
26 changes: 13 additions & 13 deletions utils/cliutils/commandsflags.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,16 +463,16 @@ const (
ExcludeTestDeps = "exclude-test-deps"
DepType = "dep-type"
// Run applicability scanning on third-party dependencies folders, for example node_modules.
ThirdPartyContextualAnalysis = "third-party-contextual-analysis"
RequirementsFile = "requirements-file"
watches = "watches"
workingDirs = "working-dirs"
repoPath = "repo-path"
licenses = "licenses"
vuln = "vuln"
ExtendedTable = "extended-table"
MinSeverity = "min-severity"
FixableOnly = "fixable-only"
ThirdPartyDepsApplicability = "third-party-contextual-analysis"
RequirementsFile = "requirements-file"
watches = "watches"
workingDirs = "working-dirs"
repoPath = "repo-path"
licenses = "licenses"
vuln = "vuln"
ExtendedTable = "extended-table"
MinSeverity = "min-severity"
FixableOnly = "fixable-only"
// *** Mission Control Commands' flags ***
missionControlPrefix = "mc-"
curationThreads = "curation-threads"
Expand Down Expand Up @@ -1636,8 +1636,8 @@ var flagsMap = map[string]cli.Flag{
Name: dryRun,
Usage: "[Default: false] Set to true to only simulate the distribution of the release bundle.` `",
},
ThirdPartyContextualAnalysis: cli.BoolFlag{
Name: ThirdPartyContextualAnalysis,
ThirdPartyDepsApplicability: cli.BoolFlag{
Name: ThirdPartyDepsApplicability,
Usage: "[Default: false] Applicable for npm only. when set, the 'vulnerability contextual analysis' feature also uses the code of the project dependencies to determine the applicability of the vulnerability ",
Hidden: true,
},
Expand Down Expand Up @@ -1941,7 +1941,7 @@ var commandFlags = map[string][]string{
},
Audit: {
xrUrl, user, password, accessToken, serverId, InsecureTls, project, watches, repoPath, licenses, xrOutput, ExcludeTestDeps,
useWrapperAudit, DepType, RequirementsFile, fail, ExtendedTable, workingDirs, Mvn, Gradle, Npm, Yarn, Go, Nuget, Pip, Pipenv, Poetry, MinSeverity, FixableOnly, ThirdPartyContextualAnalysis,
useWrapperAudit, DepType, RequirementsFile, fail, ExtendedTable, workingDirs, Mvn, Gradle, Npm, Yarn, Go, Nuget, Pip, Pipenv, Poetry, MinSeverity, FixableOnly, ThirdPartyDepsApplicability,
},
AuditMvn: {
xrUrl, user, password, accessToken, serverId, InsecureTls, project, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, useWrapperAudit,
Expand Down

0 comments on commit 4c3e95f

Please sign in to comment.