Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c15336a

Browse files
author
Yang Kaiyong
committedMar 22, 2025·
chore: remove snapshotter convert package to third party
Remove snapshotter convert package to third party. Just a workaround to avoid copying nydus-snapshotter code directly. Signed-off-by: Yang Kaiyong <[email protected]>
1 parent 00d348c commit c15336a

25 files changed

+17
-3348
lines changed
 

‎contrib/nydusify/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ require (
3939
require (
4040
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4141
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
42+
github.com/BraveY/snapshotter-converter v0.0.5 // indirect
4243
github.com/CloudNativeAI/model-spec v0.0.2 // indirect
4344
github.com/Microsoft/go-winio v0.6.2 // indirect
4445
github.com/Microsoft/hcsshim v0.11.5 // indirect

‎contrib/nydusify/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
33
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
44
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M=
55
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2/go.mod h1:gCLVsLfv1egrcZu+GoJATN5ts75F2s62ih/457eWzOw=
6+
github.com/BraveY/snapshotter-converter v0.0.5 h1:h3zAB31u16EOkshS2J9Nx40RiWSjH6zd5baOSmjLCOg=
7+
github.com/BraveY/snapshotter-converter v0.0.5/go.mod h1:nOVwsdXqdeltxr12x0t0JIbYDD+cdmdBx0HA2pYpxQY=
68
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
79
github.com/CloudNativeAI/model-spec v0.0.2 h1:uCO86kMk8wwadn8vKs0wT4petig5crByTIngdO3L2cQ=
810
github.com/CloudNativeAI/model-spec v0.0.2/go.mod h1:3U/4zubBfbUkW59ATSg41HnkYyKrKUcKFH/cVdoPQnk=

‎contrib/nydusify/pkg/chunkdict/generator/generator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
originprovider "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
2121
"github.com/goharbor/acceleration-service/pkg/remote"
2222

23+
"github.com/BraveY/snapshotter-converter/converter"
2324
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider"
24-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
2525
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
2626
"github.com/dustin/go-humanize"
2727
"github.com/goharbor/acceleration-service/pkg/platformutil"

‎contrib/nydusify/pkg/committer/commiter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121

2222
"github.com/containerd/containerd/labels"
2323

24+
"github.com/BraveY/snapshotter-converter/converter"
2425
"github.com/containerd/containerd"
2526
"github.com/containerd/containerd/content/local"
2627
"github.com/containerd/containerd/namespaces"
2728
"github.com/containerd/containerd/reference/docker"
2829
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/committer/diff"
2930
parserPkg "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
3031
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
31-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
3232
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
3333
"github.com/dustin/go-humanize"
3434
"github.com/opencontainers/go-digest"

‎contrib/nydusify/pkg/converter/converter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider"
2525
pkgPvd "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
2626

27+
snapConv "github.com/BraveY/snapshotter-converter/converter"
2728
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/external/modctl"
2829
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
29-
snapConv "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
3030
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
3131

3232
"encoding/json"

‎contrib/nydusify/pkg/converter/converter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"testing"
88

9-
snapConv "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
9+
snapConv "github.com/BraveY/snapshotter-converter/converter"
1010
"github.com/opencontainers/go-digest"
1111
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1212

‎contrib/nydusify/pkg/copier/copier.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"path/filepath"
1414
"strings"
1515

16+
"github.com/BraveY/snapshotter-converter/converter"
1617
"github.com/containerd/containerd/archive/compression"
1718
"github.com/containerd/containerd/content"
1819
"github.com/containerd/containerd/images"
@@ -25,7 +26,6 @@ import (
2526
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool"
2627
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider"
2728
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser"
28-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
2929
nydusifyUtils "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
3030
"github.com/dustin/go-humanize"
3131
"github.com/goharbor/acceleration-service/pkg/errdefs"

‎contrib/nydusify/pkg/snapshotter/converter/constant.go

-30
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/convert_unix.go

-1,299
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/convert_windows.go

-56
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/cs_proxy_unix.go

-168
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/tool/builder.go

-388
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/tool/feature.go

-146
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/tool/feature_test.go

-836
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/types.go

-206
This file was deleted.

‎contrib/nydusify/pkg/snapshotter/converter/utils.go

-203
This file was deleted.

‎go.work

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
go 1.23.1
2-
3-
toolchain go1.23.6
1+
go 1.24.0
42

53
use (
64
./contrib/nydus-overlayfs

‎smoke/tests/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"path/filepath"
1212
"testing"
1313

14+
"github.com/BraveY/snapshotter-converter/converter"
1415
"github.com/containerd/log"
15-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
1616
"github.com/stretchr/testify/require"
1717

1818
"github.com/dragonflyoss/nydus/smoke/tests/texture"

‎smoke/tests/external_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/containerd/containerd/content/local"
1919
"github.com/containerd/log"
2020

21+
"github.com/BraveY/snapshotter-converter/converter"
2122
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/external/modctl"
22-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
2323
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/external"
2424
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/external/backend"
2525
"github.com/dragonflyoss/nydus/smoke/tests/tool"

‎smoke/tests/hot_upgrade_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"testing"
1111
"time"
1212

13+
"github.com/BraveY/snapshotter-converter/converter"
1314
"github.com/containerd/nydus-snapshotter/pkg/supervisor"
14-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
1515
"github.com/dragonflyoss/nydus/smoke/tests/texture"
1616
"github.com/dragonflyoss/nydus/smoke/tests/tool"
1717
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"

‎smoke/tests/native_layer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"testing"
1010

11-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
11+
"github.com/BraveY/snapshotter-converter/converter"
1212
"github.com/dragonflyoss/nydus/smoke/tests/texture"
1313
"github.com/dragonflyoss/nydus/smoke/tests/tool"
1414
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"

‎smoke/tests/overlay_fs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"path/filepath"
1111
"testing"
1212

13+
"github.com/BraveY/snapshotter-converter/converter"
1314
"github.com/containerd/log"
14-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
1515
"github.com/dragonflyoss/nydus/smoke/tests/texture"
1616
"github.com/dragonflyoss/nydus/smoke/tests/tool"
1717
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"

‎smoke/tests/texture/layer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"syscall"
1111
"testing"
1212

13-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
13+
"github.com/BraveY/snapshotter-converter/converter"
1414
"github.com/dragonflyoss/nydus/smoke/tests/tool"
1515
"github.com/opencontainers/go-digest"
1616
"github.com/stretchr/testify/require"

‎smoke/tests/tool/layer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"syscall"
1717
"testing"
1818

19+
"github.com/BraveY/snapshotter-converter/converter"
1920
"github.com/containerd/containerd/archive"
2021
"github.com/containerd/containerd/content/local"
21-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
2222
"github.com/opencontainers/go-digest"
2323
"github.com/pkg/xattr"
2424
"github.com/stretchr/testify/assert"

‎smoke/tests/zran_layer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"testing"
1010

11-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/snapshotter/converter"
11+
"github.com/BraveY/snapshotter-converter/converter"
1212
"github.com/dragonflyoss/nydus/smoke/tests/texture"
1313
"github.com/dragonflyoss/nydus/smoke/tests/tool"
1414
"github.com/dragonflyoss/nydus/smoke/tests/tool/test"

0 commit comments

Comments
 (0)
Please sign in to comment.