fix: address review commentsf from PR #677

Signed-off-by: jxr <[email protected]>

Author: J-jxr

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
 	github.com/containerd/cgroups/v3 v3.0.5
-	github.com/containerd/containerd v1.7.27
 	github.com/containerd/containerd/api v1.9.0
 	github.com/containerd/containerd/v2 v2.1.2
 	github.com/containerd/continuity v0.4.5

go.sum

@@ -61,8 +61,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
 github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
-github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=
-github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
 github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0=
 github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
 github.com/containerd/containerd/v2 v2.1.2 h1:4ZQxB+FVYmwXZgpBcKfar6ieppm3KC5C6FRKvtJ6DRU=

pkg/converter/constant.go

@@ -24,9 +24,6 @@ const (
 	LayerAnnotationNydusSourceDigest  = "containerd.io/snapshot/nydus-source-digest"
 	LayerAnnotationNydusTargetDigest  = "containerd.io/snapshot/nydus-target-digest"
 
-	LayerAnnotationOciSourceDigest    = "containerd.io/snapshot/oci-source-digest"
-	LayerAnnotationOciSourceReference = "containerd.io/snapshot/oci-source-reference"
-
 	LayerAnnotationNydusReferenceBlobIDs = "containerd.io/snapshot/nydus-reference-blob-ids"
 
 	LayerAnnotationUncompressed = "containerd.io/uncompressed"

pkg/converter/convert_unix.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/containerd/containerd/v2/core/content"
 	"github.com/containerd/containerd/v2/core/images"
-	"github.com/containerd/containerd/v2/core/images/converter"
+	containerdConverter "github.com/containerd/containerd/v2/core/images/converter"
 	"github.com/containerd/containerd/v2/pkg/archive"
 	"github.com/containerd/containerd/v2/pkg/archive/compression"
 	"github.com/containerd/containerd/v2/pkg/labels"
@@ -41,7 +41,6 @@ import (
 
 	"github.com/containerd/nydus-snapshotter/pkg/converter/tool"
 	"github.com/containerd/nydus-snapshotter/pkg/label"
-	containerdReconverter "github.com/containerd/nydus-snapshotter/pkg/reconverter"
 )
 
 const EntryBlob = "image.blob"
@@ -948,7 +947,7 @@ func makeOCIBlobDesc(ctx context.Context, cs content.Store, uncompressedDigest,
 
 // LayerConvertFunc returns a function which converts an OCI image layer to
 // a nydus blob layer, and set the media type to "application/vnd.oci.image.layer.nydus.blob.v1".
-func LayerConvertFunc(opt PackOption) converter.ConvertFunc {
+func LayerConvertFunc(opt PackOption) containerdConverter.ConvertFunc {
 	return func(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (*ocispec.Descriptor, error) {
 		if ctx.Err() != nil {
 			// The context is already cancelled, no need to proceed.
@@ -1059,7 +1058,7 @@ func LayerConvertFunc(opt PackOption) converter.ConvertFunc {
 // ConvertHookFunc returns a function which will be used as a callback
 // called for each blob after conversion is done. The function only hooks
 // the index conversion and the manifest conversion.
-func ConvertHookFunc(opt MergeOption) converter.ConvertHookFunc {
+func ConvertHookFunc(opt MergeOption) containerdConverter.ConvertHookFunc {
 	return func(ctx context.Context, cs content.Store, orgDesc ocispec.Descriptor, newDesc *ocispec.Descriptor) (*ocispec.Descriptor, error) {
 		// If the previous conversion did not occur, the `newDesc` may be nil.
 		if newDesc == nil {
@@ -1198,148 +1197,6 @@ func convertManifest(ctx context.Context, cs content.Store, oldDesc ocispec.Desc
 	return newManifestDesc, nil
 }
 
-func ReconvertHookFunc() containerdReconverter.ConvertHookFunc {
-	return func(ctx context.Context, cs content.Store, _ ocispec.Descriptor, newDesc *ocispec.Descriptor) (*ocispec.Descriptor, error) {
-		desc := newDesc
-		if !images.IsManifestType(desc.MediaType) {
-			return desc, nil
-		}
-		if IsNydusBootstrap(*desc) {
-			return desc, nil
-		}
-		var err error
-		var labels map[string]string
-		switch desc.MediaType {
-		case ocispec.MediaTypeImageManifest, images.MediaTypeDockerSchema2Manifest:
-			var manifest ocispec.Manifest
-			labels, err = readJSON(ctx, cs, &manifest, *desc)
-			if err != nil {
-				return nil, errors.Wrap(err, "read manifest")
-			}
-
-			desc, err = writeJSON(ctx, cs, manifest, *desc, labels)
-			if err != nil {
-				return nil, errors.Wrap(err, "write manifest")
-			}
-			return desc, nil
-
-		case ocispec.MediaTypeImageIndex, images.MediaTypeDockerSchema2ManifestList:
-			var index ocispec.Index
-			labels, err = readJSON(ctx, cs, &index, *desc)
-			if err != nil {
-				return nil, errors.Wrap(err, "read manifest index")
-			}
-			for idx, maniDesc := range index.Manifests {
-				var manifest ocispec.Manifest
-				labels, err = readJSON(ctx, cs, &manifest, maniDesc)
-				if err != nil {
-					return nil, errors.Wrap(err, "read manifest")
-				}
-
-				newManiDesc, err := writeJSON(ctx, cs, manifest, maniDesc, labels)
-				if err != nil {
-					return nil, errors.Wrap(err, "write manifest")
-				}
-				index.Manifests[idx] = *newManiDesc
-			}
-			desc, err = writeJSON(ctx, cs, index, *desc, labels)
-			if err != nil {
-				return nil, errors.Wrap(err, "write manifest index")
-			}
-
-			return desc, nil
-
-		default:
-			return nil, errors.Errorf("unsupported media type %s", desc.MediaType)
-		}
-	}
-}
-
-func LayerReconvertFunc(opt UnpackOption) containerdReconverter.ConvertFunc {
-	return func(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (*ocispec.Descriptor, error) {
-		if !images.IsLayerType(desc.MediaType) {
-			return nil, nil
-		}
-
-		// Skip the nydus bootstrap layer.
-		if IsNydusBootstrap(desc) {
-			logrus.Debugf("skip nydus bootstrap layer %s", desc.Digest.String())
-			return &desc, nil
-		}
-
-		ra, err := cs.ReaderAt(ctx, desc)
-		if err != nil {
-			return nil, errors.Wrap(err, "get reader")
-		}
-		defer ra.Close()
-
-		ref := fmt.Sprintf("convert-oci-from-%s", desc.Digest)
-		cw, err := content.OpenWriter(ctx, cs, content.WithRef(ref))
-		if err != nil {
-			return nil, errors.Wrap(err, "open blob writer")
-		}
-
-		var gw io.WriteCloser
-		var mediaType string
-		switch opt.Compressor {
-		case "gzip":
-			gw = gzip.NewWriter(cw)
-			mediaType = ocispec.MediaTypeImageLayerGzip
-		default:
-			gw, err = zstd.NewWriter(cw)
-			if err != nil {
-				return nil, errors.Wrap(err, "create zstd writer")
-			}
-			mediaType = ocispec.MediaTypeImageLayerZstd
-		}
-		var data bytes.Buffer
-		writer := io.Writer(&data)
-		uncompressedDgster := digest.SHA256.Digester()
-
-		err = Unpack(ctx, ra, writer, opt)
-		if err != nil {
-			return nil, errors.Wrap(err, "unpack nydus to tar")
-		}
-
-		compressed := io.MultiWriter(gw, uncompressedDgster.Hash())
-		// _, err = uncompressedDgster.Hash().Write(data.Bytes())
-
-		buffer := bufPool.Get().(*[]byte)
-		defer bufPool.Put(buffer)
-		if _, err = io.CopyBuffer(compressed, bytes.NewReader(data.Bytes()), *buffer); err != nil {
-			return nil, errors.Wrapf(err, "copy bootstrap targz into content store")
-		}
-		if err = gw.Close(); err != nil {
-			return nil, errors.Wrap(err, "close gzip writer")
-		}
-
-		uncompressedDigest := uncompressedDgster.Digest()
-		compressedDgst := cw.Digest()
-		if err = cw.Commit(ctx, 0, compressedDgst, content.WithLabels(map[string]string{
-			LayerAnnotationUncompressed: uncompressedDigest.String(),
-		})); err != nil {
-			if !errdefs.IsAlreadyExists(err) {
-				return nil, errors.Wrap(err, "commit to content store")
-			}
-		}
-		if err = cw.Close(); err != nil {
-			return nil, errors.Wrap(err, "close content store writer")
-		}
-
-		newDesc, err := makeOCIBlobDesc(ctx, cs, uncompressedDigest, compressedDgst, mediaType)
-		if err != nil {
-			return nil, err
-		}
-
-		if opt.Backend != nil {
-			if err := opt.Backend.Push(ctx, cs, *newDesc); err != nil {
-				return nil, errors.Wrap(err, "push to storage backend")
-			}
-		}
-		return newDesc, nil
-	}
-}
-
 // MergeLayers merges a list of nydus blob layer into a nydus bootstrap layer.
 // The media type of the nydus bootstrap layer is "application/vnd.oci.image.layer.v1.tar+gzip".
 func MergeLayers(ctx context.Context, cs content.Store, descs []ocispec.Descriptor, opt MergeOption) (*ocispec.Descriptor, []ocispec.Descriptor, error) {

pkg/converter/convert_windows.go

@@ -53,4 +53,4 @@ func ConvertHookFunc(opt MergeOption) converter.ConvertHookFunc {
 
 func MergeLayers(ctx context.Context, cs content.Store, descs []ocispec.Descriptor, opt MergeOption) (*ocispec.Descriptor, []ocispec.Descriptor, error) {
 	panic("not implemented")
-}
+}