fix replcation issue on accessory (#16912)

The tag/lable filter only works on the subject manifest, and if the subject manifest is mathed, all the accessories are marked as matched.

Signed-off-by: Wang Yan <wangyan@vmware.com>

src/pkg/reg/adapter/harbor/v2/client.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"github.com/goharbor/harbor/src/common/utils"
 	"github.com/goharbor/harbor/src/controller/artifact"
+	ctltag "github.com/goharbor/harbor/src/controller/tag"
 	"github.com/goharbor/harbor/src/lib/encode/repository"
 	labelmodel "github.com/goharbor/harbor/src/pkg/label/model"
 	"github.com/goharbor/harbor/src/pkg/reg/adapter/harbor/base"
@@ -58,12 +59,16 @@ func (c *client) listArtifacts(repo string) ([]*model.Artifact, error) {
 	var arts []*model.Artifact
 
 	// append the accessory objects behind the subject artifact if it has.
-	var getAccessoryArts = func(art *artifact.Artifact, labels []*labelmodel.Label) ([]*model.Artifact, error) {
+	var getAccessoryArts = func(art *artifact.Artifact, labels []*labelmodel.Label, tags []*ctltag.Tag) ([]*model.Artifact, error) {
 		var accArts = []*model.Artifact{}
 		for _, acc := range art.Accessories {
 			accArt := &model.Artifact{
 				Type:   art.Type,
 				Digest: acc.GetData().Digest,
+				IsAcc:  true,
+			}
+			for _, tag := range tags {
+				accArt.ParentTags = append(accArt.ParentTags, tag.Name)
 			}
 			// set the labels belonging to the subject manifest to the accessories.
 			for _, label := range labels {
@@ -96,7 +101,7 @@ func (c *client) listArtifacts(repo string) ([]*model.Artifact, error) {
 		arts = append(arts, art)
 
 		// append the accessory of index or individual artifact
-		accArts, err := getAccessoryArts(artItem, artItem.Labels)
+		accArts, err := getAccessoryArts(artItem, artItem.Labels, artItem.Tags)
 		if err != nil {
 			return nil, err
 		}
@@ -110,7 +115,7 @@ func (c *client) listArtifacts(repo string) ([]*model.Artifact, error) {
 			if err := c.C.Get(url, &artRef); err != nil {
 				return nil, err
 			}
-			accArts, err := getAccessoryArts(&artRef, artItem.Labels)
+			accArts, err := getAccessoryArts(&artRef, artItem.Labels, artItem.Tags)
 			if err != nil {
 				return nil, err
 			}

src/pkg/reg/filter/artifact.go

@@ -167,8 +167,17 @@ func (a *artifactTagFilter) Filter(artifacts []*model.Artifact) ([]*model.Artifa
 	}
 	var result []*model.Artifact
 	for _, artifact := range artifacts {
+		// for individual artifact, use its own tags to match, reserve the matched tags.
+		// for accessory artifact, use the parent tags to match,
+		var tagsForMatching []string
+		if artifact.IsAcc {
+			tagsForMatching = append(tagsForMatching, artifact.ParentTags...)
+		} else {
+			tagsForMatching = append(tagsForMatching, artifact.Tags...)
+		}
+
 		// untagged artifact
-		if len(artifact.Tags) == 0 {
+		if len(tagsForMatching) == 0 {
 			match, err := util.Match(a.pattern, "")
 			if err != nil {
 				return nil, err
@@ -187,7 +196,7 @@ func (a *artifactTagFilter) Filter(artifacts []*model.Artifact) ([]*model.Artifa
 
 		// tagged artifact
 		var tags []string
-		for _, tag := range artifact.Tags {
+		for _, tag := range tagsForMatching {
 			match, err := util.Match(a.pattern, tag)
 			if err != nil {
 				return nil, err
@@ -206,12 +215,21 @@ func (a *artifactTagFilter) Filter(artifacts []*model.Artifact) ([]*model.Artifa
 			continue
 		}
 		// copy a new artifact here to avoid changing the original one
-		result = append(result, &model.Artifact{
-			Type:   artifact.Type,
-			Digest: artifact.Digest,
-			Labels: artifact.Labels,
-			Tags:   tags,
-		})
+		if artifact.IsAcc {
+			result = append(result, &model.Artifact{
+				Type:   artifact.Type,
+				Digest: artifact.Digest,
+				Labels: artifact.Labels,
+				Tags:   artifact.Tags, // use its own tags to replicate
+			})
+		} else {
+			result = append(result, &model.Artifact{
+				Type:   artifact.Type,
+				Digest: artifact.Digest,
+				Labels: artifact.Labels,
+				Tags:   tags, // only replicate the matched tags
+			})
+		}
 	}
 	return result, nil
 }

src/pkg/reg/model/resource.go

@@ -58,10 +58,12 @@ type Repository struct {
 
 // Artifact is the individual unit that can be replicated
 type Artifact struct {
-	Type   string   `json:"type"`
-	Digest string   `json:"digest"`
-	Labels []string `json:"labels"`
-	Tags   []string `json:"tags"`
+	Type       string   `json:"type"`
+	Digest     string   `json:"digest"`
+	Labels     []string `json:"labels"`
+	Tags       []string `json:"tags"`
+	IsAcc      bool     `json:"-"` // indicate whether it is an accessory artifact
+	ParentTags []string `json:"-"` // the tags belong to the artifact which the accessory is attached.
 }
 
 func (r *ResourceMetadata) String() string {