Ent - CertifyVuln: fixed noVuln management (#1240)

Signed-off-by: mrizzi <mrizzi@redhat.com>
guacsec · Sep 8, 2023 · 4f2c49e · 4f2c49e
1 parent c0efbbf
commit 4f2c49e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/pkg/assembler/backends/ent/backend/certifyVuln.go b/pkg/assembler/backends/ent/backend/certifyVuln.go
@@ -48,21 +48,12 @@ func (b *EntBackend) IngestCertifyVuln(ctx context.Context, pkg model.PkgInputSp
 			certifyvuln.FieldDbVersion,
 		}
 
-		var conflictPredicate *sql.Predicate
-
-		if spec.Type == NoVuln {
-			// No vulnerability found, so we don't have a vulnerability ID to set
-			conflictPredicate = sql.And(sql.IsNull(certifyvuln.FieldVulnerabilityID))
-		} else {
-			vuln, err := getVulnerabilityFromInput(ctx, client.Client(), spec)
-			if err != nil {
-				return nil, err
-			}
-
-			insert.SetVulnerability(vuln)
-			columns = append(columns, certifyvuln.FieldVulnerabilityID)
-			conflictPredicate = sql.And(sql.NotNull(certifyvuln.FieldVulnerabilityID))
+		vuln, err := getVulnerabilityFromInput(ctx, client.Client(), spec)
+		if err != nil {
+			return nil, err
 		}
+		insert.SetVulnerability(vuln)
+		columns = append(columns, certifyvuln.FieldVulnerabilityID)
 
 		pv, err := getPkgVersion(ctx, client.Client(), pkg)
 		if err != nil {
@@ -82,7 +73,6 @@ func (b *EntBackend) IngestCertifyVuln(ctx context.Context, pkg model.PkgInputSp
 		id, err := insert.
 			OnConflict(
 				sql.ConflictColumns(columns...),
-				sql.ConflictWhere(conflictPredicate),
 			).
 			Ignore().
 			ID(ctx)

diff --git a/pkg/assembler/backends/ent/migrate/schema.go b/pkg/assembler/backends/ent/migrate/schema.go
diff --git a/pkg/assembler/backends/ent/schema/certifyvuln.go b/pkg/assembler/backends/ent/schema/certifyvuln.go
@@ -17,7 +17,6 @@ package schema
 
 import (
 	"entgo.io/ent"
-	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema/edge"
 	"entgo.io/ent/schema/field"
 	"entgo.io/ent/schema/index"
@@ -54,7 +53,6 @@ func (CertifyVuln) Edges() []ent.Edge {
 // Indexes of the Vulnerability.
 func (CertifyVuln) Indexes() []ent.Index {
 	return []ent.Index{
-		index.Fields("db_uri", "db_version", "scanner_uri", "scanner_version", "origin", "collector").Edges("vulnerability", "package").Unique().Annotations(entsql.IndexWhere("vulnerability_id IS NOT NULL")),
-		index.Fields("db_uri", "db_version", "scanner_uri", "scanner_version", "origin", "collector").Edges("package").Unique().Annotations(entsql.IndexWhere("vulnerability_id IS NULL")),
+		index.Fields("db_uri", "db_version", "scanner_uri", "scanner_version", "origin", "collector").Edges("vulnerability", "package").Unique(),
 	}
 }