✨ Rename artifact_artifacts sub artifact field (#337)

go-sigma · Mar 11, 2024 · ea725b4 · ea725b4
1 parent e28bf37
commit ea725b4
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 56 deletions.
diff --git a/pkg/dal/dao/artifact.go b/pkg/dal/dao/artifact.go
@@ -141,13 +141,13 @@ func (s *artifactService) FindAssociateWithArtifact(ctx context.Context, ids []i
 	if err != nil {
 		return nil, err
 	}
-	var artifactIndexes []int64
-	err = s.tx.Blob.WithContext(ctx).UnderlyingDB().Raw("SELECT artifact_index_id FROM artifact_artifacts WHERE artifact_index_id in (?)", ids).Scan(&artifactIndexes).Error
+	var artifactSubs []int64
+	err = s.tx.Blob.WithContext(ctx).UnderlyingDB().Raw("SELECT artifact_sub_id FROM artifact_artifacts WHERE artifact_sub_id in (?)", ids).Scan(&artifactSubs).Error
 	if err != nil {
 		return nil, err
 	}
 	resultSet := mapset.NewSet(artifacts...)
-	resultSet.Append(artifactIndexes...)
+	resultSet.Append(artifactSubs...)
 	return resultSet.ToSlice(), err
 }
 
@@ -209,7 +209,7 @@ func (s *artifactService) AssociateBlobs(ctx context.Context, artifact *models.A
 
 // AssociateArtifact ...
 func (s *artifactService) AssociateArtifact(ctx context.Context, artifact *models.Artifact, artifacts []*models.Artifact) error {
-	return s.tx.Artifact.ArtifactIndexes.WithContext(ctx).Model(artifact).Append(artifacts...)
+	return s.tx.Artifact.ArtifactSubs.WithContext(ctx).Model(artifact).Append(artifacts...)
 }
 
 // Incr increases the pull times of the artifact.

diff --git a/pkg/dal/dao/tag.go b/pkg/dal/dao/tag.go
@@ -171,9 +171,9 @@ func (s *tagService) FindWithDayCursor(ctx context.Context, repositoryID int64,
 // GetByID gets the tag with the specified tag ID.
 func (s *tagService) GetByID(ctx context.Context, tagID int64) (*models.Tag, error) {
 	q := s.tx.Tag.WithContext(ctx).Where(s.tx.Tag.ID.Eq(tagID))
-	q.UnderlyingDB().Preload("Artifact.ArtifactIndexes.Vulnerability")
-	q.UnderlyingDB().Preload("Artifact.ArtifactIndexes.Sbom")
-	q.Preload(s.tx.Tag.Artifact.ArtifactIndexes)
+	q.UnderlyingDB().Preload("Artifact.ArtifactSubs.Vulnerability")
+	q.UnderlyingDB().Preload("Artifact.ArtifactSubs.Sbom")
+	q.Preload(s.tx.Tag.Artifact.ArtifactSubs)
 	q.Preload(s.tx.Tag.Artifact.Vulnerability)
 	q.Preload(s.tx.Tag.Artifact.Sbom)
 	return q.First()
@@ -270,14 +270,14 @@ func (s *tagService) ListTag(ctx context.Context, repositoryID int64, name *stri
 		q = q.Order(s.tx.Tag.UpdatedAt.Desc())
 	}
 	if len(types) > 0 {
-		q = q.Preload(s.tx.Tag.Artifact.ArtifactIndexes.On(s.tx.Artifact.Type.In(mTypes...)))
+		q = q.Preload(s.tx.Tag.Artifact.ArtifactSubs.On(s.tx.Artifact.Type.In(mTypes...)))
 	} else {
-		q = q.Preload(s.tx.Tag.Artifact.ArtifactIndexes)
+		q = q.Preload(s.tx.Tag.Artifact.ArtifactSubs)
 	}
 	q = q.Preload(s.tx.Tag.Artifact.Vulnerability)
 	q = q.Preload(s.tx.Tag.Artifact.Sbom)
-	q.UnderlyingDB().Preload("Artifact.ArtifactIndexes.Vulnerability")
-	q.UnderlyingDB().Preload("Artifact.ArtifactIndexes.Sbom")
+	q.UnderlyingDB().Preload("Artifact.ArtifactSubs.Vulnerability")
+	q.UnderlyingDB().Preload("Artifact.ArtifactSubs.Sbom")
 	return q.FindByPage(ptr.To(pagination.Limit)*(ptr.To(pagination.Page)-1), ptr.To(pagination.Limit))
 }
 

diff --git a/pkg/dal/migrations/mysql/0002_upgrade.down.sql b/pkg/dal/migrations/mysql/0002_upgrade.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `artifact_artifacts` RENAME COLUMN `artifact_sub_id` TO `artifact_index_id`;
+
diff --git a/pkg/dal/migrations/mysql/0002_upgrade.up.sql b/pkg/dal/migrations/mysql/0002_upgrade.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `artifact_artifacts` RENAME COLUMN `artifact_index_id` TO `artifact_sub_id`;
+
diff --git a/pkg/dal/migrations/postgresql/0002_upgrade.down.sql b/pkg/dal/migrations/postgresql/0002_upgrade.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "artifact_artifacts" RENAME COLUMN "artifact_sub_id" TO "artifact_index_id";
+
diff --git a/pkg/dal/migrations/postgresql/0002_upgrade.up.sql b/pkg/dal/migrations/postgresql/0002_upgrade.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "artifact_artifacts" RENAME COLUMN "artifact_index_id" TO "artifact_sub_id";
+
diff --git a/pkg/dal/migrations/sqlite3/0002_upgrade.down.sql b/pkg/dal/migrations/sqlite3/0002_upgrade.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `artifact_artifacts` RENAME COLUMN `artifact_sub_id` TO `artifact_index_id`;
+
diff --git a/pkg/dal/migrations/sqlite3/0002_upgrade.up.sql b/pkg/dal/migrations/sqlite3/0002_upgrade.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `artifact_artifacts` RENAME COLUMN `artifact_index_id` TO `artifact_sub_id`;
+
diff --git a/pkg/dal/models/artifact.go b/pkg/dal/models/artifact.go
@@ -52,12 +52,11 @@ type Artifact struct {
 	ReferrerID *int64
 	Referrer   *Artifact
 
-	// ArtifactIndexes Perhaps the variable naming here is not ideal, but we don't want to change it.
-	// In the artifact_artifacts table, artifact_id refers to the upper-level artifact index,
-	// and artifact_index_id refers to the lower-level artifact.
-	ArtifactIndexes []*Artifact `gorm:"many2many:artifact_artifacts;"`
-	Blobs           []*Blob     `gorm:"many2many:artifact_blobs;"`
-	Tags            []*Tag      `gorm:"foreignKey:ArtifactID;"`
+	// ArtifactSubs In the artifact_artifacts table, artifact_id refers to the upper-level artifact index,
+	// and artifact_sub_id refers to the lower-level artifact.
+	ArtifactSubs []*Artifact `gorm:"many2many:artifact_artifacts;"`
+	Blobs        []*Blob     `gorm:"many2many:artifact_blobs;"`
+	Tags         []*Tag      `gorm:"foreignKey:ArtifactID;"`
 }
 
 // ArtifactSizeByNamespaceOrRepository ...
@@ -71,7 +70,7 @@ type ArtifactSizeByNamespaceOrRepository interface {
 
 // ArtifactAssociated ...
 type ArtifactAssociated interface {
-	// SELECT COUNT(artifact_id) as count FROM artifact_artifacts LEFT JOIN artifacts ON artifacts.id = artifact_artifacts.artifact_id WHERE artifacts.deleted_at = 0 AND artifact_index_id=@artifactID
+	// SELECT COUNT(artifact_id) as count FROM artifact_artifacts LEFT JOIN artifacts ON artifacts.id = artifact_artifacts.artifact_id WHERE artifacts.deleted_at = 0 AND artifact_sub_id=@artifactID
 	ArtifactAssociated(artifactID int64) (gen.M, error)
 }
 

diff --git a/pkg/dal/query/artifact_sboms.gen.go b/pkg/dal/query/artifact_sboms.gen.go
diff --git a/pkg/dal/query/artifact_vulnerabilities.gen.go b/pkg/dal/query/artifact_vulnerabilities.gen.go
diff --git a/pkg/dal/query/artifacts.gen.go b/pkg/dal/query/artifacts.gen.go
diff --git a/pkg/dal/query/blobs.gen.go b/pkg/dal/query/blobs.gen.go
diff --git a/pkg/dal/query/tags.gen.go b/pkg/dal/query/tags.gen.go
diff --git a/pkg/handlers/distribution/manifest/manifest_put.go b/pkg/handlers/distribution/manifest/manifest_put.go
@@ -336,7 +336,7 @@ func (h *handler) putManifestIndex(ctx context.Context, user *models.User, diges
 		return xerrors.DSErrCodeUnknown
 	}
 
-	artifactObj.ArtifactIndexes = artifactObjs
+	artifactObj.ArtifactSubs = artifactObjs
 
 	err = query.Q.Transaction(func(tx *query.Query) error {
 		artifactService := h.artifactServiceFactory.New(tx)

diff --git a/pkg/handlers/tags/tags_get.go b/pkg/handlers/tags/tags_get.go
@@ -92,8 +92,8 @@ func (h *handler) GetTag(c echo.Context) error {
 		return xerrors.NewHTTPError(c, xerrors.HTTPErrCodeInternalError, err.Error())
 	}
 
-	var artifacts = make([]types.TagItemArtifact, 0, len(tag.Artifact.ArtifactIndexes))
-	for _, item := range tag.Artifact.ArtifactIndexes {
+	var artifacts = make([]types.TagItemArtifact, 0, len(tag.Artifact.ArtifactSubs))
+	for _, item := range tag.Artifact.ArtifactSubs {
 		artifacts = append(artifacts, types.TagItemArtifact{
 			ID:            item.ID,
 			Digest:        item.Digest,

diff --git a/pkg/handlers/tags/tags_list.go b/pkg/handlers/tags/tags_list.go
@@ -127,7 +127,7 @@ func (h *handler) ListTag(c echo.Context) error {
 			continue
 		}
 		var artifacts []types.TagItemArtifact
-		for _, item := range tag.Artifact.ArtifactIndexes {
+		for _, item := range tag.Artifact.ArtifactSubs {
 			artifacts = append(artifacts, types.TagItemArtifact{
 				ID:              item.ID,
 				Digest:          item.Digest,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE `artifact_artifacts` RENAME COLUMN `artifact_sub_id` TO `artifact_index_id`;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE "artifact_artifacts" RENAME COLUMN "artifact_sub_id" TO "artifact_index_id";