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

Remove gogo from .proto files

Browse Source 
While gogo isn't actually used, it is still referenced from .proto files
and its corresponding Go package is imported from the auto-generated
files.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2022-04-27 18:43:52 +00:00
parent 2a358a4e11
commit fcba486366
31 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Protobuild.toml
View File

@ -8,11 +8,6 @@ generators = ["go"]
# treat the root of the project as an include, but this may not be necessary. # treat the root of the project as an include, but this may not be necessary.
before = ["./protobuf"] 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 # 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. # `/usr/local/include` to pickup the common install location of protobuf.
# This is the default. # This is the default.
@ -33,7 +28,6 @@ prefix = "github.com/containerd/containerd/runtime/linux/runctypes"
target = "runtime/linux/runctypes/next.pb.txt" target = "runtime/linux/runctypes/next.pb.txt"
ignore_files = [ ignore_files = [
"google/protobuf/descriptor.proto", "google/protobuf/descriptor.proto",
"gogoproto/gogo.proto"
] ]
[[descriptors]] [[descriptors]]
@ -41,5 +35,4 @@ prefix = "github.com/containerd/containerd/runtime/v2/runc/options"
target = "runtime/v2/runc/options/next.pb.txt" target = "runtime/v2/runc/options/next.pb.txt"
ignore_files = [ ignore_files = [
"google/protobuf/descriptor.proto", "google/protobuf/descriptor.proto",
"gogoproto/gogo.proto"
] ]

6
api/Protobuild.toml
View File

@ -8,11 +8,6 @@ generators = ["go", "go-grpc"]
# treat the root of the project as an include, but this may not be necessary. # treat the root of the project as an include, but this may not be necessary.
before = [] 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 # 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. # `/usr/local/include` to pickup the common install location of protobuf.
# This is the default. # This is the default.
@ -46,5 +41,4 @@ prefix = "github.com/containerd/containerd/api"
target = "next.pb.txt" target = "next.pb.txt"
ignore_files = [ ignore_files = [
"google/protobuf/descriptor.proto", "google/protobuf/descriptor.proto",
"gogoproto/gogo.proto"
] ]

1
api/events/container.proto
View File

@ -19,7 +19,6 @@ syntax = "proto3";
package containerd.events; package containerd.events;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/events;events"; option go_package = "github.com/containerd/containerd/api/events;events";

1
api/events/content.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.events; package containerd.events;
import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/events;events"; option go_package = "github.com/containerd/containerd/api/events;events";

1
api/events/namespace.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.events; package containerd.events;
import "gogoproto/gogo.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
option go_package = "github.com/containerd/containerd/api/events;events"; option go_package = "github.com/containerd/containerd/api/events;events";

1
api/events/task.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.events; package containerd.events;
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";

1
api/runtime/sandbox/v1/sandbox.proto
View File

@ -20,7 +20,6 @@ package containerd.runtime.sandbox.v1;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import weak "gogoproto/gogo.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";

1
api/runtime/task/v2/shim.proto
View File

@ -20,7 +20,6 @@ package containerd.task.v2;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/task/task.proto"; import "github.com/containerd/containerd/api/types/task/task.proto";

1
api/services/containers/v1/containers.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.containers.v1; package containerd.services.containers.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";

1
api/services/content/v1/content.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.content.v1; package containerd.services.content.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";

1
api/services/diff/v1/diff.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.diff.v1; package containerd.services.diff.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";

1
api/services/events/v1/events.proto
View File

@ -19,7 +19,6 @@ syntax = "proto3";
package containerd.services.events.v1; package containerd.services.events.v1;
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/services/images/v1/images.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.images.v1; package containerd.services.images.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/services/introspection/v1/introspection.proto
View File

@ -21,7 +21,6 @@ package containerd.services.introspection.v1;
import "github.com/containerd/containerd/api/types/platform.proto"; import "github.com/containerd/containerd/api/types/platform.proto";
import "google/rpc/status.proto"; import "google/rpc/status.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection"; option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection";

1
api/services/leases/v1/leases.proto
View File

@ -17,7 +17,6 @@ syntax = "proto3";
package containerd.services.leases.v1; package containerd.services.leases.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/services/namespaces/v1/namespace.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.namespaces.v1; package containerd.services.namespaces.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";

1
api/services/sandbox/v1/sandbox.proto
View File

@ -27,7 +27,6 @@ package containerd.services.sandbox.v1;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/timestamp.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/sandbox.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";

1
api/services/snapshots/v1/snapshots.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.services.snapshots.v1; package containerd.services.snapshots.v1;
import "gogoproto/gogo.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto"; import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/services/tasks/v1/tasks.proto
View File

@ -20,7 +20,6 @@ package containerd.services.tasks.v1;
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/any.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/mount.proto";
import "github.com/containerd/containerd/api/types/metrics.proto"; import "github.com/containerd/containerd/api/types/metrics.proto";
import "github.com/containerd/containerd/api/types/descriptor.proto"; import "github.com/containerd/containerd/api/types/descriptor.proto";

1
api/services/ttrpc/events/v1/events.proto
View File

@ -19,7 +19,6 @@ syntax = "proto3";
package containerd.services.events.ttrpc.v1; package containerd.services.events.ttrpc.v1;
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/services/version/v1/version.proto
View File

@ -19,7 +19,6 @@ syntax = "proto3";
package containerd.services.version.v1; package containerd.services.version.v1;
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "gogoproto/gogo.proto";
// TODO(stevvooe): Should version service actually be versioned? // TODO(stevvooe): Should version service actually be versioned?
option go_package = "github.com/containerd/containerd/api/services/version/v1;version"; option go_package = "github.com/containerd/containerd/api/services/version/v1;version";

2
api/types/descriptor.proto
View File

@ -18,8 +18,6 @@ syntax = "proto3";
package containerd.types; package containerd.types;
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/types;types"; option go_package = "github.com/containerd/containerd/api/types;types";
// Descriptor describes a blob in a content store. // Descriptor describes a blob in a content store.

1
api/types/metrics.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.types; package containerd.types;
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

2
api/types/mount.proto
View File

@ -18,8 +18,6 @@ syntax = "proto3";
package containerd.types; package containerd.types;
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/types;types"; option go_package = "github.com/containerd/containerd/api/types;types";
// Mount describes mounts for a container. // Mount describes mounts for a container.

2
api/types/platform.proto
View File

@ -18,8 +18,6 @@ syntax = "proto3";
package containerd.types; package containerd.types;
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/api/types;types"; option go_package = "github.com/containerd/containerd/api/types;types";
// Platform follows the structure of the OCI platform specification, from // Platform follows the structure of the OCI platform specification, from

1
api/types/sandbox.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.types; package containerd.types;
import weak "gogoproto/gogo.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";

1
api/types/task/task.proto
View File

@ -18,7 +18,6 @@ syntax = "proto3";
package containerd.v1.types; package containerd.v1.types;
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";

2
pkg/runtimeoptions/v1/api.proto
View File

@ -3,8 +3,6 @@ syntax = "proto3";
package runtimeoptions.v1; package runtimeoptions.v1;
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1"; option go_package = "github.com/containerd/containerd/pkg/runtimeoptions/v1;runtimeoptions_v1";
message Options { message Options {

2
runtime/linux/runctypes/runc.proto
View File

@ -2,8 +2,6 @@ syntax = "proto3";
package containerd.linux.runc; package containerd.linux.runc;
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;runctypes"; option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;runctypes";
message RuncOptions { message RuncOptions {

1
runtime/v1/shim/v1/shim.proto
View File

@ -20,7 +20,6 @@ package containerd.runtime.linux.shim.v1;
import "google/protobuf/any.proto"; import "google/protobuf/any.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/timestamp.proto"; import "google/protobuf/timestamp.proto";
import "github.com/containerd/containerd/api/types/mount.proto"; import "github.com/containerd/containerd/api/types/mount.proto";
import "github.com/containerd/containerd/api/types/task/task.proto"; import "github.com/containerd/containerd/api/types/task/task.proto";

2
runtime/v2/runc/options/oci.proto
View File

@ -2,8 +2,6 @@ syntax = "proto3";
package containerd.runc.v1; package containerd.runc.v1;
import "gogoproto/gogo.proto";
option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options"; option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options";
message Options { message Options {