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

Remove enumvalue_customname, goproto_enum_prefix and enum_customname

Browse Source 
This commit removes gogoproto.enumvalue_customname,
gogoproto.goproto_enum_prefix and gogoproto.enum_customname.

All of them make proto-generated Go code more idiomatic, but we already
don't use these enums in our external-surfacing types and they are anyway
not supported by Google's official toolchain (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-03-21 19:07:10 +00:00
parent 977cb8bef0
commit 067611fdea
22 changed files with 269 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
api/types/task/task.pb.go
View File

@@ -32,12 +32,12 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Status int32
const (
StatusUnknown Status = 0
StatusCreated Status = 1
StatusRunning Status = 2
StatusStopped Status = 3
StatusPaused Status = 4
StatusPausing Status = 5
Status_UNKNOWN Status = 0
Status_CREATED Status = 1
Status_RUNNING Status = 2
Status_STOPPED Status = 3
Status_PAUSED Status = 4
Status_PAUSING Status = 5
)
var Status_name = map[int32]string{
@@ -169,41 +169,37 @@ func init() {
}
var fileDescriptor_391ef18c8ab0dc16 = []byte{
// 543 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x6e, 0xd3, 0x4c,
0x14, 0xc5, 0x33, 0x6e, 0xe3, 0x24, 0xe3, 0xb6, 0x9f, 0x3f, 0x13, 0x55, 0xc6, 0x20, 0xdb, 0xea,
0xca, 0x62, 0x61, 0x8b, 0x74, 0xc7, 0x2e, 0xff, 0x84, 0x2c, 0x24, 0x37, 0x72, 0x12, 0xb1, 0x8c,
0x9c, 0x78, 0x62, 0x46, 0x6d, 0x66, 0x2c, 0x7b, 0x0c, 0x64, 0xc7, 0x12, 0x75, 0xc5, 0x0b, 0x74,
0x05, 0x4f, 0xc1, 0x13, 0x64, 0xc9, 0x0a, 0xb1, 0x0a, 0xd4, 0x4f, 0x82, 0xc6, 0x76, 0xd2, 0x08,
0xd8, 0x8c, 0xee, 0x3d, 0xbf, 0x33, 0x77, 0xee, 0x1c, 0xf8, 0x22, 0xc2, 0xec, 0x4d, 0x36, 0xb7,
0x17, 0x74, 0xe5, 0x2c, 0x28, 0x61, 0x01, 0x26, 0x28, 0x09, 0x0f, 0xcb, 0x20, 0xc6, 0x0e, 0x5b,
0xc7, 0x28, 0x75, 0x58, 0x90, 0x5e, 0x17, 0x87, 0x1d, 0x27, 0x94, 0x51, 0xe5, 0xd1, 0x83, 0xcb,
0x7e, 0xfb, 0xdc, 0x2e, 0x4c, 0x5a, 0x3b, 0xa2, 0x11, 0x2d, 0xb8, 0xc3, 0xab, 0xd2, 0xaa, 0x19,
0x11, 0xa5, 0xd1, 0x0d, 0x72, 0x8a, 0x6e, 0x9e, 0x2d, 0x1d, 0x86, 0x57, 0x28, 0x65, 0xc1, 0x2a,
0xae, 0x0c, 0x8f, 0xff, 0x34, 0x04, 0x64, 0x5d, 0xa2, 0x8b, 0x5c, 0x80, 0x8d, 0x51, 0x42, 0x17,
0x28, 0x4d, 0x95, 0x0e, 0x3c, 0xd9, 0x3f, 0x3a, 0xc3, 0xa1, 0x0a, 0x4c, 0x60, 0xb5, 0x7a, 0xff,
0xe5, 0x5b, 0x43, 0xea, 0xef, 0x74, 0x77, 0xe0, 0x4b, 0x7b, 0x93, 0x1b, 0x2a, 0xe7, 0x50, 0xc0,
0xa1, 0x2a, 0x14, 0x4e, 0x31, 0xdf, 0x1a, 0x82, 0x3b, 0xf0, 0x05, 0x1c, 0x2a, 0x32, 0x3c, 0x8a,
0x71, 0xa8, 0x1e, 0x99, 0xc0, 0x3a, 0xf5, 0x79, 0xa9, 0x5c, 0x42, 0x31, 0x65, 0x01, 0xcb, 0x52,
0xf5, 0xd8, 0x04, 0xd6, 0x59, 0xe7, 0x89, 0xfd, 0x8f, 0x1f, 0xda, 0xe3, 0xc2, 0xe2, 0x57, 0x56,
0xa5, 0x0d, 0xeb, 0x29, 0x0b, 0x31, 0x51, 0xeb, 0xfc, 0x05, 0xbf, 0x6c, 0x94, 0x73, 0x3e, 0x2a,
0xa4, 0x19, 0x53, 0xc5, 0x42, 0xae, 0xba, 0x4a, 0x47, 0x49, 0xa2, 0x36, 0xf6, 0x3a, 0x4a, 0x12,
0x45, 0x83, 0x4d, 0x86, 0x92, 0x15, 0x26, 0xc1, 0x8d, 0xda, 0x34, 0x81, 0xd5, 0xf4, 0xf7, 0xbd,
0x62, 0x40, 0x09, 0xbd, 0xc7, 0x6c, 0x56, 0xed, 0xd6, 0x2a, 0x16, 0x86, 0x5c, 0x2a, 0x57, 0x51,
0xba, 0xb0, 0xc5, 0x3b, 0x14, 0xce, 0x02, 0xa6, 0x42, 0x13, 0x58, 0x52, 0x47, 0xb3, 0xcb, 0x40,
0xed, 0x5d, 0xa0, 0xf6, 0x64, 0x97, 0x78, 0xaf, 0xb9, 0xd9, 0x1a, 0xb5, 0x4f, 0x3f, 0x0d, 0xe0,
0x37, 0xcb, 0x6b, 0x5d, 0x76, 0xe1, 0x42, 0xa9, 0xca, 0xd8, 0x25, 0x4b, 0xba, 0xcb, 0x06, 0x3c,
0x64, 0x63, 0xc1, 0x63, 0x4c, 0x96, 0xb4, 0xc8, 0x51, 0xea, 0xb4, 0xff, 0x1a, 0xdf, 0x25, 0x6b,
0xbf, 0x70, 0x3c, 0xfb, 0x0e, 0xa0, 0x58, 0x2d, 0xa6, 0xc3, 0xc6, 0xd4, 0x7b, 0xe5, 0x5d, 0xbd,
0xf6, 0xe4, 0x9a, 0xf6, 0xff, 0xed, 0x9d, 0x79, 0x5a, 0x82, 0x29, 0xb9, 0x26, 0xf4, 0x1d, 0xe1,
0xbc, 0xef, 0x0f, 0xbb, 0x93, 0xe1, 0x40, 0x06, 0x87, 0xbc, 0x9f, 0xa0, 0x80, 0xa1, 0x90, 0x73,
0x7f, 0xea, 0x79, 0xae, 0xf7, 0x52, 0x16, 0x0e, 0xb9, 0x9f, 0x11, 0x82, 0x49, 0xc4, 0xf9, 0x78,
0x72, 0x35, 0x1a, 0x0d, 0x07, 0xf2, 0xd1, 0x21, 0x1f, 0x33, 0x1a, 0xc7, 0x28, 0x54, 0x9e, 0x42,
0x71, 0xd4, 0x9d, 0x8e, 0x87, 0x03, 0xf9, 0x58, 0x93, 0x6f, 0xef, 0xcc, 0x93, 0x12, 0x8f, 0x82,
0x2c, 0x2d, 0xa7, 0x73, 0xca, 0xa7, 0xd7, 0x0f, 0x6f, 0x73, 0x8c, 0x49, 0xa4, 0x9d, 0x7d, 0xfc,
0xac, 0xd7, 0xbe, 0x7e, 0xd1, 0xab, 0xdf, 0xf4, 0xd4, 0xcd, 0xbd, 0x5e, 0xfb, 0x71, 0xaf, 0xd7,
0x3e, 0xe4, 0x3a, 0xd8, 0xe4, 0x3a, 0xf8, 0x96, 0xeb, 0xe0, 0x57, 0xae, 0x83, 0xb9, 0x58, 0xc4,
0x70, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x19, 0xf7, 0x5b, 0x8f, 0x4e, 0x03, 0x00, 0x00,
// 470 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x8f, 0xd2, 0x40,
0x18, 0xc6, 0x99, 0x02, 0x05, 0xa6, 0xfe, 0x69, 0x46, 0xb2, 0x19, 0x31, 0x69, 0xc9, 0x9e, 0x1a,
0x0f, 0x6d, 0x64, 0x6f, 0xde, 0x60, 0x4b, 0x4c, 0x63, 0xd2, 0x25, 0x03, 0xc4, 0x23, 0x29, 0x74,
0xa8, 0x13, 0x97, 0x4e, 0xd3, 0x0e, 0x46, 0x6e, 0x7e, 0x04, 0x3f, 0x16, 0x47, 0x8f, 0x9e, 0xd0,
0xed, 0x27, 0x31, 0x33, 0x2d, 0xac, 0x51, 0x2f, 0xcd, 0xfb, 0x3c, 0xef, 0xaf, 0x33, 0xcf, 0x3c,
0xf0, 0x6d, 0xc2, 0xc4, 0xc7, 0xfd, 0xda, 0xdd, 0xf0, 0x9d, 0xb7, 0xe1, 0xa9, 0x88, 0x58, 0x4a,
0xf3, 0xf8, 0xcf, 0x31, 0xca, 0x98, 0x27, 0x0e, 0x19, 0x2d, 0x3c, 0x11, 0x15, 0x9f, 0xd4, 0xc7,
0xcd, 0x72, 0x2e, 0x38, 0x7a, 0xf1, 0x48, 0xb9, 0x9f, 0xdf, 0xb8, 0x0a, 0x1a, 0xf4, 0x13, 0x9e,
0x70, 0xb5, 0xf7, 0xe4, 0x54, 0xa1, 0x03, 0x3b, 0xe1, 0x3c, 0xb9, 0xa7, 0x9e, 0x52, 0xeb, 0xfd,
0xd6, 0x13, 0x6c, 0x47, 0x0b, 0x11, 0xed, 0xb2, 0x1a, 0x78, 0xf9, 0x37, 0x10, 0xa5, 0x87, 0x6a,
0x75, 0x5d, 0x6a, 0xb0, 0x33, 0xcb, 0xf9, 0x86, 0x16, 0x05, 0x1a, 0xc1, 0x27, 0x97, 0x4b, 0x57,
0x2c, 0xc6, 0x60, 0x08, 0x9c, 0xde, 0xe4, 0x79, 0x79, 0xb2, 0x8d, 0xdb, 0xb3, 0x1f, 0xf8, 0xc4,
0xb8, 0x40, 0x41, 0x8c, 0xae, 0xa0, 0xc6, 0x62, 0xac, 0x29, 0x52, 0x2f, 0x4f, 0xb6, 0x16, 0xf8,
0x44, 0x63, 0x31, 0x32, 0x61, 0x33, 0x63, 0x31, 0x6e, 0x0e, 0x81, 0xf3, 0x94, 0xc8, 0x11, 0xdd,
0x40, 0xbd, 0x10, 0x91, 0xd8, 0x17, 0xb8, 0x35, 0x04, 0xce, 0xb3, 0xd1, 0x2b, 0xf7, 0x3f, 0x2f,
0x74, 0xe7, 0x0a, 0x21, 0x35, 0x8a, 0xfa, 0xb0, 0x5d, 0x88, 0x98, 0xa5, 0xb8, 0x2d, 0x6f, 0x20,
0x95, 0x40, 0x57, 0xf2, 0xa8, 0x98, 0xef, 0x05, 0xd6, 0x95, 0x5d, 0xab, 0xda, 0xa7, 0x79, 0x8e,
0x3b, 0x17, 0x9f, 0xe6, 0x39, 0x1a, 0xc0, 0xae, 0xa0, 0xf9, 0x8e, 0xa5, 0xd1, 0x3d, 0xee, 0x0e,
0x81, 0xd3, 0x25, 0x17, 0x8d, 0x6c, 0x68, 0xd0, 0x2f, 0x4c, 0xac, 0xea, 0x6c, 0x3d, 0x15, 0x18,
0x4a, 0xab, 0x8a, 0x82, 0xc6, 0xb0, 0x27, 0x15, 0x8d, 0x57, 0x91, 0xc0, 0x70, 0x08, 0x1c, 0x63,
0x34, 0x70, 0xab, 0x42, 0xdd, 0x73, 0xa1, 0xee, 0xe2, 0xdc, 0xf8, 0xa4, 0x7b, 0x3c, 0xd9, 0x8d,
0x6f, 0x3f, 0x6d, 0x40, 0xba, 0xd5, 0x6f, 0x63, 0x71, 0x1d, 0x40, 0xa3, 0xee, 0x38, 0x48, 0xb7,
0xfc, 0xdc, 0x0d, 0x78, 0xec, 0xc6, 0x81, 0x2d, 0x96, 0x6e, 0xb9, 0xea, 0xd1, 0x18, 0xf5, 0xff,
0x39, 0x7e, 0x9c, 0x1e, 0x88, 0x22, 0x5e, 0x2f, 0xa1, 0x5e, 0xe7, 0x32, 0x60, 0x67, 0x19, 0xbe,
0x0f, 0xef, 0x3e, 0x84, 0x66, 0x43, 0x8a, 0x5b, 0x32, 0x1d, 0x2f, 0xa6, 0xbe, 0x09, 0xa4, 0x20,
0xcb, 0x30, 0x0c, 0xc2, 0x77, 0xa6, 0x26, 0xc5, 0x7c, 0x71, 0x37, 0x9b, 0x4d, 0x7d, 0xb3, 0x89,
0x20, 0xd4, 0x67, 0xe3, 0xe5, 0x7c, 0xea, 0x9b, 0x2d, 0xb9, 0x90, 0xb3, 0xa4, 0xda, 0x13, 0x7c,
0x7c, 0xb0, 0x1a, 0x3f, 0x1e, 0xac, 0xc6, 0xd7, 0xd2, 0x02, 0xc7, 0xd2, 0x02, 0xdf, 0x4b, 0x0b,
0xfc, 0x2a, 0x2d, 0xb0, 0xd6, 0x55, 0x88, 0x9b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x54,
0x02, 0x74, 0xcc, 0x02, 0x00, 0x00,
}
func (m *Process) Marshal() (dAtA []byte, err error) {

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

@@ -23,15 +23,12 @@ import "google/protobuf/timestamp.proto";
import "google/protobuf/any.proto";
enum Status {
option (gogoproto.goproto_enum_prefix) = false;
option (gogoproto.enum_customname) = "Status";
UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "StatusUnknown"];
CREATED = 1 [(gogoproto.enumvalue_customname) = "StatusCreated"];
RUNNING = 2 [(gogoproto.enumvalue_customname) = "StatusRunning"];
STOPPED = 3 [(gogoproto.enumvalue_customname) = "StatusStopped"];
PAUSED = 4 [(gogoproto.enumvalue_customname) = "StatusPaused"];
PAUSING = 5 [(gogoproto.enumvalue_customname) = "StatusPausing"];
UNKNOWN = 0;
CREATED = 1;
RUNNING = 2;
STOPPED = 3;
PAUSED = 4;
PAUSING = 5;
}
message Process {