Change the log message when PostScan failed.

fixes goharbor#20573 remove s from additions/sboms in the link Signed-off-by: stonezdj <[email protected]>
stonezdj · Jul 2, 2024 · e4a14f8 · e4a14f8
1 parent 7ffc378
commit e4a14f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/controller/artifact/model.go b/src/controller/artifact/model.go
@@ -80,6 +80,7 @@ func (artifact *Artifact) SetAdditionLink(addition, version string) {
 	artifact.AdditionLinks[addition] = &AdditionLink{HREF: href, Absolute: false}
 }
 
+// SetSBOMAdditionLink set the link of SBOM addition
 func (artifact *Artifact) SetSBOMAdditionLink(sbomDgst string, version string) {
 	if artifact.AdditionLinks == nil {
 		artifact.AdditionLinks = make(map[string]*AdditionLink)
@@ -88,7 +89,7 @@ func (artifact *Artifact) SetSBOMAdditionLink(sbomDgst string, version string) {
 	projectName, repo := utils.ParseRepository(artifact.RepositoryName)
 	// encode slash as %252F
 	repo = repository.Encode(repo)
-	href := fmt.Sprintf("/api/%s/projects/%s/repositories/%s/artifacts/%s/additions/%s", version, projectName, repo, sbomDgst, addition)
+	href := fmt.Sprintf("/api/%s/projects/%s/repositories/%s/artifacts/%s/additions/sbom", version, projectName, repo, sbomDgst)
 
 	artifact.AdditionLinks[addition] = &AdditionLink{HREF: href, Absolute: false}
 }

diff --git a/src/pkg/scan/job.go b/src/pkg/scan/job.go
@@ -304,7 +304,7 @@ func (j *Job) Run(ctx job.Context, params job.Parameters) error {
 
 		reportData, err := handler.PostScan(ctx, req, rp, rawReports[i], startTime, robotAccount)
 		if err != nil {
-			myLogger.Errorf("Failed to convert vulnerability data to new schema for report %s, error %v", rp.UUID, err)
+			myLogger.Errorf("handler failed at PostScan, report %s, error %v", rp.UUID, err)
 			return err
 		}