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

Move content/local to plugins/content/local

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:50:23 -08:00
parent aad37698ed
commit 846f7d4e65
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
23 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fuzz/archive_fuzzer.go
View File

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

2
contrib/fuzz/content_fuzzer.go
View File

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

2
contrib/fuzz/diff_fuzzer.go
View File

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

2
contrib/fuzz/fuzz_images.go
View File

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

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -28,11 +28,11 @@ import (
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/native"
) )

2
images/imagetest/content.go
View File

@ -25,8 +25,8 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
metadata/content_test.go
View File

@ -26,12 +26,12 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/content/testsuite"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"

2
metadata/db_test.go
View File

@ -31,12 +31,12 @@ import (
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/native"

0
content/local/content_local_fuzzer.go → plugins/content/local/content_local_fuzzer.go
View File

0
content/local/locks.go → plugins/content/local/locks.go
View File

0
content/local/locks_test.go → plugins/content/local/locks_test.go
View File

0
content/local/readerat.go → plugins/content/local/readerat.go
View File

0
content/local/store.go → plugins/content/local/store.go
View File

0
content/local/store_bsd.go → plugins/content/local/store_bsd.go
View File

0
content/local/store_openbsd.go → plugins/content/local/store_openbsd.go
View File

0
content/local/store_test.go → plugins/content/local/store_test.go
View File

0
content/local/store_unix.go → plugins/content/local/store_unix.go
View File

0
content/local/store_windows.go → plugins/content/local/store_windows.go
View File

0
content/local/test_helper.go → plugins/content/local/test_helper.go
View File

0
content/local/writer.go → plugins/content/local/writer.go
View File

2
remotes/docker/converter_fuzz.go
View File

@ -23,7 +23,7 @@ import (
"os" "os"
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/log" "github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
remotes/handlers_test.go
View File

@ -24,8 +24,8 @@ import (
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
services/server/server.go
View File

@ -50,7 +50,6 @@ import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
"github.com/containerd/containerd/v2/content/local"
csproxy "github.com/containerd/containerd/v2/content/proxy" csproxy "github.com/containerd/containerd/v2/content/proxy"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
@ -60,6 +59,7 @@ import (
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/content/local"
sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" sbproxy "github.com/containerd/containerd/v2/sandbox/proxy"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/services/warning" "github.com/containerd/containerd/v2/services/warning"