Skip to content

Commit ba47070

Browse files
attiasasattiasas
authored
Use project env val in commands (#148)
1 parent 6050884 commit ba47070

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

‎cli/scancommands.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func ScanCmd(c *components.Context) error {
236236
SetThreads(threads).
237237
SetSpec(specFile).
238238
SetOutputFormat(format).
239-
SetProject(c.GetStringFlagValue(flags.Project)).
239+
SetProject(getProject(c)).
240240
SetIncludeVulnerabilities(c.GetBoolFlagValue(flags.Vuln) || shouldIncludeVulnerabilities(c)).
241241
SetIncludeLicenses(c.GetBoolFlagValue(flags.Licenses)).
242242
SetFail(c.GetBoolFlagValue(flags.Fail)).
@@ -287,10 +287,14 @@ func getMinimumSeverity(c *components.Context) (severity severityutils.Severity,
287287
}
288288

289289
func isProjectProvided(c *components.Context) bool {
290+
return getProject(c) != ""
291+
}
292+
293+
func getProject(c *components.Context) string {
290294
if c.IsFlagSet(flags.Project) {
291-
return c.GetStringFlagValue(flags.Project) != ""
295+
return c.GetStringFlagValue(flags.Project)
292296
}
293-
return os.Getenv(coreutils.Project) != ""
297+
return os.Getenv(coreutils.Project)
294298
}
295299

296300
func addTrailingSlashToRepoPathIfNeeded(c *components.Context) string {
@@ -454,7 +458,7 @@ func CreateAuditCmd(c *components.Context) (*audit.AuditCommand, error) {
454458
auditCmd.SetAnalyticsMetricsService(xsc.NewAnalyticsMetricsService(serverDetails))
455459

456460
auditCmd.SetTargetRepoPath(addTrailingSlashToRepoPathIfNeeded(c)).
457-
SetProject(c.GetStringFlagValue(flags.Project)).
461+
SetProject(getProject(c)).
458462
SetIncludeVulnerabilities(c.GetBoolFlagValue(flags.Vuln) || shouldIncludeVulnerabilities(c)).
459463
SetIncludeLicenses(c.GetBoolFlagValue(flags.Licenses)).
460464
SetFail(c.GetBoolFlagValue(flags.Fail)).
@@ -689,7 +693,7 @@ func DockerScan(c *components.Context, image string) error {
689693
SetTargetRepoPath(addTrailingSlashToRepoPathIfNeeded(c)).
690694
SetServerDetails(serverDetails).
691695
SetOutputFormat(format).
692-
SetProject(c.GetStringFlagValue(flags.Project)).
696+
SetProject(getProject(c)).
693697
SetIncludeVulnerabilities(c.GetBoolFlagValue(flags.Vuln) || shouldIncludeVulnerabilities(c)).
694698
SetIncludeLicenses(c.GetBoolFlagValue(flags.Licenses)).
695699
SetFail(c.GetBoolFlagValue(flags.Fail)).

‎commands/audit/audit.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package audit
33
import (
44
"errors"
55
"fmt"
6-
"os"
76

87
jfrogappsconfig "github.com/jfrog/jfrog-apps-config/go"
98
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
@@ -92,11 +91,7 @@ func (auditCmd *AuditCommand) CreateCommonGraphScanParams() *scangraph.CommonGra
9291
Watches: auditCmd.watches,
9392
ScanType: services.Dependency,
9493
}
95-
if auditCmd.projectKey == "" {
96-
commonParams.ProjectKey = os.Getenv(coreutils.Project)
97-
} else {
98-
commonParams.ProjectKey = auditCmd.projectKey
99-
}
94+
commonParams.ProjectKey = auditCmd.projectKey
10095
commonParams.IncludeVulnerabilities = auditCmd.IncludeVulnerabilities
10196
commonParams.IncludeLicenses = auditCmd.IncludeLicenses
10297
commonParams.MultiScanId, commonParams.XscVersion = xsc.GetXscMsiAndVersion(auditCmd.analyticsMetricsService)

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/jfrog/froggit-go v1.16.1
1111
github.com/jfrog/gofrog v1.7.5
1212
github.com/jfrog/jfrog-apps-config v1.0.1
13-
github.com/jfrog/jfrog-cli-core/v2 v2.54.1
13+
github.com/jfrog/jfrog-cli-core/v2 v2.55.2
1414
github.com/jfrog/jfrog-client-go v1.44.2
1515
github.com/magiconair/properties v1.8.7
1616
github.com/owenrumney/go-sarif/v2 v2.3.0
@@ -114,10 +114,10 @@ require (
114114
gopkg.in/warnings.v0 v0.1.2 // indirect
115115
)
116116

117-
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240820213306-d507532c4863
117+
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
118118

119119
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
120120

121-
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240820163739-bb148903e3de
121+
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
122122

123123
// replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go dev

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,16 +890,16 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+
890890
github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
891891
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
892892
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
893-
github.com/jfrog/build-info-go v1.8.9-0.20240820163739-bb148903e3de h1:1nnH4GCKTXH2jhjTCONI4DMNnS8u9c0bhDFZzl6fE5g=
894-
github.com/jfrog/build-info-go v1.8.9-0.20240820163739-bb148903e3de/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY=
893+
github.com/jfrog/build-info-go v1.9.34 h1:bPnW58VpclbpBe/x8XEu/2BIviEOoJrJ5PkRRcmU3Co=
894+
github.com/jfrog/build-info-go v1.9.34/go.mod h1:6mdtqjREK76bHNODXakqKR/+ksJ9dvfLS7H57BZtnLY=
895895
github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U=
896896
github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE=
897897
github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg=
898898
github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298=
899899
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
900900
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
901-
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240820213306-d507532c4863 h1:gD9gzsdmdrJZaqIJ/f16tuyyl64DPMDw2YQRGmHfooY=
902-
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240820213306-d507532c4863/go.mod h1:2/Ccqq0ayMqIuH5AAoneX0CowwdrNWQcs5aKz8iDYkE=
901+
github.com/jfrog/jfrog-cli-core/v2 v2.55.2 h1:Pm4mY1UThSyFGklDl6O8qoJgTgH9jL3i2tor/ux+X8c=
902+
github.com/jfrog/jfrog-cli-core/v2 v2.55.2/go.mod h1:2/Ccqq0ayMqIuH5AAoneX0CowwdrNWQcs5aKz8iDYkE=
903903
github.com/jfrog/jfrog-client-go v1.44.2 h1:5t8tx6NOth6Xq24SdF3MYSd6vo0bTibW93nads2DEuY=
904904
github.com/jfrog/jfrog-client-go v1.44.2/go.mod h1:f5Jfv+RGKVr4smOp4a4pxyBKdlpLG7R894kx2XW+w8c=
905905
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=

0 commit comments

Comments
 (0)