github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update go module to github.com/containerd/containerd/v2

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-10-29 20:52:21 -07:00
parent abfc8be530
commit 5fdf55e493
748 changed files with 3443 additions and 2839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/fuzz/archive_fuzzer.go
View File

@@ -25,9 +25,9 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/archive"
"github.com/containerd/containerd/content/local"
imageArchive "github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/content/local"
imageArchive "github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

58
contrib/fuzz/builtins.go
View File

@@ -18,33 +18,33 @@ package fuzz
import (
// base containerd imports
_ "github.com/containerd/containerd/diff/walking/plugin"
_ "github.com/containerd/containerd/events/plugin"
_ "github.com/containerd/containerd/gc/scheduler"
_ "github.com/containerd/containerd/leases/plugin"
_ "github.com/containerd/containerd/metadata/plugin"
_ "github.com/containerd/containerd/pkg/cri"
_ "github.com/containerd/containerd/pkg/nri/plugin"
_ "github.com/containerd/containerd/plugins/imageverifier"
_ "github.com/containerd/containerd/plugins/sandbox"
_ "github.com/containerd/containerd/plugins/streaming"
_ "github.com/containerd/containerd/plugins/transfer"
_ "github.com/containerd/containerd/runtime/restart/monitor"
_ "github.com/containerd/containerd/runtime/v2"
_ "github.com/containerd/containerd/services/containers"
_ "github.com/containerd/containerd/services/content"
_ "github.com/containerd/containerd/services/diff"
_ "github.com/containerd/containerd/services/events"
_ "github.com/containerd/containerd/services/healthcheck"
_ "github.com/containerd/containerd/services/images"
_ "github.com/containerd/containerd/services/introspection"
_ "github.com/containerd/containerd/services/leases"
_ "github.com/containerd/containerd/services/namespaces"
_ "github.com/containerd/containerd/services/opt"
_ "github.com/containerd/containerd/services/sandbox"
_ "github.com/containerd/containerd/services/snapshots"
_ "github.com/containerd/containerd/services/streaming"
_ "github.com/containerd/containerd/services/tasks"
_ "github.com/containerd/containerd/services/transfer"
_ "github.com/containerd/containerd/services/version"
_ "github.com/containerd/containerd/v2/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/pkg/cri"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "github.com/containerd/containerd/v2/runtime/restart/monitor"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/services/containers"
_ "github.com/containerd/containerd/v2/services/content"
_ "github.com/containerd/containerd/v2/services/diff"
_ "github.com/containerd/containerd/v2/services/events"
_ "github.com/containerd/containerd/v2/services/healthcheck"
_ "github.com/containerd/containerd/v2/services/images"
_ "github.com/containerd/containerd/v2/services/introspection"
_ "github.com/containerd/containerd/v2/services/leases"
_ "github.com/containerd/containerd/v2/services/namespaces"
_ "github.com/containerd/containerd/v2/services/opt"
_ "github.com/containerd/containerd/v2/services/sandbox"
_ "github.com/containerd/containerd/v2/services/snapshots"
_ "github.com/containerd/containerd/v2/services/streaming"
_ "github.com/containerd/containerd/v2/services/tasks"
_ "github.com/containerd/containerd/v2/services/transfer"
_ "github.com/containerd/containerd/v2/services/version"
)

12
contrib/fuzz/builtins_linux.go
View File

@@ -18,10 +18,10 @@ package fuzz
import (
// Linux specific imports
_ "github.com/containerd/containerd/metrics/cgroups"
_ "github.com/containerd/containerd/metrics/cgroups/v2"
_ "github.com/containerd/containerd/runtime/v2/runc/options"
_ "github.com/containerd/containerd/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/snapshots/native/plugin"
_ "github.com/containerd/containerd/snapshots/overlay/plugin"
_ "github.com/containerd/containerd/v2/metrics/cgroups"
_ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
)

4
contrib/fuzz/builtins_unix.go
View File

@@ -20,6 +20,6 @@ package fuzz
import (
// Unix specific imports
_ "github.com/containerd/containerd/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin"
)

8
contrib/fuzz/builtins_windows.go
View File

@@ -18,8 +18,8 @@ package fuzz
import (
// Windows specific imports
_ "github.com/containerd/containerd/diff/lcow"
_ "github.com/containerd/containerd/diff/windows"
_ "github.com/containerd/containerd/snapshots/lcow"
_ "github.com/containerd/containerd/snapshots/windows"
_ "github.com/containerd/containerd/v2/diff/lcow"
_ "github.com/containerd/containerd/v2/diff/windows"
_ "github.com/containerd/containerd/v2/snapshots/lcow"
_ "github.com/containerd/containerd/v2/snapshots/windows"
)

4
contrib/fuzz/containerd_import_fuzzer.go
View File

@@ -21,8 +21,8 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/namespaces"
)
func fuzzContext() (context.Context, context.CancelFunc) {

6
contrib/fuzz/content_fuzzer.go
View File

@@ -29,9 +29,9 @@ import (
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/images/archive"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images/archive"
)
// checkBlobPath performs some basic validation

8
contrib/fuzz/cri_fuzzer.go
View File

@@ -24,10 +24,10 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
"github.com/containerd/containerd/pkg/cri/server"
"github.com/containerd/containerd/pkg/cri/server/images"
containerstore "github.com/containerd/containerd/pkg/cri/store/container"
sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
"github.com/containerd/containerd/v2/pkg/cri/server"
"github.com/containerd/containerd/v2/pkg/cri/server/images"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"
)
var (

6
contrib/fuzz/cri_sbserver_fuzzer.go
View File

@@ -21,9 +21,9 @@ package fuzz
import (
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd"
criconfig "github.com/containerd/containerd/pkg/cri/config"
"github.com/containerd/containerd/pkg/cri/server"
"github.com/containerd/containerd/v2"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/server"
)
func FuzzCRISandboxServer(data []byte) int {

6
contrib/fuzz/cri_server_fuzzer.go
View File

@@ -21,9 +21,9 @@ package fuzz
import (
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd"
criconfig "github.com/containerd/containerd/pkg/cri/config"
"github.com/containerd/containerd/pkg/cri/server"
"github.com/containerd/containerd/v2"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
"github.com/containerd/containerd/v2/pkg/cri/server"
)
func FuzzCRIServer(data []byte) int {

8
contrib/fuzz/daemon.go
View File

@@ -23,10 +23,10 @@ import (
"sync"
"time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/services/server"
"github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/services/server"
"github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/log"
)

8
contrib/fuzz/diff_fuzzer.go
View File

@@ -21,10 +21,10 @@ import (
"os"
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/diff/apply"
"github.com/containerd/containerd/diff/walking"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/diff/apply"
"github.com/containerd/containerd/v2/diff/walking"
"github.com/containerd/containerd/v2/mount"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

8
contrib/fuzz/exchange_fuzzer.go
View File

@@ -19,10 +19,10 @@ import (
"context"
fuzz "github.com/AdaLogics/go-fuzz-headers"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/namespaces"
eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/namespaces"
)
func FuzzExchange(data []byte) int {

6
contrib/fuzz/fuzz_images.go
View File

@@ -20,9 +20,9 @@ import (
"os"
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/platforms"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

18
contrib/fuzz/metadata_fuzzer.go
View File

@@ -26,15 +26,15 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
bolt "go.etcd.io/bbolt"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/native"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/containerd/v2/snapshots/native"
)
func testEnv() (context.Context, *bolt.DB, func(), error) {

2
contrib/fuzz/oss_fuzz_build.sh
View File

@@ -29,7 +29,7 @@ compile_fuzzers() {
if [[ "$line" =~ (.*)/.*:.*(Fuzz[A-Za-z0-9]+) ]]; then
local pkg=${BASH_REMATCH[1]}
local func=${BASH_REMATCH[2]}
"$compile_fuzzer" "github.com/containerd/containerd/$pkg" "$func" "fuzz_$func"
"$compile_fuzzer" "github.com/containerd/containerd/v2/$pkg" "$func" "fuzz_$func"
else
echo "failed to parse: $line"
exit 1