diff --git a/Protobuild.toml b/Protobuild.toml index e5a441531..bdb21b584 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -8,11 +8,6 @@ generators = ["go"] # treat the root of the project as an include, but this may not be necessary. before = ["./protobuf"] - # Paths that should be treated as include roots in relation to the vendor - # directory. These will be calculated with the vendor directory nearest the - # target package. - packages = ["github.com/gogo/protobuf"] - # Paths that will be added untouched to the end of the includes. We use # `/usr/local/include` to pickup the common install location of protobuf. # This is the default. @@ -33,7 +28,6 @@ prefix = "github.com/containerd/containerd/runtime/linux/runctypes" target = "runtime/linux/runctypes/next.pb.txt" ignore_files = [ "google/protobuf/descriptor.proto", - "gogoproto/gogo.proto" ] [[descriptors]] @@ -41,5 +35,4 @@ prefix = "github.com/containerd/containerd/runtime/v2/runc/options" target = "runtime/v2/runc/options/next.pb.txt" ignore_files = [ "google/protobuf/descriptor.proto", - "gogoproto/gogo.proto" ] diff --git a/api/Protobuild.toml b/api/Protobuild.toml index 9a01909d4..518f5230c 100644 --- a/api/Protobuild.toml +++ b/api/Protobuild.toml @@ -8,11 +8,6 @@ generators = ["go", "go-grpc"] # treat the root of the project as an include, but this may not be necessary. before = [] - # Paths that should be treated as include roots in relation to the vendor - # directory. These will be calculated with the vendor directory nearest the - # target package. - packages = ["github.com/gogo/protobuf"] - # Paths that will be added untouched to the end of the includes. We use # `/usr/local/include` to pickup the common install location of protobuf. # This is the default. @@ -46,5 +41,4 @@ prefix = "github.com/containerd/containerd/api" target = "next.pb.txt" ignore_files = [ "google/protobuf/descriptor.proto", - "gogoproto/gogo.proto" ] diff --git a/api/events/container.proto b/api/events/container.proto index 89ec370cf..29fd18f88 100644 --- a/api/events/container.proto +++ b/api/events/container.proto @@ -19,7 +19,6 @@ syntax = "proto3"; package containerd.events; import "google/protobuf/any.proto"; -import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; option go_package = "github.com/containerd/containerd/api/events;events"; diff --git a/api/events/content.proto b/api/events/content.proto index c745d428d..97d424139 100644 --- a/api/events/content.proto +++ b/api/events/content.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.events; -import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; option go_package = "github.com/containerd/containerd/api/events;events"; diff --git a/api/events/namespace.proto b/api/events/namespace.proto index 94645a9bd..9bae531d7 100644 --- a/api/events/namespace.proto +++ b/api/events/namespace.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.events; -import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; option go_package = "github.com/containerd/containerd/api/events;events"; diff --git a/api/events/task.proto b/api/events/task.proto index dc2c5b2bf..238564dfe 100644 --- a/api/events/task.proto +++ b/api/events/task.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.events; -import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; diff --git a/api/runtime/sandbox/v1/sandbox.proto b/api/runtime/sandbox/v1/sandbox.proto index b232d9e96..a384f0261 100644 --- a/api/runtime/sandbox/v1/sandbox.proto +++ b/api/runtime/sandbox/v1/sandbox.proto @@ -20,7 +20,6 @@ package containerd.runtime.sandbox.v1; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -import weak "gogoproto/gogo.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; diff --git a/api/runtime/task/v2/shim.proto b/api/runtime/task/v2/shim.proto index 4410e5830..aad1bd66f 100644 --- a/api/runtime/task/v2/shim.proto +++ b/api/runtime/task/v2/shim.proto @@ -20,7 +20,6 @@ package containerd.task.v2; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; -import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/task/task.proto"; diff --git a/api/services/containers/v1/containers.proto b/api/services/containers/v1/containers.proto index c27b7c23c..b0d6c5af5 100644 --- a/api/services/containers/v1/containers.proto +++ b/api/services/containers/v1/containers.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.containers.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto index 47fc36430..6f455c059 100644 --- a/api/services/content/v1/content.proto +++ b/api/services/content/v1/content.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.content.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/empty.proto"; diff --git a/api/services/diff/v1/diff.proto b/api/services/diff/v1/diff.proto index 7a92893f9..03438f39f 100644 --- a/api/services/diff/v1/diff.proto +++ b/api/services/diff/v1/diff.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.diff.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto"; diff --git a/api/services/events/v1/events.proto b/api/services/events/v1/events.proto index ef392ca45..3e0f11ffb 100644 --- a/api/services/events/v1/events.proto +++ b/api/services/events/v1/events.proto @@ -19,7 +19,6 @@ syntax = "proto3"; package containerd.services.events.v1; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/services/images/v1/images.proto b/api/services/images/v1/images.proto index 752523c2d..1a1b0146f 100644 --- a/api/services/images/v1/images.proto +++ b/api/services/images/v1/images.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.images.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/services/introspection/v1/introspection.proto b/api/services/introspection/v1/introspection.proto index 53208efa8..2a053cc63 100644 --- a/api/services/introspection/v1/introspection.proto +++ b/api/services/introspection/v1/introspection.proto @@ -21,7 +21,6 @@ package containerd.services.introspection.v1; import "github.com/containerd/containerd/api/types/platform.proto"; import "google/rpc/status.proto"; import "google/protobuf/empty.proto"; -import "gogoproto/gogo.proto"; option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection"; diff --git a/api/services/leases/v1/leases.proto b/api/services/leases/v1/leases.proto index 8eff9ce2f..8551fcea7 100644 --- a/api/services/leases/v1/leases.proto +++ b/api/services/leases/v1/leases.proto @@ -17,7 +17,6 @@ syntax = "proto3"; package containerd.services.leases.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/services/namespaces/v1/namespace.proto b/api/services/namespaces/v1/namespace.proto index 1236eec7b..910bcd6c7 100644 --- a/api/services/namespaces/v1/namespace.proto +++ b/api/services/namespaces/v1/namespace.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.namespaces.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; diff --git a/api/services/sandbox/v1/sandbox.proto b/api/services/sandbox/v1/sandbox.proto index 149ad7d2e..bd1bdec37 100644 --- a/api/services/sandbox/v1/sandbox.proto +++ b/api/services/sandbox/v1/sandbox.proto @@ -27,7 +27,6 @@ package containerd.services.sandbox.v1; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -import weak "gogoproto/gogo.proto"; import "github.com/containerd/containerd/api/types/sandbox.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; diff --git a/api/services/snapshots/v1/snapshots.proto b/api/services/snapshots/v1/snapshots.proto index ed4ce3187..283765d88 100644 --- a/api/services/snapshots/v1/snapshots.proto +++ b/api/services/snapshots/v1/snapshots.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.services.snapshots.v1; -import "gogoproto/gogo.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/services/tasks/v1/tasks.proto b/api/services/tasks/v1/tasks.proto index e35de91ca..8ddd31926 100644 --- a/api/services/tasks/v1/tasks.proto +++ b/api/services/tasks/v1/tasks.proto @@ -20,7 +20,6 @@ package containerd.services.tasks.v1; import "google/protobuf/empty.proto"; import "google/protobuf/any.proto"; -import "gogoproto/gogo.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/metrics.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto"; diff --git a/api/services/ttrpc/events/v1/events.proto b/api/services/ttrpc/events/v1/events.proto index 64e47f47f..e0c2f232d 100644 --- a/api/services/ttrpc/events/v1/events.proto +++ b/api/services/ttrpc/events/v1/events.proto @@ -19,7 +19,6 @@ syntax = "proto3"; package containerd.services.events.ttrpc.v1; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; -import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/services/version/v1/version.proto b/api/services/version/v1/version.proto index 5181c421b..bd948ff34 100644 --- a/api/services/version/v1/version.proto +++ b/api/services/version/v1/version.proto @@ -19,7 +19,6 @@ syntax = "proto3"; package containerd.services.version.v1; import "google/protobuf/empty.proto"; -import "gogoproto/gogo.proto"; // TODO(stevvooe): Should version service actually be versioned? option go_package = "github.com/containerd/containerd/api/services/version/v1;version"; diff --git a/api/types/descriptor.proto b/api/types/descriptor.proto index e2e8301bb..faaf416dd 100644 --- a/api/types/descriptor.proto +++ b/api/types/descriptor.proto @@ -18,8 +18,6 @@ syntax = "proto3"; package containerd.types; -import "gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/api/types;types"; // Descriptor describes a blob in a content store. diff --git a/api/types/metrics.proto b/api/types/metrics.proto index 2f07d4eac..3e6a7751e 100644 --- a/api/types/metrics.proto +++ b/api/types/metrics.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.types; -import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/types/mount.proto b/api/types/mount.proto index 92a4f0e74..54e0a0cdd 100644 --- a/api/types/mount.proto +++ b/api/types/mount.proto @@ -18,8 +18,6 @@ syntax = "proto3"; package containerd.types; -import "gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/api/types;types"; // Mount describes mounts for a container. diff --git a/api/types/platform.proto b/api/types/platform.proto index 9d48a93d2..b6088251f 100644 --- a/api/types/platform.proto +++ b/api/types/platform.proto @@ -18,8 +18,6 @@ syntax = "proto3"; package containerd.types; -import "gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/api/types;types"; // Platform follows the structure of the OCI platform specification, from diff --git a/api/types/sandbox.proto b/api/types/sandbox.proto index 27cffbf99..b60770619 100644 --- a/api/types/sandbox.proto +++ b/api/types/sandbox.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.types; -import weak "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; diff --git a/api/types/task/task.proto b/api/types/task/task.proto index dc036ee2c..afc8e94bb 100644 --- a/api/types/task/task.proto +++ b/api/types/task/task.proto @@ -18,7 +18,6 @@ syntax = "proto3"; package containerd.v1.types; -import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/any.proto"; diff --git a/pkg/runtimeoptions/v1/api.proto b/pkg/runtimeoptions/v1/api.proto index da8dc92bb..2a975b928 100644 --- a/pkg/runtimeoptions/v1/api.proto +++ b/pkg/runtimeoptions/v1/api.proto @@ -3,8 +3,6 @@ syntax = "proto3"; package runtimeoptions.v1; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1"; message Options { diff --git a/runtime/linux/runctypes/runc.proto b/runtime/linux/runctypes/runc.proto index 9a0f2732d..5e2d675fb 100644 --- a/runtime/linux/runctypes/runc.proto +++ b/runtime/linux/runctypes/runc.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package containerd.linux.runc; -import "gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;runctypes"; message RuncOptions { diff --git a/runtime/v1/shim/v1/shim.proto b/runtime/v1/shim/v1/shim.proto index 17de1315c..c0d5bf51b 100644 --- a/runtime/v1/shim/v1/shim.proto +++ b/runtime/v1/shim/v1/shim.proto @@ -20,7 +20,6 @@ package containerd.runtime.linux.shim.v1; import "google/protobuf/any.proto"; import "google/protobuf/empty.proto"; -import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/task/task.proto"; diff --git a/runtime/v2/runc/options/oci.proto b/runtime/v2/runc/options/oci.proto index 71a637dbb..6270e9991 100644 --- a/runtime/v2/runc/options/oci.proto +++ b/runtime/v2/runc/options/oci.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package containerd.runc.v1; -import "gogoproto/gogo.proto"; - option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options"; message Options {