diff --git a/client/client.go b/client/client.go index 2ffa31c5a..a9a7f0983 100644 --- a/client/client.go +++ b/client/client.go @@ -55,9 +55,9 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/platforms" "github.com/containerd/typeurl/v2" diff --git a/client/container.go b/client/container.go index cc3aa566d..4c749cec9 100644 --- a/client/container.go +++ b/client/container.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/fifo" "github.com/containerd/typeurl/v2" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index e6f8218a5..c03f3e11a 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" "github.com/containerd/containerd/v2/pkg/rootfs" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/platforms" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/container_opts.go b/client/container_opts.go index cf0e69c99..cf5508877 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index 7c6f38906..174ae89d1 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/protobuf/proto" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/opencontainers/image-spec/identity" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/containerstore.go b/client/containerstore.go index 694e42039..b87a9b920 100644 --- a/client/containerstore.go +++ b/client/containerstore.go @@ -23,8 +23,8 @@ import ( containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "google.golang.org/grpc/codes" diff --git a/client/events.go b/client/events.go index 4ac3701f0..8f73f23ff 100644 --- a/client/events.go +++ b/client/events.go @@ -22,7 +22,7 @@ import ( eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/client/image_store.go b/client/image_store.go index 85f94b937..23e64b3e9 100644 --- a/client/image_store.go +++ b/client/image_store.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/client/namespaces.go b/client/namespaces.go index 0512291a2..61c688b9f 100644 --- a/client/namespaces.go +++ b/client/namespaces.go @@ -22,7 +22,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/client/process.go b/client/process.go index fbb09a029..48189099a 100644 --- a/client/process.go +++ b/client/process.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/pkg/cio" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" ) diff --git a/client/sandbox.go b/client/sandbox.go index 237c2c82a..2c2482a1a 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" api "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/client/task.go b/client/task.go index f1f5144e9..086f6bd67 100644 --- a/client/task.go +++ b/client/task.go @@ -35,10 +35,10 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/protobuf" + google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - google_protobuf "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" diff --git a/client/transfer.go b/client/transfer.go index c95116325..44783428d 100644 --- a/client/transfer.go +++ b/client/transfer.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/core/streaming" "github.com/containerd/containerd/v2/core/transfer" "github.com/containerd/containerd/v2/core/transfer/proxy" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 278a6a7ec..52ea7494f 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -40,9 +40,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/pkg/shim" - "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/version" "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" diff --git a/cmd/containerd-shim-runc-v2/process/deleted_state.go b/cmd/containerd-shim-runc-v2/process/deleted_state.go index 231473267..3bb4f88d6 100644 --- a/cmd/containerd-shim-runc-v2/process/deleted_state.go +++ b/cmd/containerd-shim-runc-v2/process/deleted_state.go @@ -24,7 +24,7 @@ import ( "fmt" "github.com/containerd/console" - google_protobuf "github.com/containerd/containerd/v2/protobuf/types" + google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/cmd/containerd-shim-runc-v2/process/init.go b/cmd/containerd-shim-runc-v2/process/init.go index 47097faa7..c5c29cc67 100644 --- a/cmd/containerd-shim-runc-v2/process/init.go +++ b/cmd/containerd-shim-runc-v2/process/init.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/core/mount" + google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/stdio" - google_protobuf "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" "github.com/containerd/log" diff --git a/cmd/containerd-shim-runc-v2/process/init_state.go b/cmd/containerd-shim-runc-v2/process/init_state.go index 190e62553..01f5d3e21 100644 --- a/cmd/containerd-shim-runc-v2/process/init_state.go +++ b/cmd/containerd-shim-runc-v2/process/init_state.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" - google_protobuf "github.com/containerd/containerd/v2/protobuf/types" + google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types" runc "github.com/containerd/go-runc" "github.com/containerd/log" ) diff --git a/cmd/containerd-shim-runc-v2/process/types.go b/cmd/containerd-shim-runc-v2/process/types.go index 54f79876c..2d9bd5f6b 100644 --- a/cmd/containerd-shim-runc-v2/process/types.go +++ b/cmd/containerd-shim-runc-v2/process/types.go @@ -17,7 +17,7 @@ package process import ( - google_protobuf "github.com/containerd/containerd/v2/protobuf/types" + google_protobuf "github.com/containerd/containerd/v2/pkg/protobuf/types" ) // Mount holds filesystem mount configuration diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 4e13c37bf..7dd117d20 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -38,13 +38,13 @@ import ( "github.com/containerd/containerd/v2/pkg/oom" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/containerd/v2/pkg/userns" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" runcC "github.com/containerd/go-runc" "github.com/containerd/log" diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 3c85930fb..103a6f470 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -27,8 +27,8 @@ import ( eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/urfave/cli/v2" "google.golang.org/grpc" diff --git a/cmd/ctr/commands/deprecations/deprecations.go b/cmd/ctr/commands/deprecations/deprecations.go index 67ed2ca1b..6d26f362f 100644 --- a/cmd/ctr/commands/deprecations/deprecations.go +++ b/cmd/ctr/commands/deprecations/deprecations.go @@ -26,7 +26,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" ) // Command is the parent for all commands under "deprecations" diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index 9e9a26564..8fc5e828f 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -31,8 +31,8 @@ import ( "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/pkg/namespaces" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/shim" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 3e765672a..3d71aef15 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -22,7 +22,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh index 8b607c94c..155f867ff 100755 --- a/contrib/v2-migrate.sh +++ b/contrib/v2-migrate.sh @@ -66,6 +66,7 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime/$1$2"github.com\/containerd\/containerd\/v2\/core\/runtime/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/core\/runtime\/v2\/runc\/options/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runc\/options/g' $GOFILE perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/runtimeoptions/$1$2"github.com\/containerd\/containerd\/v2\/api\/types\/runtimeoptions/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/protobuf/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/protobuf/g' $GOFILE # Migrate packages split out to their own repository perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE diff --git a/core/content/proxy/content_store.go b/core/content/proxy/content_store.go index 2372bf286..9bd5a5074 100644 --- a/core/content/proxy/content_store.go +++ b/core/content/proxy/content_store.go @@ -23,8 +23,8 @@ import ( contentapi "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/protobuf" - protobuftypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/ttrpc" digest "github.com/opencontainers/go-digest" diff --git a/core/content/proxy/content_writer.go b/core/content/proxy/content_writer.go index 7738f9a8e..9bf453216 100644 --- a/core/content/proxy/content_writer.go +++ b/core/content/proxy/content_writer.go @@ -23,7 +23,7 @@ import ( contentapi "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" digest "github.com/opencontainers/go-digest" ) diff --git a/core/diff/proxy/differ.go b/core/diff/proxy/differ.go index ec0d0e853..77b326a34 100644 --- a/core/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/diff/stream_unix.go b/core/diff/stream_unix.go index fafbfa120..b4b6f1a7d 100644 --- a/core/diff/stream_unix.go +++ b/core/diff/stream_unix.go @@ -28,8 +28,8 @@ import ( "os/exec" "sync" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" "github.com/containerd/typeurl/v2" ) diff --git a/core/diff/stream_windows.go b/core/diff/stream_windows.go index 9bf09d7d4..73ad2046c 100644 --- a/core/diff/stream_windows.go +++ b/core/diff/stream_windows.go @@ -29,8 +29,8 @@ import ( "github.com/Microsoft/go-winio" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/core/events/exchange/exchange_test.go b/core/events/exchange/exchange_test.go index f161b1f55..a300790b7 100644 --- a/core/events/exchange/exchange_test.go +++ b/core/events/exchange/exchange_test.go @@ -25,7 +25,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/core/events/proxy/remote_events.go b/core/events/proxy/remote_events.go index f7c7f8721..aca7844dd 100644 --- a/core/events/proxy/remote_events.go +++ b/core/events/proxy/remote_events.go @@ -23,7 +23,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/events/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" diff --git a/core/introspection/proxy/remote.go b/core/introspection/proxy/remote.go index 4f10e6aa0..a93a644f3 100644 --- a/core/introspection/proxy/remote.go +++ b/core/introspection/proxy/remote.go @@ -22,7 +22,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/core/introspection" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/core/leases/proxy/manager.go b/core/leases/proxy/manager.go index d51b2b20b..7e5a98aed 100644 --- a/core/leases/proxy/manager.go +++ b/core/leases/proxy/manager.go @@ -21,7 +21,7 @@ import ( leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" ) diff --git a/core/metadata/boltutil/helpers.go b/core/metadata/boltutil/helpers.go index eef502e96..3b081c3f9 100644 --- a/core/metadata/boltutil/helpers.go +++ b/core/metadata/boltutil/helpers.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/typeurl/v2" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 9973c9b9f..8f79fb8ea 100644 --- a/core/metadata/containers.go +++ b/core/metadata/containers.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" bolt "go.etcd.io/bbolt" diff --git a/core/metadata/containers_test.go b/core/metadata/containers_test.go index e3110c916..0cc7eb595 100644 --- a/core/metadata/containers_test.go +++ b/core/metadata/containers_test.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index 10dfe562d..a952ae214 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -36,9 +36,9 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" - "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" diff --git a/core/metadata/namespaces_test.go b/core/metadata/namespaces_test.go index 72bc4e9e4..fc8f8c854 100644 --- a/core/metadata/namespaces_test.go +++ b/core/metadata/namespaces_test.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" diff --git a/core/metadata/sandbox_test.go b/core/metadata/sandbox_test.go index 1cef52819..94cd428bd 100644 --- a/core/metadata/sandbox_test.go +++ b/core/metadata/sandbox_test.go @@ -20,7 +20,7 @@ import ( "testing" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/core/metrics/cgroups/common/type.go b/core/metrics/cgroups/common/type.go index 5c58ce19d..6a1d385ad 100644 --- a/core/metrics/cgroups/common/type.go +++ b/core/metrics/cgroups/common/type.go @@ -21,7 +21,7 @@ package common import ( "context" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" ) // Statable type that returns cgroup metrics diff --git a/core/metrics/cgroups/metrics_test.go b/core/metrics/cgroups/metrics_test.go index a5df82982..c1c1f7108 100644 --- a/core/metrics/cgroups/metrics_test.go +++ b/core/metrics/cgroups/metrics_test.go @@ -31,10 +31,10 @@ import ( v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" v1types "github.com/containerd/containerd/v2/core/metrics/types/v1" v2types "github.com/containerd/containerd/v2/core/metrics/types/v2" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/prometheus/client_golang/prometheus" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" metrics "github.com/docker/go-metrics" ) diff --git a/core/runtime/task.go b/core/runtime/task.go index 71ef674fb..901411706 100644 --- a/core/runtime/task.go +++ b/core/runtime/task.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/types" ) // TaskInfo provides task specific information diff --git a/core/runtime/v2/binary.go b/core/runtime/v2/binary.go index 9ccc9d29d..8a46578b5 100644 --- a/core/runtime/v2/binary.go +++ b/core/runtime/v2/binary.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf/types" client "github.com/containerd/containerd/v2/pkg/shim" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" ) diff --git a/core/runtime/v2/example/example.go b/core/runtime/v2/example/example.go index 5d35ac3ac..b8809227a 100644 --- a/core/runtime/v2/example/example.go +++ b/core/runtime/v2/example/example.go @@ -23,10 +23,10 @@ import ( taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" apitypes "github.com/containerd/containerd/v2/api/types" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/core/runtime/v2/process.go b/core/runtime/v2/process.go index 5b638bd0c..20934df13 100644 --- a/core/runtime/v2/process.go +++ b/core/runtime/v2/process.go @@ -23,7 +23,7 @@ import ( task "github.com/containerd/containerd/v2/api/runtime/task/v3" tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/ttrpc" ) diff --git a/core/runtime/v2/shim.go b/core/runtime/v2/shim.go index 27676ed0d..fc3206d59 100644 --- a/core/runtime/v2/shim.go +++ b/core/runtime/v2/shim.go @@ -41,10 +41,10 @@ import ( "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" client "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/timeout" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" ) diff --git a/core/runtime/v2/shim_manager.go b/core/runtime/v2/shim_manager.go index e254934e3..7ef0db1bc 100644 --- a/core/runtime/v2/shim_manager.go +++ b/core/runtime/v2/shim_manager.go @@ -38,10 +38,10 @@ import ( "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" shimbinary "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/version" ) diff --git a/core/runtime/v2/task_manager.go b/core/runtime/v2/task_manager.go index 3921053e3..1ef57d19f 100644 --- a/core/runtime/v2/task_manager.go +++ b/core/runtime/v2/task_manager.go @@ -30,9 +30,9 @@ import ( apitypes "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/internal/cleanup" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf/proto" ) func init() { diff --git a/core/sandbox/helpers.go b/core/sandbox/helpers.go index 9538560dd..362ec7ec0 100644 --- a/core/sandbox/helpers.go +++ b/core/sandbox/helpers.go @@ -18,8 +18,8 @@ package sandbox import ( "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/protobuf" - gogo_types "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + gogo_types "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/core/snapshots/proxy/proxy.go b/core/snapshots/proxy/proxy.go index 92f277abd..6b2bddb9f 100644 --- a/core/snapshots/proxy/proxy.go +++ b/core/snapshots/proxy/proxy.go @@ -23,7 +23,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - protobuftypes "github.com/containerd/containerd/v2/protobuf/types" + protobuftypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/core/snapshots/snapshotter.go b/core/snapshots/snapshotter.go index f96c949d6..35eee1142 100644 --- a/core/snapshots/snapshotter.go +++ b/core/snapshots/snapshotter.go @@ -24,7 +24,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" ) const ( diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go index d3f9d6620..ae16b4be9 100644 --- a/integration/client/client_ttrpc_test.go +++ b/integration/client/client_ttrpc_test.go @@ -24,9 +24,9 @@ import ( v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" apitypes "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/ttrpcutil" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" ) diff --git a/integration/client/container_test.go b/integration/client/container_test.go index be2164227..b1ce820f1 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -40,8 +40,8 @@ import ( "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" + gogotypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - gogotypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/continuity/fs" "github.com/containerd/errdefs" "github.com/containerd/go-runc" diff --git a/internal/cri/server/container_checkpoint_linux.go b/internal/cri/server/container_checkpoint_linux.go index ff9fc5219..062f61f54 100644 --- a/internal/cri/server/container_checkpoint_linux.go +++ b/internal/cri/server/container_checkpoint_linux.go @@ -36,9 +36,9 @@ import ( "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/protobuf/proto" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf/proto" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" v1 "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc/codes" diff --git a/internal/cri/server/container_stats_list.go b/internal/cri/server/container_stats_list.go index 950886e48..1400ce93b 100644 --- a/internal/cri/server/container_stats_list.go +++ b/internal/cri/server/container_stats_list.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/api/types" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" "github.com/containerd/containerd/v2/internal/cri/store/stats" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" ) diff --git a/internal/cri/server/container_stop.go b/internal/cri/server/container_stop.go index 4da35c9dc..31743ae23 100644 --- a/internal/cri/server/container_stop.go +++ b/internal/cri/server/container_stop.go @@ -26,7 +26,7 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/log" diff --git a/internal/cri/server/events.go b/internal/cri/server/events.go index 0cf860c38..e24d86866 100644 --- a/internal/cri/server/events.go +++ b/internal/cri/server/events.go @@ -32,7 +32,7 @@ import ( sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" containerdio "github.com/containerd/containerd/v2/pkg/cio" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" ) const ( diff --git a/internal/cri/server/events/events_test.go b/internal/cri/server/events/events_test.go index f74f0c07e..aafc85da9 100644 --- a/internal/cri/server/events/events_test.go +++ b/internal/cri/server/events/events_test.go @@ -21,7 +21,7 @@ import ( "time" eventtypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" diff --git a/internal/cri/server/helpers_test.go b/internal/cri/server/helpers_test.go index 5283039d4..b04c1019e 100644 --- a/internal/cri/server/helpers_test.go +++ b/internal/cri/server/helpers_test.go @@ -32,8 +32,8 @@ import ( crilabels "github.com/containerd/containerd/v2/internal/cri/labels" containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/internal/cri/server/podsandbox/controller.go b/internal/cri/server/podsandbox/controller.go index f3de9084e..ff61dd921 100644 --- a/internal/cri/server/podsandbox/controller.go +++ b/internal/cri/server/podsandbox/controller.go @@ -37,8 +37,8 @@ import ( ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" "github.com/containerd/platforms" ) diff --git a/internal/cri/server/podsandbox/sandbox_stop.go b/internal/cri/server/podsandbox/sandbox_stop.go index fef1022ec..fdf4fe826 100644 --- a/internal/cri/server/podsandbox/sandbox_stop.go +++ b/internal/cri/server/podsandbox/sandbox_stop.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/internal/cri/server/podsandbox/types" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" ) func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { diff --git a/internal/cri/server/sandbox_stats_windows.go b/internal/cri/server/sandbox_stats_windows.go index bc5e77142..2a0c232e2 100644 --- a/internal/cri/server/sandbox_stats_windows.go +++ b/internal/cri/server/sandbox_stats_windows.go @@ -30,7 +30,7 @@ import ( sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/containerd/v2/internal/cri/store/stats" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/internal/cri/server/sandbox_stats_windows_test.go b/internal/cri/server/sandbox_stats_windows_test.go index c14d9b11e..f0afe6e03 100644 --- a/internal/cri/server/sandbox_stats_windows_test.go +++ b/internal/cri/server/sandbox_stats_windows_test.go @@ -24,7 +24,7 @@ import ( containerstore "github.com/containerd/containerd/v2/internal/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox" "github.com/containerd/containerd/v2/internal/cri/store/stats" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/internal/cri/server/service.go b/internal/cri/server/service.go index 5e4ed52c9..895a9cb19 100644 --- a/internal/cri/server/service.go +++ b/internal/cri/server/service.go @@ -53,8 +53,8 @@ import ( "github.com/containerd/containerd/v2/internal/registrar" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" ) var kernelSupportsRRO bool diff --git a/protobuf/any.go b/pkg/protobuf/any.go similarity index 100% rename from protobuf/any.go rename to pkg/protobuf/any.go diff --git a/protobuf/any_test.go b/pkg/protobuf/any_test.go similarity index 100% rename from protobuf/any_test.go rename to pkg/protobuf/any_test.go diff --git a/protobuf/compare.go b/pkg/protobuf/compare.go similarity index 100% rename from protobuf/compare.go rename to pkg/protobuf/compare.go diff --git a/protobuf/proto/proto.go b/pkg/protobuf/proto/proto.go similarity index 100% rename from protobuf/proto/proto.go rename to pkg/protobuf/proto/proto.go diff --git a/protobuf/timestamp.go b/pkg/protobuf/timestamp.go similarity index 100% rename from protobuf/timestamp.go rename to pkg/protobuf/timestamp.go diff --git a/protobuf/types/types.go b/pkg/protobuf/types/types.go similarity index 100% rename from protobuf/types/types.go rename to pkg/protobuf/types/types.go diff --git a/pkg/shim/publisher.go b/pkg/shim/publisher.go index 882a476f3..d970b018c 100644 --- a/pkg/shim/publisher.go +++ b/pkg/shim/publisher.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/containerd/v2/pkg/ttrpcutil" - "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/ttrpc" ) diff --git a/pkg/shim/shim.go b/pkg/shim/shim.go index d8f77e259..41ff46821 100644 --- a/pkg/shim/shim.go +++ b/pkg/shim/shim.go @@ -34,10 +34,10 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/pkg/shim/util.go b/pkg/shim/util.go index cfcf07387..46b1b1724 100644 --- a/pkg/shim/util.go +++ b/pkg/shim/util.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/plugins/services/containers/helpers.go b/plugins/services/containers/helpers.go index 8dafddac7..dc2f04803 100644 --- a/plugins/services/containers/helpers.go +++ b/plugins/services/containers/helpers.go @@ -19,8 +19,8 @@ package containers import ( api "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/plugins/services/containers/local.go b/plugins/services/containers/local.go index 7be944cba..919fd01fa 100644 --- a/plugins/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/containers/service.go b/plugins/services/containers/service.go index 81b636217..a91c83195 100644 --- a/plugins/services/containers/service.go +++ b/plugins/services/containers/service.go @@ -21,9 +21,9 @@ import ( "io" api "github.com/containerd/containerd/v2/api/services/containers/v1" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/plugins/services/content/contentserver/contentserver.go b/plugins/services/content/contentserver/contentserver.go index 4099df18a..fef1535c0 100644 --- a/plugins/services/content/contentserver/contentserver.go +++ b/plugins/services/content/contentserver/contentserver.go @@ -24,8 +24,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/plugins/services/events/service.go b/plugins/services/events/service.go index a462accde..bd07de127 100644 --- a/plugins/services/events/service.go +++ b/plugins/services/events/service.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events/exchange" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/events/ttrpc.go b/plugins/services/events/ttrpc.go index ba0596fd4..d3be98681 100644 --- a/plugins/services/events/ttrpc.go +++ b/plugins/services/events/ttrpc.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/events/exchange" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/errdefs" ) diff --git a/plugins/services/images/helpers.go b/plugins/services/images/helpers.go index fe95c8c73..39818a562 100644 --- a/plugins/services/images/helpers.go +++ b/plugins/services/images/helpers.go @@ -20,7 +20,7 @@ import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/plugins/services/images/local.go b/plugins/services/images/local.go index 1108a502d..d7adeff0c 100644 --- a/plugins/services/images/local.go +++ b/plugins/services/images/local.go @@ -30,10 +30,10 @@ import ( "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/gc" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/warning" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/images/service.go b/plugins/services/images/service.go index b00e6b3ae..427820542 100644 --- a/plugins/services/images/service.go +++ b/plugins/services/images/service.go @@ -20,9 +20,9 @@ import ( "context" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/plugins/services/introspection/local.go b/plugins/services/introspection/local.go index 5c9cbf859..b359d39ed 100644 --- a/plugins/services/introspection/local.go +++ b/plugins/services/introspection/local.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/introspection" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/warning" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/introspection/service.go b/plugins/services/introspection/service.go index eced9dd7c..0e8b0e365 100644 --- a/plugins/services/introspection/service.go +++ b/plugins/services/introspection/service.go @@ -23,9 +23,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/core/introspection" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/leases/service.go b/plugins/services/leases/service.go index 813a1b8c0..601248916 100644 --- a/plugins/services/leases/service.go +++ b/plugins/services/leases/service.go @@ -21,9 +21,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/leases/v1" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index c051e7171..7fd824cce 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/pkg/namespaces" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/namespaces/service.go b/plugins/services/namespaces/service.go index 856d60e55..36b8a1675 100644 --- a/plugins/services/namespaces/service.go +++ b/plugins/services/namespaces/service.go @@ -20,9 +20,9 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/plugins/services/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go index 92987e4a7..6ee5b85e2 100644 --- a/plugins/services/sandbox/controller_service.go +++ b/plugins/services/sandbox/controller_service.go @@ -28,8 +28,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/core/events" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/pkg/protobuf" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/snapshots/service.go b/plugins/services/snapshots/service.go index f0de4a976..21d001a2d 100644 --- a/plugins/services/snapshots/service.go +++ b/plugins/services/snapshots/service.go @@ -22,9 +22,9 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/streaming/service.go b/plugins/services/streaming/service.go index 6b048011d..e82f67761 100644 --- a/plugins/services/streaming/service.go +++ b/plugins/services/streaming/service.go @@ -22,9 +22,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/streaming/v1" "github.com/containerd/containerd/v2/core/streaming" + "github.com/containerd/containerd/v2/pkg/protobuf" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/protobuf" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index 2a358f31f..703536040 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -40,13 +40,13 @@ import ( "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/protobuf" + "github.com/containerd/containerd/v2/pkg/protobuf/proto" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/protobuf/proto" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/tasks/service.go b/plugins/services/tasks/service.go index 84ad12a92..e456cc499 100644 --- a/plugins/services/tasks/service.go +++ b/plugins/services/tasks/service.go @@ -20,9 +20,9 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/tasks/v1" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/plugins/services/transfer/service.go b/plugins/services/transfer/service.go index d56cc7cba..a45c6ec53 100644 --- a/plugins/services/transfer/service.go +++ b/plugins/services/transfer/service.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/v2/core/transfer" tplugins "github.com/containerd/containerd/v2/core/transfer/plugins" "github.com/containerd/containerd/v2/pkg/oci" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/version/service.go b/plugins/services/version/service.go index ad76faedd..2c1c76233 100644 --- a/plugins/services/version/service.go +++ b/plugins/services/version/service.go @@ -20,8 +20,8 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/version/v1" + ptypes "github.com/containerd/containerd/v2/pkg/protobuf/types" "github.com/containerd/containerd/v2/plugins" - ptypes "github.com/containerd/containerd/v2/protobuf/types" ctrdversion "github.com/containerd/containerd/v2/version" "github.com/containerd/plugin" "github.com/containerd/plugin/registry"