Skip to content

Commit f86f1ce

Browse files
authored
Change the log message when PostScan failed. (#20650)
fixes #20573 remove s from additions/sboms in the link Signed-off-by: stonezdj <[email protected]>
1 parent cc1acc3 commit f86f1ce

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/controller/artifact/model.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func (artifact *Artifact) SetAdditionLink(addition, version string) {
8080
artifact.AdditionLinks[addition] = &AdditionLink{HREF: href, Absolute: false}
8181
}
8282

83+
// SetSBOMAdditionLink set the link of SBOM addition
8384
func (artifact *Artifact) SetSBOMAdditionLink(sbomDgst string, version string) {
8485
if artifact.AdditionLinks == nil {
8586
artifact.AdditionLinks = make(map[string]*AdditionLink)
@@ -88,7 +89,7 @@ func (artifact *Artifact) SetSBOMAdditionLink(sbomDgst string, version string) {
8889
projectName, repo := utils.ParseRepository(artifact.RepositoryName)
8990
// encode slash as %252F
9091
repo = repository.Encode(repo)
91-
href := fmt.Sprintf("/api/%s/projects/%s/repositories/%s/artifacts/%s/additions/%s", version, projectName, repo, sbomDgst, addition)
92+
href := fmt.Sprintf("/api/%s/projects/%s/repositories/%s/artifacts/%s/additions/sbom", version, projectName, repo, sbomDgst)
9293

9394
artifact.AdditionLinks[addition] = &AdditionLink{HREF: href, Absolute: false}
9495
}

src/pkg/scan/job.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ func (j *Job) Run(ctx job.Context, params job.Parameters) error {
304304

305305
reportData, err := handler.PostScan(ctx, req, rp, rawReports[i], startTime, robotAccount)
306306
if err != nil {
307-
myLogger.Errorf("Failed to convert vulnerability data to new schema for report %s, error %v", rp.UUID, err)
307+
myLogger.Errorf("handler failed at PostScan, report %s, error %v", rp.UUID, err)
308308
return err
309309
}
310310

0 commit comments

Comments
 (0)