Merge ad102f75ee into 9471f5d5a6

src/controller/event/handler/internal/artifact.go

@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/goharbor/harbor/src/controller/artifact"
-	"github.com/goharbor/harbor/src/controller/artifact/processor/sbom"
 	"github.com/goharbor/harbor/src/controller/event"
 	"github.com/goharbor/harbor/src/controller/event/operator"
 	"github.com/goharbor/harbor/src/controller/repository"
@@ -37,7 +36,6 @@ import (
 	"github.com/goharbor/harbor/src/pkg"
 	pkgArt "github.com/goharbor/harbor/src/pkg/artifact"
 	"github.com/goharbor/harbor/src/pkg/scan/report"
-	v1 "github.com/goharbor/harbor/src/pkg/scan/rest/v1"
 	"github.com/goharbor/harbor/src/pkg/task"
 )
 
@@ -321,11 +319,6 @@ func (a *ArtifactEventHandler) onDelete(ctx context.Context, event *event.Artifa
 		log.Errorf("failed to delete scan reports of artifact %v, error: %v", unrefDigests, err)
 	}
 
-	if event.Artifact.Type == sbom.ArtifactTypeSBOM && len(event.Artifact.Digest) > 0 {
-		if err := reportMgr.DeleteByExtraAttr(ctx, v1.MimeTypeSBOMReport, "sbom_digest", event.Artifact.Digest); err != nil {
-			log.Errorf("failed to delete scan reports of with sbom digest %v, error: %v", event.Artifact.Digest, err)
-		}
-	}
 	return nil
 }
 

src/pkg/scan/dao/scan/report.go

@@ -16,7 +16,6 @@ package scan
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/lib/orm"
@@ -39,8 +38,6 @@ type DAO interface {
 	UpdateReportData(ctx context.Context, uuid string, report string) error
 	// Update update report
 	Update(ctx context.Context, r *Report, cols ...string) error
-	// DeleteByExtraAttr delete the scan_report by mimeType and extra attribute
-	DeleteByExtraAttr(ctx context.Context, mimeType, attrName, attrValue string) error
 }
 
 // New returns an instance of the default DAO
@@ -113,14 +110,3 @@ func (d *dao) Update(ctx context.Context, r *Report, cols ...string) error {
 	}
 	return nil
 }
-
-func (d *dao) DeleteByExtraAttr(ctx context.Context, mimeType, attrName, attrValue string) error {
-	o, err := orm.FromContext(ctx)
-	if err != nil {
-		return err
-	}
-	delReportSQL := "delete from scan_report where mime_type = ? and report::jsonb @> ?"
-	dgstJSONStr := fmt.Sprintf(`{"%s":"%s"}`, attrName, attrValue)
-	_, err = o.Raw(delReportSQL, mimeType, dgstJSONStr).Exec()
-	return err
-}

src/pkg/scan/dao/scan/report_test.go

@@ -53,23 +53,14 @@ func (suite *ReportTestSuite) SetupTest() {
 		RegistrationUUID: "ruuid",
 		MimeType:         v1.MimeTypeNativeReport,
 	}
+
 	suite.create(r)
-	sbomReport := &Report{
-		UUID:             "uuid3",
-		Digest:           "digest1003",
-		RegistrationUUID: "ruuid",
-		MimeType:         v1.MimeTypeSBOMReport,
-		Report:           `{"sbom_digest": "sha256:abc"}`,
-	}
-	suite.create(sbomReport)
 }
 
 // TearDownTest clears enf for test case.
 func (suite *ReportTestSuite) TearDownTest() {
 	_, err := suite.dao.DeleteMany(orm.Context(), q.Query{Keywords: q.KeyWords{"uuid": "uuid"}})
 	require.NoError(suite.T(), err)
-	_, err = suite.dao.DeleteMany(orm.Context(), q.Query{Keywords: q.KeyWords{"uuid": "uuid3"}})
-	require.NoError(suite.T(), err)
 }
 
 // TestReportList tests list reports with query parameters.
@@ -104,7 +95,7 @@ func (suite *ReportTestSuite) TestReportUpdateReportData() {
 	err := suite.dao.UpdateReportData(orm.Context(), "uuid", "{}")
 	suite.Require().NoError(err)
 
-	l, err := suite.dao.List(orm.Context(), q.New(q.KeyWords{"uuid": "uuid"}))
+	l, err := suite.dao.List(orm.Context(), nil)
 	suite.Require().NoError(err)
 	suite.Require().Equal(1, len(l))
 	suite.Equal("{}", l[0].Report)
@@ -113,17 +104,6 @@ func (suite *ReportTestSuite) TestReportUpdateReportData() {
 	suite.Require().NoError(err)
 }
 
-func (suite *ReportTestSuite) TestDeleteReportBySBOMDigest() {
-	l, err := suite.dao.List(orm.Context(), nil)
-	suite.Require().NoError(err)
-	suite.Equal(2, len(l))
-	err = suite.dao.DeleteByExtraAttr(orm.Context(), v1.MimeTypeSBOMReport, "sbom_digest", "sha256:abc")
-	suite.Require().NoError(err)
-	l2, err := suite.dao.List(orm.Context(), nil)
-	suite.Require().NoError(err)
-	suite.Equal(1, len(l2))
-}
-
 func (suite *ReportTestSuite) create(r *Report) {
 	id, err := suite.dao.Create(orm.Context(), r)
 	suite.Require().NoError(err)

src/pkg/scan/report/manager.go

@@ -104,8 +104,6 @@ type Manager interface {
 
 	// Update update report information
 	Update(ctx context.Context, r *scan.Report, cols ...string) error
-	// DeleteByExtraAttr delete scan_report by sbom_digest
-	DeleteByExtraAttr(ctx context.Context, mimeType, attrName, attrValue string) error
 }
 
 // basicManager is a default implementation of report manager.
@@ -228,7 +226,3 @@ func (bm *basicManager) List(ctx context.Context, query *q.Query) ([]*scan.Repor
 func (bm *basicManager) Update(ctx context.Context, r *scan.Report, cols ...string) error {
 	return bm.dao.Update(ctx, r, cols...)
 }
-
-func (bm *basicManager) DeleteByExtraAttr(ctx context.Context, mimeType, attrName, attrValue string) error {
-	return bm.dao.DeleteByExtraAttr(ctx, mimeType, attrName, attrValue)
-}

src/testing/pkg/scan/report/manager.go

@@ -87,24 +87,6 @@ func (_m *Manager) DeleteByDigests(ctx context.Context, digests ...string) error
 	return r0
 }
 
-// DeleteByExtraAttr provides a mock function with given fields: ctx, mimeType, attrName, attrValue
-func (_m *Manager) DeleteByExtraAttr(ctx context.Context, mimeType string, attrName string, attrValue string) error {
-	ret := _m.Called(ctx, mimeType, attrName, attrValue)
-
-	if len(ret) == 0 {
-		panic("no return value specified for DeleteByExtraAttr")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok {
-		r0 = rf(ctx, mimeType, attrName, attrValue)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // GetBy provides a mock function with given fields: ctx, digest, registrationUUID, mimeTypes
 func (_m *Manager) GetBy(ctx context.Context, digest string, registrationUUID string, mimeTypes []string) ([]*scan.Report, error) {
 	ret := _m.Called(ctx, digest, registrationUUID, mimeTypes)