fix: use canonical image name in tag service only to preserve original repo name

Author: psviderski

internal/storage/containerd/blob.go

@@ -121,8 +121,8 @@ func (b *blobStore) Resume(ctx context.Context, id string) (distribution.BlobWri
 func (b *blobStore) Mount(ctx context.Context, sourceRepo reference.Named, dgst digest.Digest) (
 	distribution.Descriptor, error,
 ) {
-	// We could implement cross-repository mounting here by checking if the blob exists
-	// and creating a reference to it, but for now we'll keep it simple.
+	// We could implement cross-repository mounting here by checking if the blob exists and returning its descriptor.
+	// The content in containerd is not repository-namespaced. But for now we'll keep it simple.
 	return distribution.Descriptor{}, distribution.ErrUnsupported
 }
 

internal/storage/containerd/registry.go

@@ -24,11 +24,7 @@ func (n *registry) Scope() distribution.Scope {
 
 // Repository returns an instance of repository for the given name.
 func (n *registry) Repository(_ context.Context, name reference.Named) (distribution.Repository, error) {
-	canonicalName, err := reference.ParseNormalizedNamed(name.String())
-	if err != nil {
-		return nil, err
-	}
-	return newRepository(n.client.client, canonicalName), nil
+	return newRepository(n.client.client, name), nil
 }
 
 // Repositories returns a list of repositories.

internal/storage/containerd/repository.go

@@ -2,6 +2,7 @@ package containerd
 
 import (
 	"context"
+
 	"github.com/containerd/containerd/v2/client"
 	"github.com/distribution/distribution/v3"
 	"github.com/distribution/reference"
@@ -49,8 +50,10 @@ func (r *repository) Blobs(_ context.Context) distribution.BlobStore {
 
 // Tags returns the tag service for the repository backed by the containerd image store.
 func (r *repository) Tags(_ context.Context) distribution.TagService {
+	// Shouldn't return an error as r.name is a valid reference.
+	canonicalRepo, _ := reference.ParseNormalizedNamed(r.name.String())
 	return &tagService{
-		client: r.client,
-		repo:   r.name,
+		client:        r.client,
+		canonicalRepo: canonicalRepo,
 	}
 }

internal/storage/containerd/tags.go

@@ -3,9 +3,10 @@ package containerd
 import (
 	"context"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"strings"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/errdefs"
@@ -15,15 +16,18 @@ import (
 
 // tagService implements distribution.TagService backed by the containerd image store.
 type tagService struct {
-	client *client.Client
-	repo   reference.Named
+	client        *client.Client
+	canonicalRepo reference.Named
 }
 
 // Get retrieves an image descriptor by its tag from the containerd image store.
 func (t *tagService) Get(ctx context.Context, tag string) (distribution.Descriptor, error) {
-	ref, err := reference.WithTag(t.repo, tag)
+	ref, err := reference.WithTag(t.canonicalRepo, tag)
 	if err != nil {
-		return distribution.Descriptor{}, err
+		return distribution.Descriptor{}, distribution.ErrManifestUnknown{
+			Name: t.canonicalRepo.Name(),
+			Tag:  tag,
+		}
 	}
 
 	img, err := t.client.ImageService().Get(ctx, ref.String())
@@ -52,7 +56,7 @@ func (t *tagService) Get(ctx context.Context, tag string) (distribution.Descript
 // It also sets garbage collection labels on the image content in the containerd content store to prevent it from being
 // deleted by garbage collection.
 func (t *tagService) Tag(ctx context.Context, tag string, desc distribution.Descriptor) error {
-	ref, err := reference.WithTag(t.repo, tag)
+	ref, err := reference.WithTag(t.canonicalRepo, tag)
 	if err != nil {
 		return err
 	}
@@ -116,7 +120,7 @@ func (t *tagService) Tag(ctx context.Context, tag string, desc distribution.Desc
 // TODO:
 func (t *tagService) Untag(ctx context.Context, tag string) error {
 	// Construct the full reference
-	ref := fmt.Sprintf("%s:%s", t.repo.String(), tag)
+	ref := fmt.Sprintf("%s:%s", t.canonicalRepo.String(), tag)
 
 	// Delete the image reference
 	err := t.client.ImageService().Delete(ctx, ref)
@@ -138,7 +142,7 @@ func (t *tagService) All(ctx context.Context) ([]string, error) {
 	}
 
 	// Filter by repository name
-	repoName := t.repo.String()
+	repoName := t.canonicalRepo.String()
 	var tags []string
 
 	for _, img := range images {
@@ -162,7 +166,7 @@ func (t *tagService) Lookup(ctx context.Context, desc distribution.Descriptor) (
 	}
 
 	// Find tags that point to this descriptor
-	repoName := t.repo.String()
+	repoName := t.canonicalRepo.String()
 	var tags []string
 
 	for _, img := range images {