diff --git a/client/install.go b/client/install.go index bb746afd8..38ef6fe29 100644 --- a/client/install.go +++ b/client/install.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/archive/compression" ) // Install a binary image into the opt service. diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index d68330e1b..781b89a8f 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -25,8 +25,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/archive" imageArchive "github.com/containerd/containerd/v2/core/images/archive" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/diff/apply/apply_darwin.go b/core/diff/apply/apply_darwin.go index c501c9ffe..d3d7ec79f 100644 --- a/core/diff/apply/apply_darwin.go +++ b/core/diff/apply/apply_darwin.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/pkg/archive" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go index 54a7e10f2..51daee7e7 100644 --- a/core/diff/apply/apply_linux.go +++ b/core/diff/apply/apply_linux.go @@ -23,9 +23,9 @@ import ( "os" "strings" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/userns" "golang.org/x/sys/unix" diff --git a/core/diff/apply/apply_other.go b/core/diff/apply/apply_other.go index b18212fea..af5220453 100644 --- a/core/diff/apply/apply_other.go +++ b/core/diff/apply/apply_other.go @@ -22,8 +22,8 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/pkg/archive" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/stream.go b/core/diff/stream.go index 2265dfb2e..f44f8fa9c 100644 --- a/core/diff/stream.go +++ b/core/diff/stream.go @@ -22,8 +22,8 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/archive/importer.go b/core/images/archive/importer.go index 2af4a4dbf..5a2a0dc61 100644 --- a/core/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -27,11 +27,11 @@ import ( "io" "path" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/core/images/converter/uncompress/uncompress.go b/core/images/converter/uncompress/uncompress.go index 117e21186..dbb40a3c2 100644 --- a/core/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -21,12 +21,12 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive/compression" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/diffid.go b/core/images/diffid.go index 50cdddd18..b47dbbb02 100644 --- a/core/images/diffid.go +++ b/core/images/diffid.go @@ -23,9 +23,9 @@ import ( "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/log" ) diff --git a/core/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go index 3a4d9a5a2..6d9c4f03a 100644 --- a/core/remotes/docker/schema1/converter.go +++ b/core/remotes/docker/schema1/converter.go @@ -32,12 +32,12 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 68fde3709..84fcab9e2 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -32,8 +32,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" @@ -41,6 +39,8 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/release_upgrade_utils_linux_test.go b/integration/release_upgrade_utils_linux_test.go index a42813bb4..05e7a2528 100644 --- a/integration/release_upgrade_utils_linux_test.go +++ b/integration/release_upgrade_utils_linux_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/mod/semver" - "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/version" ) diff --git a/archive/compression/benchmark_test.go b/pkg/archive/compression/benchmark_test.go similarity index 100% rename from archive/compression/benchmark_test.go rename to pkg/archive/compression/benchmark_test.go diff --git a/archive/compression/compression.go b/pkg/archive/compression/compression.go similarity index 100% rename from archive/compression/compression.go rename to pkg/archive/compression/compression.go diff --git a/archive/compression/compression_fuzzer.go b/pkg/archive/compression/compression_fuzzer.go similarity index 100% rename from archive/compression/compression_fuzzer.go rename to pkg/archive/compression/compression_fuzzer.go diff --git a/archive/compression/compression_test.go b/pkg/archive/compression/compression_test.go similarity index 100% rename from archive/compression/compression_test.go rename to pkg/archive/compression/compression_test.go diff --git a/archive/issues_test.go b/pkg/archive/issues_test.go similarity index 96% rename from archive/issues_test.go rename to pkg/archive/issues_test.go index 59f950e57..e2a469ba6 100644 --- a/archive/issues_test.go +++ b/pkg/archive/issues_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/archive/link_default.go b/pkg/archive/link_default.go similarity index 100% rename from archive/link_default.go rename to pkg/archive/link_default.go diff --git a/archive/link_freebsd.go b/pkg/archive/link_freebsd.go similarity index 100% rename from archive/link_freebsd.go rename to pkg/archive/link_freebsd.go diff --git a/archive/tar.go b/pkg/archive/tar.go similarity index 99% rename from archive/tar.go rename to pkg/archive/tar.go index 3d5b6bb01..970d31246 100644 --- a/archive/tar.go +++ b/pkg/archive/tar.go @@ -29,7 +29,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/archive/tarheader" + "github.com/containerd/containerd/v2/pkg/archive/tarheader" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" diff --git a/archive/tar_freebsd.go b/pkg/archive/tar_freebsd.go similarity index 100% rename from archive/tar_freebsd.go rename to pkg/archive/tar_freebsd.go diff --git a/archive/tar_linux_test.go b/pkg/archive/tar_linux_test.go similarity index 100% rename from archive/tar_linux_test.go rename to pkg/archive/tar_linux_test.go diff --git a/archive/tar_mostunix.go b/pkg/archive/tar_mostunix.go similarity index 100% rename from archive/tar_mostunix.go rename to pkg/archive/tar_mostunix.go diff --git a/archive/tar_opts.go b/pkg/archive/tar_opts.go similarity index 100% rename from archive/tar_opts.go rename to pkg/archive/tar_opts.go diff --git a/archive/tar_opts_linux.go b/pkg/archive/tar_opts_linux.go similarity index 100% rename from archive/tar_opts_linux.go rename to pkg/archive/tar_opts_linux.go diff --git a/archive/tar_opts_windows.go b/pkg/archive/tar_opts_windows.go similarity index 100% rename from archive/tar_opts_windows.go rename to pkg/archive/tar_opts_windows.go diff --git a/archive/tar_test.go b/pkg/archive/tar_test.go similarity index 99% rename from archive/tar_test.go rename to pkg/archive/tar_test.go index 7598da88d..5f322675b 100644 --- a/archive/tar_test.go +++ b/pkg/archive/tar_test.go @@ -33,7 +33,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/archive/tartest" + "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" diff --git a/archive/tar_unix.go b/pkg/archive/tar_unix.go similarity index 100% rename from archive/tar_unix.go rename to pkg/archive/tar_unix.go diff --git a/archive/tar_windows.go b/pkg/archive/tar_windows.go similarity index 100% rename from archive/tar_windows.go rename to pkg/archive/tar_windows.go diff --git a/archive/tarheader/tarheader.go b/pkg/archive/tarheader/tarheader.go similarity index 100% rename from archive/tarheader/tarheader.go rename to pkg/archive/tarheader/tarheader.go diff --git a/archive/tarheader/tarheader_unix.go b/pkg/archive/tarheader/tarheader_unix.go similarity index 100% rename from archive/tarheader/tarheader_unix.go rename to pkg/archive/tarheader/tarheader_unix.go diff --git a/archive/tartest/tar.go b/pkg/archive/tartest/tar.go similarity index 100% rename from archive/tartest/tar.go rename to pkg/archive/tartest/tar.go diff --git a/archive/time.go b/pkg/archive/time.go similarity index 100% rename from archive/time.go rename to pkg/archive/time.go diff --git a/archive/time_unix.go b/pkg/archive/time_unix.go similarity index 100% rename from archive/time_unix.go rename to pkg/archive/time_unix.go diff --git a/archive/time_windows.go b/pkg/archive/time_windows.go similarity index 100% rename from archive/time_windows.go rename to pkg/archive/time_windows.go diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 7f28c6e71..c2b90c0a7 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -25,13 +25,13 @@ import ( "io" "time" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 85e92aae3..b0753ec5b 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -24,12 +24,12 @@ import ( "fmt" "github.com/Microsoft/hcsshim/pkg/cimfs" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index 9efb9e4cc..9adf35c28 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -28,14 +28,14 @@ import ( "time" "github.com/Microsoft/go-winio" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index fc886f4d6..ae8a206a3 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -29,7 +29,6 @@ import ( api "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types/task" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" @@ -38,6 +37,7 @@ import ( "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout"