[ENT] fix issue with index on artifact (#1835)

* fix issue with index on artifact Signed-off-by: pxp928 <parth.psu@gmail.com> * add test to capture this usecase Signed-off-by: pxp928 <parth.psu@gmail.com> * remove digest only index in arrango Signed-off-by: pxp928 <parth.psu@gmail.com> --------- Signed-off-by: pxp928 <parth.psu@gmail.com>
guacsec · Apr 11, 2024 · 2ec6bc9 · 2ec6bc9
1 parent d0c51f5
commit 2ec6bc9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/internal/testing/backend/artifact_test.go b/internal/testing/backend/artifact_test.go
@@ -66,6 +66,21 @@ func TestArtifacts(t *testing.T) {
 			Digest:    "7a8f47318e4676dacb0142afa0b83029cd7befd9",
 		}},
 		wantErr: false,
+	}, {
+		name: "sha-1",
+		artifactInput: &model.ArtifactInputSpec{
+			Algorithm: "SHA-1",
+			Digest:    "7A8F47318E4676DACB0142AFA0B83029CD7BEFD9",
+		},
+		artifactSpec: &model.ArtifactSpec{
+			Algorithm: ptrfrom.String("SHA-1"),
+			Digest:    ptrfrom.String("7A8F47318E4676DACB0142AFA0B83029CD7BEFD9"),
+		},
+		want: []*model.Artifact{{
+			Algorithm: "sha-1",
+			Digest:    "7a8f47318e4676dacb0142afa0b83029cd7befd9",
+		}},
+		wantErr: false,
 	}, {
 		name: "sha512",
 		artifactInput: &model.ArtifactInputSpec{

diff --git a/pkg/assembler/backends/arangodb/backend.go b/pkg/assembler/backends/arangodb/backend.go
@@ -64,7 +64,7 @@ func init() {
 
 func initIndex(name string, fields []string, unique bool) index {
 	return index{
-		name: name,
+		name:   name,
 		fields: fields,
 		unique: unique,
 	}
@@ -514,7 +514,6 @@ func getCollectionIndexMap() map[string][]index {
 	collectionIndexMap := make(map[string][]index)
 
 	collectionIndexMap[artifactsStr] = []index{
-		initIndex("byDigest", []string{"digest"}, true),
 		initIndex("byArtAndDigest", []string{"algorithm", "digest"}, true),
 	}
 

diff --git a/pkg/assembler/backends/ent/backend/artifact.go b/pkg/assembler/backends/ent/backend/artifact.go
@@ -96,6 +96,8 @@ func upsertBulkArtifact(ctx context.Context, tx *ent.Tx, artInputs []*model.IDor
 	batches := chunk(artInputs, MaxBatchSize)
 	ids := make([]string, 0)
 
+	conflictColumns := []string{artifact.FieldAlgorithm, artifact.FieldDigest}
+
 	for _, artifacts := range batches {
 		creates := make([]*ent.ArtifactCreate, len(artifacts))
 		for i, art := range artifacts {
@@ -108,7 +110,7 @@ func upsertBulkArtifact(ctx context.Context, tx *ent.Tx, artInputs []*model.IDor
 
 		err := tx.Artifact.CreateBulk(creates...).
 			OnConflict(
-				sql.ConflictColumns(artifact.FieldDigest),
+				sql.ConflictColumns(conflictColumns...),
 			).
 			DoNothing().
 			Exec(ctx)
@@ -128,11 +130,14 @@ func generateArtifactCreate(tx *ent.Tx, artifactID *uuid.UUID, art *model.IDorAr
 }
 
 func upsertArtifact(ctx context.Context, tx *ent.Tx, art *model.IDorArtifactInput) (*string, error) {
+
+	conflictColumns := []string{artifact.FieldAlgorithm, artifact.FieldDigest}
+
 	artifactID := generateUUIDKey([]byte(helpers.GetKey[*model.ArtifactInputSpec, string](art.ArtifactInput, helpers.ArtifactServerKey)))
 	insert := generateArtifactCreate(tx, &artifactID, art)
 	err := insert.
 		OnConflict(
-			sql.ConflictColumns(artifact.FieldDigest),
+			sql.ConflictColumns(conflictColumns...),
 		).
 		DoNothing().
 		Exec(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/artifact.go b/pkg/assembler/backends/ent/schema/artifact.go
@@ -72,7 +72,6 @@ func (Artifact) Edges() []ent.Edge {
 // to query all artifacts using a specific algorithm.
 func (Artifact) Indexes() []ent.Index {
 	return []ent.Index{
-		index.Fields("algorithm"),
-		index.Fields("digest").Unique(),
+		index.Fields("algorithm", "digest").Unique(),
 	}
 }