Fix mod files and clean up

Author: jackowfish

contrib/nydusify/go.mod

@@ -12,15 +12,16 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.27
 	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/containerd v1.7.23
 	github.com/containerd/containerd/v2 v2.0.5
 	github.com/containerd/continuity v0.4.5
 	github.com/containerd/errdefs v1.0.0
-	github.com/containerd/nydus-snapshotter v0.15.3-0.20250902015632-c9b930c1e283
+	github.com/containerd/nydus-snapshotter v0.15.3
 	github.com/containerd/platforms v1.0.0-rc.1
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli v28.1.1+incompatible
 	github.com/dustin/go-humanize v1.0.1
-	github.com/goharbor/acceleration-service v0.2.19
+	github.com/goharbor/acceleration-service v0.2.21
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-hclog v1.6.2
 	github.com/hashicorp/go-plugin v1.6.0
@@ -59,7 +60,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/cgroups/v3 v3.0.5 // indirect
-	github.com/containerd/containerd v1.7.23 // indirect
 	github.com/containerd/containerd/api v1.9.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/containerd/fifo v1.1.0 // indirect
@@ -129,7 +129,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace (
-	github.com/containerd/containerd/v2 => github.com/nydusaccelerator/containerd/v2 v2.0.0-20250528024712-b96732f49d37
-	github.com/containerd/nydus-snapshotter => github.com/containerd/nydus-snapshotter v0.15.3-0.20250902015632-c9b930c1e283
-)
+replace github.com/containerd/containerd/v2 => github.com/nydusaccelerator/containerd/v2 v2.0.0-20250528024712-b96732f49d37

contrib/nydusify/go.sum

@@ -77,8 +77,8 @@ github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY
 github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/containerd/nydus-snapshotter v0.15.3-0.20250902015632-c9b930c1e283 h1:xkj7CHUTBrIWvq8eveq2UqcVBwLFZVbj8RFWUFxElIw=
-github.com/containerd/nydus-snapshotter v0.15.3-0.20250902015632-c9b930c1e283/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=
+github.com/containerd/nydus-snapshotter v0.15.3 h1:dgeroRQnfgpTgnw2MgsWZCHr71bDbZhlH7cHD4FebHI=
+github.com/containerd/nydus-snapshotter v0.15.3/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=
 github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E=
 github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
 github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=
@@ -125,8 +125,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goharbor/acceleration-service v0.2.19 h1:pZ1iBaUUAZiQReqWHvYMM9f1M/HB2kLeXKmgDdMyCdk=
-github.com/goharbor/acceleration-service v0.2.19/go.mod h1:REj3y6AJjrOZbH0K904W/7QYojkiFECdLomJCyXOgxk=
+github.com/goharbor/acceleration-service v0.2.21 h1:TQEiWKJkBE5jpkJUkLoebKuZegnogG/KsLYR6xBtmjk=
+github.com/goharbor/acceleration-service v0.2.21/go.mod h1:3kXLAYcriP93w+l24k75Dk6CWMq/bhUWKcJ1X+AwWNE=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=

contrib/nydusify/pkg/backend/s3.go

@@ -21,6 +21,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerd/containerd/v2/core/remotes"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -126,12 +127,13 @@ func (b *S3Backend) Upload(ctx context.Context, blobID, blobPath string, size in
 
 	uploader := manager.NewUploader(b.client, func(u *manager.Uploader) {
 		u.PartSize = int64(b.partSize)
-		u.Concurrency = int(b.numUploadThreads)
+		u.Concurrency = b.numUploadThreads
 	})
 	_, err = uploader.Upload(ctx, &s3.PutObjectInput{
-		Bucket: aws.String(b.bucketName),
-		Key:    aws.String(blobObjectKey),
-		Body:   blobFile,
+		Bucket:            aws.String(b.bucketName),
+		Key:               aws.String(blobObjectKey),
+		Body:              blobFile,
+		ChecksumAlgorithm: types.ChecksumAlgorithmCrc32,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "upload blob to s3 backend")

contrib/nydusify/pkg/committer/manager.go

@@ -115,7 +115,7 @@ func (m *Manager) Inspect(ctx context.Context, containerID string) (*InspectResu
 	if err != nil {
 		return nil, errors.Wrapf(err, "get snapshot mount")
 	}
-	
+
 	// Parse overlay mount options properly - they can be in any order
 	for _, option := range mount[0].Options {
 		if strings.HasPrefix(option, "lowerdir=") {