Skip to content

Commit c0034dd

Browse files
authored
Remove link to platform on audit cmd (#706)
1 parent e9e317b commit c0034dd

7 files changed

Lines changed: 28 additions & 10 deletions

File tree

cli/scancommands.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,7 @@ func UploadCdxCmd(c *components.Context) error {
846846
uploadCmd := upload.NewUploadCycloneDxCommand().SetFileToUpload(c.Arguments[0]).
847847
SetServerDetails(serverDetails).
848848
SetUploadRepository(c.GetStringFlagValue(flags.UploadRepoPath)).
849-
SetProjectKey(c.GetStringFlagValue(flags.Project))
849+
SetProjectKey(c.GetStringFlagValue(flags.Project)).
850+
SetPrintDeploymentView(true)
850851
return commandsCommon.Exec(uploadCmd)
851852
}

commands/audit/audit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func (auditCmd *AuditCommand) getResultWriter(cmdResults *results.SecurityComman
285285
if !cmdResults.EntitledForJas {
286286
messages = []string{coreutils.PrintTitle("In addition to SCA, the ‘jf audit’ command supports the following Advanced Security scans: 'Contextual Analysis', 'Secrets Detection', 'IaC', and ‘SAST’.\nThese scans are available within Advanced Security license. Read more - ") + coreutils.PrintLink(utils.JasInfoURL)}
287287
}
288-
if cmdResults.ResultsPlatformUrl != "" {
288+
if cmdResults.ResultsPlatformUrl != "" && auditCmd.gitContext != nil {
289289
messages = append(messages, output.GetCommandResultsPlatformUrlMessage(cmdResults, true))
290290
}
291291
var tableNotes []string
@@ -744,7 +744,7 @@ func processScanResults(params *AuditParams, cmdResults *results.SecurityCommand
744744
var err error
745745
uploadPath := ""
746746
if params.uploadCdxResults {
747-
log.Info("Finished scanning. Uploading scan results to Artifactory")
747+
log.Debug("Finished scanning. Uploading scan results to Artifactory")
748748
if params.rtResultRepository == "" {
749749
return cmdResults.AddGeneralError(errors.New("results repository was not provided, can't upload scan results to Artifactory"), false)
750750
}

commands/upload/uploadcdx.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type UploadCycloneDxCommand struct {
2929
filePrefix string
3030

3131
// Options
32+
printDeploymentView bool
3233
scanResultsRepository string
3334
projectKey string
3435
}
@@ -75,6 +76,11 @@ func (ucc *UploadCycloneDxCommand) SetProjectKey(projectKey string) *UploadCyclo
7576
return ucc
7677
}
7778

79+
func (ucc *UploadCycloneDxCommand) SetPrintDeploymentView(printDeploymentView bool) *UploadCycloneDxCommand {
80+
ucc.printDeploymentView = printDeploymentView
81+
return ucc
82+
}
83+
7884
func (ucc *UploadCycloneDxCommand) ServerDetails() (*config.ServerDetails, error) {
7985
return ucc.serverDetails, nil
8086
}
@@ -127,7 +133,7 @@ func (ucc *UploadCycloneDxCommand) Upload() (artifactPath string, err error) {
127133
return
128134
}
129135
// Upload the CycloneDx file to the JFrog repository
130-
if artifactPath, err = createRepositoryIfNeededAndUploadFile(ucc.fileToUpload, ucc.serverDetails, ucc.scanResultsRepository, ucc.projectKey); err != nil {
136+
if artifactPath, err = createRepositoryIfNeededAndUploadFile(ucc.fileToUpload, ucc.serverDetails, ucc.scanResultsRepository, ucc.projectKey, ucc.printDeploymentView); err != nil {
131137
return "", fmt.Errorf("failed to upload file %s to repository %s: %w", ucc.fileToUpload, ucc.scanResultsRepository, err)
132138
}
133139
return
@@ -157,7 +163,7 @@ func validateInputFile(cdxFilePath string) (err error) {
157163
return
158164
}
159165

160-
func createRepositoryIfNeededAndUploadFile(filePath string, serverDetails *config.ServerDetails, scanResultsRepository, relatedProjectKey string) (artifactPath string, err error) {
166+
func createRepositoryIfNeededAndUploadFile(filePath string, serverDetails *config.ServerDetails, scanResultsRepository, relatedProjectKey string, printDeploymentView bool) (artifactPath string, err error) {
161167
// scanResultsRepository may be the repository name and after the slash the path in the repository, we want to extract the repository name
162168
repoName := strings.Split(scanResultsRepository, "/")[0]
163169
if repoName == "" {
@@ -176,7 +182,7 @@ func createRepositoryIfNeededAndUploadFile(filePath string, serverDetails *confi
176182
log.Debug(fmt.Sprintf("Uploading scan results to %s", scanResultsRepository))
177183
// target repo is <repository name>/<repository path>, If the target path ends with a slash, the path is assumed to be a folder.
178184
// Else it is assumed to be a file. so we add a slash to the end of the repo to indicate that it is a folder.
179-
uploaded, err := artifactory.UploadArtifactsByPattern(filePath, serverDetails, clientUtils.AddTrailingSlashIfNeeded(scanResultsRepository), relatedProjectKey)
185+
uploaded, err := artifactory.UploadArtifactsByPattern(filePath, serverDetails, clientUtils.AddTrailingSlashIfNeeded(scanResultsRepository), relatedProjectKey, printDeploymentView)
180186
if err != nil {
181187
return "", fmt.Errorf("failed to upload file %s to repository %s: %w", filePath, scanResultsRepository, err)
182188
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/jfrog/gofrog v1.7.6
1717
github.com/jfrog/jfrog-apps-config v1.0.1
1818
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260310063831-ad6064f2f373
19-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260225195817-bc599cec3973
19+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260324124720-40db37833f61
2020
github.com/jfrog/jfrog-client-go v1.55.1-0.20260310073256-b6a77f9c75e5
2121
github.com/magiconair/properties v1.8.10
2222
github.com/owenrumney/go-sarif/v3 v3.2.3

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260310063831-ad6064f2f373 h1:9
185185
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260310063831-ad6064f2f373/go.mod h1:zjbDerW+Pin6VExtlgwRtpnvtI/ySJTnmqnOwXbsrmc=
186186
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260225195817-bc599cec3973 h1:awB01Y4m0cWzmXuR3waf5IQnoQxDlbUmqT+FMWOpjbs=
187187
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260225195817-bc599cec3973/go.mod h1:yhi+XpiEx18a3t8CZ6M2VpAf3EGqKpBhTzoPBTFe0dk=
188+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260324124720-40db37833f61 h1:fPGsJPPFCBr9qE9n0+fobbRZOdN2m2Ovr//8K07jil4=
189+
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260324124720-40db37833f61/go.mod h1:yhi+XpiEx18a3t8CZ6M2VpAf3EGqKpBhTzoPBTFe0dk=
188190
github.com/jfrog/jfrog-client-go v1.55.1-0.20260310073256-b6a77f9c75e5 h1:BBo1kC74XgmFh4B5cNEhC/mhb70/ScLoDNw+P0d26rg=
189191
github.com/jfrog/jfrog-client-go v1.55.1-0.20260310073256-b6a77f9c75e5/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
190192
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=

utils/artifactory/artifactoryutils.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,24 @@ func getArtifactoryRepositoryConfig(tech techutils.Technology) (repoConfig *proj
8686
return
8787
}
8888

89-
func UploadArtifactsByPattern(pattern string, serverDetails *config.ServerDetails, repo, relatedProjectKey string) (uploaded []string, err error) {
89+
func UploadArtifactsByPattern(pattern string, serverDetails *config.ServerDetails, repo, relatedProjectKey string, printDeploymentView bool) (uploaded []string, err error) {
9090
uploadCmd := generic.NewUploadCommand()
9191
uploadCmd.SetUploadConfiguration(&artifactoryUtils.UploadConfiguration{Threads: 1}).SetServerDetails(serverDetails).SetSpec(spec.NewBuilder().Pattern(pattern).Project(relatedProjectKey).Target(repo).Flat(true).BuildSpec())
9292
uploadCmd.SetDetailedSummary(true).SetQuiet(true)
9393
err = uploadCmd.Run()
9494
result := uploadCmd.Result()
9595
defer common.CleanupResult(result, &err)
96-
return getArtifactsPaths(repo, result.Reader()), common.PrintDeploymentView(result.Reader())
96+
if view, e := common.GetDeploymentViewString(result.Reader()); e != nil {
97+
log.Debug(fmt.Sprintf("failed to get deployment view: %v", e))
98+
} else if view != "" {
99+
view = fmt.Sprintf("These files were uploaded:\n\n%s", view)
100+
if printDeploymentView {
101+
log.Info(view)
102+
} else {
103+
log.Debug(view)
104+
}
105+
}
106+
return getArtifactsPaths(repo, result.Reader()), err
97107
}
98108

99109
func getArtifactsPaths(repo string, reader *content.ContentReader) (paths []string) {

utils/results/output/reportartifact.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ func UploadCommandResults(serverDetails *config.ServerDetails, rtResultRepositor
4444
// Set the results platform URL in the command results and log it
4545
if resultsUrl := getCommandScanResultsPlatformUrl(cdxResults, serverDetails, filepath.ToSlash(filepath.Join(rtResultRepository, artifactFinalRepoPath)), artifactName); resultsUrl != "" {
4646
cmdResults.SetResultsPlatformUrl(resultsUrl)
47-
log.Info(GetCommandResultsPlatformUrlMessage(cmdResults, false))
4847
}
4948
return filepath.ToSlash(filepath.Join(artifactFinalRepoPath, artifactName)), nil
5049
}

0 commit comments

Comments
 (0)