chore: registry/repository wiring

Author: psviderski

internal/storage/containerd/registry.go

@@ -24,7 +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) {
-	return newRepository(n.client, name), nil
+	return newRepository(n.client.client, name), nil
 }
 
 // Repositories returns a list of repositories.
@@ -35,13 +35,15 @@ func (n *registry) Repositories(ctx context.Context, repos []string, last string
 }
 
 // Blobs returns a blob enumerator.
+// TODO: return blobStore
 func (n *registry) Blobs() distribution.BlobEnumerator {
 	return &blobEnumerator{
 		client: n.client,
 	}
 }
 
 // BlobStatter returns a blob statter.
+// TODO: return blobStore
 func (n *registry) BlobStatter() distribution.BlobStatter {
 	return &blobStatter{
 		client: n.client,
@@ -69,7 +71,8 @@ func (s *blobStatter) Stat(ctx context.Context, dgst digest.Digest) (distributio
 	ctx = s.client.Context(ctx)
 	info, err := s.client.ContentStore().Info(ctx, dgst)
 	if err != nil {
-		return distribution.Descriptor{}, convertError(err)
+		// TODO: use blob store Stat
+		return distribution.Descriptor{}, err
 	}
 
 	return distribution.Descriptor{

internal/storage/containerd/repository.go

@@ -2,18 +2,21 @@ package containerd
 
 import (
 	"context"
+	"github.com/containerd/containerd/v2/client"
 	"github.com/distribution/distribution/v3"
 	"github.com/distribution/reference"
 )
 
-// repository implements distribution.Repository backed by containerd image store.
+// repository implements distribution.Repository backed by the containerd content and image stores.
 type repository struct {
-	client    *Client
+	client    *client.Client
 	name      reference.Named
-	blobStore distribution.BlobStore
+	blobStore *blobStore
 }
 
-func newRepository(client *Client, name reference.Named) *repository {
+var _ distribution.Repository = &repository{}
+
+func newRepository(client *client.Client, name reference.Named) *repository {
 	return &repository{
 		client: client,
 		name:   name,
@@ -29,23 +32,22 @@ func (r *repository) Named() reference.Named {
 	return r.name
 }
 
-// Manifests returns the manifest service for the repository.
+// Manifests returns the manifest service for the repository backed by the containerd content store.
 func (r *repository) Manifests(
 	_ context.Context, _ ...distribution.ManifestServiceOption,
 ) (distribution.ManifestService, error) {
 	return &manifestService{
-		client:    r.client,
 		repo:      r.name,
 		blobStore: r.blobStore,
 	}, nil
 }
 
-// Blobs returns the blob store for the repository.
+// Blobs returns the blob store for the repository backed by the containerd content store.
 func (r *repository) Blobs(_ context.Context) distribution.BlobStore {
 	return r.blobStore
 }
 
-// Tags returns the tag service for the repository.
+// Tags returns the tag service for the repository backed by the containerd image store.
 func (r *repository) Tags(_ context.Context) distribution.TagService {
 	return &tagService{
 		client: r.client,