From 913edcd48969e556d3594c0ed524093d05bc1598 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:17 -0800 Subject: [PATCH] Move diff to core/diff Signed-off-by: Derek McGowan --- client/container_checkpoint_opts.go | 2 +- client/diff.go | 4 ++-- client/image.go | 2 +- client/task.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- contrib/diffservice/service.go | 2 +- contrib/fuzz/diff_fuzzer.go | 2 +- {diff => core/diff}/apply/apply.go | 2 +- {diff => core/diff}/apply/apply_darwin.go | 0 {diff => core/diff}/apply/apply_linux.go | 0 {diff => core/diff}/apply/apply_linux_test.go | 0 {diff => core/diff}/apply/apply_other.go | 0 {diff => core/diff}/diff.go | 0 {diff => core/diff}/proxy/differ.go | 2 +- {diff => core/diff}/stream.go | 0 {diff => core/diff}/stream_unix.go | 0 {diff => core/diff}/stream_windows.go | 0 pkg/cri/server/images/image_pull.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/diff/lcow/lcow.go | 2 +- plugins/diff/walking/differ.go | 2 +- plugins/diff/walking/plugin/plugin.go | 4 ++-- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 2 +- plugins/transfer/plugin.go | 2 +- rootfs/apply.go | 2 +- rootfs/diff.go | 2 +- services/diff/local.go | 2 +- services/server/server.go | 4 ++-- 29 files changed, 24 insertions(+), 24 deletions(-) rename {diff => core/diff}/apply/apply.go (98%) rename {diff => core/diff}/apply/apply_darwin.go (100%) rename {diff => core/diff}/apply/apply_linux.go (100%) rename {diff => core/diff}/apply/apply_linux_test.go (100%) rename {diff => core/diff}/apply/apply_other.go (100%) rename {diff => core/diff}/diff.go (100%) rename {diff => core/diff}/proxy/differ.go (98%) rename {diff => core/diff}/stream.go (100%) rename {diff => core/diff}/stream_unix.go (100%) rename {diff => core/diff}/stream_windows.go (100%) diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index b1b73e15f..19c0dd944 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -25,7 +25,7 @@ import ( tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/diff.go b/client/diff.go index 4718400c7..88b475b0b 100644 --- a/client/diff.go +++ b/client/diff.go @@ -18,8 +18,8 @@ package client import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" - "github.com/containerd/containerd/v2/diff/proxy" + "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/diff/proxy" ) // DiffService handles the computation and application of diffs diff --git a/client/image.go b/client/image.go index 59b6a8653..36ad51fad 100644 --- a/client/image.go +++ b/client/image.go @@ -24,7 +24,7 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/usage" diff --git a/client/task.go b/client/task.go index 08663ff7b..ef9488adc 100644 --- a/client/task.go +++ b/client/task.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index f0c8c89c7..9a3703c20 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/rootfs" diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index a75a4725d..9d990a478 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -20,7 +20,7 @@ import ( "context" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index 6e7b03acc..71684d415 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -21,7 +21,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/diff/walking" diff --git a/diff/apply/apply.go b/core/diff/apply/apply.go similarity index 98% rename from diff/apply/apply.go rename to core/diff/apply/apply.go index 35116714a..d94e8f341 100644 --- a/diff/apply/apply.go +++ b/core/diff/apply/apply.go @@ -23,7 +23,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/diff/apply/apply_darwin.go b/core/diff/apply/apply_darwin.go similarity index 100% rename from diff/apply/apply_darwin.go rename to core/diff/apply/apply_darwin.go diff --git a/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go similarity index 100% rename from diff/apply/apply_linux.go rename to core/diff/apply/apply_linux.go diff --git a/diff/apply/apply_linux_test.go b/core/diff/apply/apply_linux_test.go similarity index 100% rename from diff/apply/apply_linux_test.go rename to core/diff/apply/apply_linux_test.go diff --git a/diff/apply/apply_other.go b/core/diff/apply/apply_other.go similarity index 100% rename from diff/apply/apply_other.go rename to core/diff/apply/apply_other.go diff --git a/diff/diff.go b/core/diff/diff.go similarity index 100% rename from diff/diff.go rename to core/diff/diff.go diff --git a/diff/proxy/differ.go b/core/diff/proxy/differ.go similarity index 98% rename from diff/proxy/differ.go rename to core/diff/proxy/differ.go index 5b930dec3..95a8625b4 100644 --- a/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -20,7 +20,7 @@ import ( "context" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/diff/stream.go b/core/diff/stream.go similarity index 100% rename from diff/stream.go rename to core/diff/stream.go diff --git a/diff/stream_unix.go b/core/diff/stream_unix.go similarity index 100% rename from diff/stream_unix.go rename to core/diff/stream_unix.go diff --git a/diff/stream_windows.go b/core/diff/stream_windows.go similarity index 100% rename from diff/stream_windows.go rename to core/diff/stream_windows.go diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index 03d2bc306..fd4b6fd05 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -40,7 +40,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" containerdimages "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index c2d29209e..902984fe9 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index fca3b8562..b42eacc74 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -31,7 +31,7 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 6eebe159f..ce9c9e39c 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -28,7 +28,7 @@ import ( "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/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go index 0adb701d5..ba4d7815e 100644 --- a/plugins/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -17,8 +17,8 @@ package plugin import ( - "github.com/containerd/containerd/v2/diff" - "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index d0f0c93b3..544f3881c 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -26,7 +26,7 @@ import ( "github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index ed27bd3c9..26e88af36 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -31,7 +31,7 @@ import ( "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/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/metadata" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index fd0aedfa0..c8babb9dc 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -19,8 +19,8 @@ package transfer import ( "fmt" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" diff --git a/rootfs/apply.go b/rootfs/apply.go index 976220f87..0f8ae13bf 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/snapshots" diff --git a/rootfs/diff.go b/rootfs/diff.go index 5dd4e1a1e..fb1ca6d8f 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/snapshots" diff --git a/services/diff/local.go b/services/diff/local.go index af58dedd5..783b65dfc 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -21,7 +21,7 @@ import ( "fmt" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/services/server/server.go b/services/server/server.go index 93f0fb247..5ced19e06 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -51,9 +51,9 @@ import ( sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" csproxy "github.com/containerd/containerd/v2/core/content/proxy" + "github.com/containerd/containerd/v2/core/diff" + diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/diff" - diffproxy "github.com/containerd/containerd/v2/diff/proxy" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/timeout"