Remove all gogoproto extensions
This commit removes the following gogoproto extensions; - gogoproto.nullable - gogoproto.customename - gogoproto.unmarshaller_all - gogoproto.stringer_all - gogoproto.sizer_all - gogoproto.marshaler_all - gogoproto.goproto_unregonized_all - gogoproto.goproto_stringer_all - gogoproto.goproto_getters_all None of them are supported by Google's toolchain (see #6564). Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
@@ -52,7 +52,7 @@ type Plugin struct {
|
||||
//
|
||||
// If the plugin prefers certain platforms over others, they should be
|
||||
// listed from most to least preferred.
|
||||
Platforms []types.Platform `protobuf:"bytes,4,rep,name=platforms,proto3" json:"platforms"`
|
||||
Platforms []*types.Platform `protobuf:"bytes,4,rep,name=platforms,proto3" json:"platforms,omitempty"`
|
||||
// Exports allows plugins to provide values about state or configuration to
|
||||
// interested parties.
|
||||
//
|
||||
@@ -158,10 +158,10 @@ func (m *PluginsRequest) XXX_DiscardUnknown() {
|
||||
var xxx_messageInfo_PluginsRequest proto.InternalMessageInfo
|
||||
|
||||
type PluginsResponse struct {
|
||||
Plugins []Plugin `protobuf:"bytes,1,rep,name=plugins,proto3" json:"plugins"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
Plugins []*Plugin `protobuf:"bytes,1,rep,name=plugins,proto3" json:"plugins,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
}
|
||||
|
||||
func (m *PluginsResponse) Reset() { *m = PluginsResponse{} }
|
||||
@@ -248,42 +248,41 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_1a14fda866f10715 = []byte{
|
||||
// 548 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x41, 0x6f, 0xd3, 0x4c,
|
||||
0x10, 0xad, 0x9d, 0x34, 0x6e, 0x36, 0xfd, 0xfa, 0xa1, 0x55, 0x55, 0x2c, 0x83, 0x9c, 0x28, 0xe2,
|
||||
0x10, 0x21, 0x58, 0xab, 0x01, 0x24, 0x5a, 0x24, 0x0e, 0x51, 0x73, 0x88, 0xd4, 0x43, 0xe5, 0xa8,
|
||||
0x1c, 0xb8, 0x54, 0x8e, 0xb3, 0x31, 0x2b, 0x1c, 0xef, 0x76, 0x77, 0x6d, 0x91, 0x1b, 0x3f, 0x2f,
|
||||
0x47, 0x8e, 0x9c, 0x02, 0xf5, 0x6f, 0xe0, 0x07, 0x20, 0xef, 0xda, 0x69, 0x72, 0x4b, 0xc4, 0x6d,
|
||||
0xe6, 0xcd, 0xbc, 0x99, 0x37, 0xcf, 0x2b, 0x03, 0x3f, 0x22, 0xf2, 0x4b, 0x3a, 0x41, 0x21, 0x9d,
|
||||
0x7b, 0x21, 0x4d, 0x64, 0x40, 0x12, 0xcc, 0xa7, 0x9b, 0x61, 0xc0, 0x88, 0x27, 0x30, 0xcf, 0x48,
|
||||
0x88, 0x85, 0x47, 0x12, 0xc9, 0xa9, 0x60, 0x38, 0x94, 0x84, 0x26, 0x5e, 0x76, 0xbe, 0x0d, 0x20,
|
||||
0xc6, 0xa9, 0xa4, 0xf0, 0xc5, 0x23, 0x1b, 0x55, 0x4c, 0xb4, 0xdd, 0x98, 0x9d, 0x3b, 0x17, 0x3b,
|
||||
0x6d, 0x96, 0x0b, 0x86, 0x85, 0xc7, 0xe2, 0x40, 0xce, 0x28, 0x9f, 0xeb, 0x05, 0xce, 0xd3, 0x88,
|
||||
0xd2, 0x28, 0xc6, 0x1e, 0x67, 0xa1, 0x27, 0x64, 0x20, 0x53, 0x51, 0x16, 0x9e, 0x95, 0x05, 0x95,
|
||||
0x4d, 0xd2, 0x99, 0x87, 0xe7, 0x4c, 0x2e, 0xca, 0xe2, 0x69, 0x44, 0x23, 0xaa, 0x42, 0xaf, 0x88,
|
||||
0x34, 0xda, 0xfd, 0x63, 0x82, 0xc6, 0x4d, 0x9c, 0x46, 0x24, 0x81, 0x10, 0xd4, 0x8b, 0x75, 0xb6,
|
||||
0xd1, 0x31, 0x7a, 0x4d, 0x5f, 0xc5, 0xf0, 0x0c, 0x98, 0x64, 0x6a, 0x9b, 0x05, 0x32, 0x68, 0xe4,
|
||||
0xab, 0xb6, 0x39, 0xba, 0xf2, 0x4d, 0x32, 0x85, 0x0e, 0x38, 0xe2, 0xf8, 0x3e, 0x25, 0x1c, 0x0b,
|
||||
0xbb, 0xd6, 0xa9, 0xf5, 0x9a, 0xfe, 0x3a, 0x87, 0x1f, 0x41, 0xb3, 0x12, 0x2c, 0xec, 0x7a, 0xa7,
|
||||
0xd6, 0x6b, 0xf5, 0x1d, 0xb4, 0xe1, 0x89, 0xba, 0x09, 0xdd, 0x94, 0x2d, 0x83, 0xfa, 0x72, 0xd5,
|
||||
0x3e, 0xf0, 0x1f, 0x29, 0x70, 0x0c, 0x2c, 0xfc, 0x8d, 0x51, 0x2e, 0x85, 0x7d, 0xa8, 0xd8, 0x17,
|
||||
0x68, 0x17, 0x47, 0x91, 0x3e, 0x03, 0x0d, 0x35, 0x77, 0x98, 0x48, 0xbe, 0xf0, 0xab, 0x49, 0xb0,
|
||||
0x0b, 0x8e, 0xc3, 0x80, 0x05, 0x13, 0x12, 0x13, 0x49, 0xb0, 0xb0, 0x1b, 0x4a, 0xf4, 0x16, 0x06,
|
||||
0x5f, 0x83, 0x23, 0x92, 0x10, 0x79, 0x87, 0x39, 0xb7, 0xad, 0x8e, 0xd1, 0x6b, 0xf5, 0x21, 0xd2,
|
||||
0x8e, 0x22, 0xce, 0x42, 0x34, 0x56, 0x56, 0xfb, 0x56, 0xd1, 0x33, 0xe4, 0xdc, 0xb9, 0x04, 0xc7,
|
||||
0x9b, 0xbb, 0xe0, 0x13, 0x50, 0xfb, 0x8a, 0x17, 0xa5, 0x7d, 0x45, 0x08, 0x4f, 0xc1, 0x61, 0x16,
|
||||
0xc4, 0x29, 0xd6, 0x06, 0xfa, 0x3a, 0xb9, 0x34, 0xdf, 0x1b, 0xdd, 0x97, 0xe0, 0x44, 0xcb, 0x15,
|
||||
0x3e, 0xbe, 0x4f, 0xb1, 0x90, 0xd0, 0x06, 0xd6, 0x8c, 0xc4, 0x12, 0x73, 0x61, 0x1b, 0x4a, 0x5b,
|
||||
0x95, 0x76, 0xef, 0xc0, 0xff, 0xeb, 0x5e, 0xc1, 0x68, 0x22, 0x30, 0xbc, 0x06, 0x16, 0xd3, 0x90,
|
||||
0x6a, 0x6e, 0xf5, 0x5f, 0xed, 0x63, 0x51, 0x69, 0x79, 0x35, 0xa2, 0x8b, 0xc0, 0xc9, 0x18, 0xf3,
|
||||
0x0c, 0xf3, 0xf5, 0xfc, 0xe7, 0xa0, 0x9e, 0xa6, 0x64, 0xaa, 0x6f, 0x19, 0x1c, 0xe5, 0xab, 0x76,
|
||||
0xfd, 0xf6, 0x76, 0x74, 0xe5, 0x2b, 0xb4, 0xff, 0xcb, 0x00, 0xff, 0x8d, 0x36, 0x47, 0xc3, 0x0c,
|
||||
0x58, 0xa5, 0x44, 0xf8, 0x76, 0x1f, 0x25, 0xd5, 0xf5, 0xce, 0xbb, 0x3d, 0x59, 0xa5, 0xce, 0x4f,
|
||||
0xa0, 0xa1, 0x95, 0xc3, 0xb3, 0xea, 0x4b, 0x55, 0x6f, 0x1f, 0x0d, 0x8b, 0xb7, 0xef, 0xec, 0x28,
|
||||
0x67, 0xfb, 0xfe, 0xc1, 0x6c, 0xf9, 0xe0, 0x1e, 0xfc, 0x7c, 0x70, 0x0f, 0xbe, 0xe7, 0xae, 0xb1,
|
||||
0xcc, 0x5d, 0xe3, 0x47, 0xee, 0x1a, 0xbf, 0x73, 0xd7, 0xf8, 0x7c, 0xfd, 0x6f, 0x3f, 0x8c, 0x0f,
|
||||
0x5b, 0xc0, 0xa4, 0xa1, 0xd4, 0xbe, 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x15, 0xc1, 0xc4, 0xe8,
|
||||
0x87, 0x04, 0x00, 0x00,
|
||||
// 529 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
|
||||
0x10, 0xad, 0x9d, 0x36, 0x6e, 0x26, 0xa5, 0xa0, 0x55, 0x55, 0x2c, 0x23, 0x99, 0x28, 0xea, 0x21,
|
||||
0x42, 0xb0, 0x56, 0x03, 0x48, 0x6d, 0xb9, 0x55, 0x04, 0xa9, 0x12, 0x87, 0xca, 0x91, 0x90, 0xe0,
|
||||
0x82, 0x1c, 0x67, 0x62, 0x56, 0x38, 0xde, 0xed, 0xee, 0xda, 0x22, 0x37, 0x7e, 0x5e, 0x8f, 0x1c,
|
||||
0x39, 0x01, 0xcd, 0x0f, 0xe0, 0x37, 0x20, 0x7f, 0xa5, 0xf1, 0x2d, 0x11, 0xb7, 0x99, 0xb7, 0xef,
|
||||
0xed, 0xbc, 0x79, 0x5e, 0x19, 0xfc, 0x88, 0xe9, 0x2f, 0xe9, 0x84, 0x86, 0x7c, 0xee, 0x85, 0x3c,
|
||||
0xd1, 0x01, 0x4b, 0x50, 0x4e, 0xd7, 0xcb, 0x40, 0x30, 0x4f, 0xa1, 0xcc, 0x58, 0x88, 0xca, 0x63,
|
||||
0x89, 0x96, 0x5c, 0x09, 0x0c, 0x35, 0xe3, 0x89, 0x97, 0x9d, 0x36, 0x01, 0x2a, 0x24, 0xd7, 0x9c,
|
||||
0x9c, 0xdc, 0xab, 0x69, 0xad, 0xa4, 0x4d, 0x62, 0x76, 0xea, 0x9c, 0x6f, 0x34, 0x59, 0x2f, 0x04,
|
||||
0x2a, 0x4f, 0xc4, 0x81, 0x9e, 0x71, 0x39, 0x2f, 0x07, 0x38, 0x8f, 0x23, 0xce, 0xa3, 0x18, 0x3d,
|
||||
0x29, 0x42, 0x4f, 0xe9, 0x40, 0xa7, 0xaa, 0x3a, 0x78, 0x52, 0x1d, 0x14, 0xdd, 0x24, 0x9d, 0x79,
|
||||
0x38, 0x17, 0x7a, 0x51, 0x1d, 0x1e, 0x45, 0x3c, 0xe2, 0x45, 0xe9, 0xe5, 0x55, 0x89, 0xf6, 0xff,
|
||||
0x9a, 0xd0, 0xbe, 0x8e, 0xd3, 0x88, 0x25, 0x84, 0xc0, 0x6e, 0x3e, 0xce, 0x36, 0x7a, 0xc6, 0xa0,
|
||||
0xe3, 0x17, 0x35, 0x39, 0x06, 0x93, 0x4d, 0x6d, 0x33, 0x47, 0x2e, 0xdb, 0xcb, 0x5f, 0x4f, 0xcd,
|
||||
0xab, 0xb7, 0xbe, 0xc9, 0xa6, 0xc4, 0x81, 0x7d, 0x89, 0x37, 0x29, 0x93, 0xa8, 0xec, 0x56, 0xaf,
|
||||
0x35, 0xe8, 0xf8, 0xab, 0x9e, 0x9c, 0x41, 0xa7, 0x36, 0xac, 0xec, 0xdd, 0x5e, 0x6b, 0xd0, 0x1d,
|
||||
0x3a, 0x74, 0x2d, 0x93, 0x62, 0x27, 0x7a, 0x5d, 0x51, 0xfc, 0x7b, 0x32, 0x19, 0x83, 0x85, 0xdf,
|
||||
0x04, 0x97, 0x5a, 0xd9, 0x7b, 0x85, 0xee, 0x9c, 0x6e, 0x92, 0x25, 0x2d, 0x17, 0xa0, 0xa3, 0x52,
|
||||
0x3b, 0x4a, 0xb4, 0x5c, 0xf8, 0xf5, 0x4d, 0xa4, 0x0f, 0x07, 0x61, 0x20, 0x82, 0x09, 0x8b, 0x99,
|
||||
0x66, 0xa8, 0xec, 0x76, 0x61, 0xb7, 0x81, 0x91, 0x17, 0xb0, 0xcf, 0x12, 0xa6, 0x3f, 0xa3, 0x94,
|
||||
0xb6, 0xd5, 0x33, 0x06, 0xdd, 0x21, 0xa1, 0x65, 0x96, 0x54, 0x8a, 0x90, 0x8e, 0x8b, 0x90, 0x7d,
|
||||
0x2b, 0xe7, 0x8c, 0xa4, 0x74, 0x2e, 0xe0, 0x60, 0x7d, 0x16, 0x79, 0x04, 0xad, 0xaf, 0xb8, 0xa8,
|
||||
0x82, 0xcb, 0x4b, 0x72, 0x04, 0x7b, 0x59, 0x10, 0xa7, 0x58, 0x46, 0xe7, 0x97, 0xcd, 0x85, 0x79,
|
||||
0x66, 0xf4, 0x9f, 0xc1, 0x61, 0x69, 0x57, 0xf9, 0x78, 0x93, 0xa2, 0xd2, 0xc4, 0x06, 0x6b, 0xc6,
|
||||
0x62, 0x8d, 0x52, 0xd9, 0x46, 0xe1, 0xad, 0x6e, 0xfb, 0x1f, 0xe1, 0xe1, 0x8a, 0xab, 0x04, 0x4f,
|
||||
0x14, 0x92, 0x77, 0x60, 0x89, 0x12, 0x2a, 0xc8, 0xdd, 0xe1, 0xf3, 0x6d, 0x22, 0xf2, 0x6b, 0x71,
|
||||
0xff, 0x04, 0x0e, 0xc7, 0x28, 0x33, 0x94, 0xab, 0x9b, 0x09, 0xec, 0xa6, 0x29, 0x9b, 0xd6, 0x9f,
|
||||
0x3f, 0xaf, 0x87, 0xbf, 0x0d, 0x78, 0x70, 0xb5, 0x7e, 0x15, 0xc9, 0xc0, 0xaa, 0x2c, 0x91, 0x57,
|
||||
0xdb, 0x4c, 0xae, 0xb7, 0x75, 0x5e, 0x6f, 0xa9, 0xaa, 0xdc, 0x7d, 0x80, 0x76, 0xe9, 0x97, 0x1c,
|
||||
0xd7, 0x5f, 0xa6, 0x7e, 0xe5, 0x74, 0x94, 0xbf, 0x72, 0x67, 0x43, 0x3b, 0xcd, 0xad, 0x2f, 0x67,
|
||||
0xb7, 0x77, 0xee, 0xce, 0xcf, 0x3b, 0x77, 0xe7, 0xfb, 0xd2, 0x35, 0x6e, 0x97, 0xae, 0xf1, 0x63,
|
||||
0xe9, 0x1a, 0x7f, 0x96, 0xae, 0xf1, 0xe9, 0xfd, 0xff, 0xfd, 0x1a, 0xde, 0x34, 0x80, 0x49, 0xbb,
|
||||
0x70, 0xfb, 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x6f, 0xe7, 0xad, 0x71, 0x04, 0x00,
|
||||
0x00,
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
@@ -750,9 +749,9 @@ func (this *Plugin) String() string {
|
||||
if this == nil {
|
||||
return "nil"
|
||||
}
|
||||
repeatedStringForPlatforms := "[]Platform{"
|
||||
repeatedStringForPlatforms := "[]*Platform{"
|
||||
for _, f := range this.Platforms {
|
||||
repeatedStringForPlatforms += fmt.Sprintf("%v", f) + ","
|
||||
repeatedStringForPlatforms += strings.Replace(fmt.Sprintf("%v", f), "Platform", "types.Platform", 1) + ","
|
||||
}
|
||||
repeatedStringForPlatforms += "}"
|
||||
keysForExports := make([]string, 0, len(this.Exports))
|
||||
@@ -793,9 +792,9 @@ func (this *PluginsResponse) String() string {
|
||||
if this == nil {
|
||||
return "nil"
|
||||
}
|
||||
repeatedStringForPlugins := "[]Plugin{"
|
||||
repeatedStringForPlugins := "[]*Plugin{"
|
||||
for _, f := range this.Plugins {
|
||||
repeatedStringForPlugins += strings.Replace(strings.Replace(f.String(), "Plugin", "Plugin", 1), `&`, ``, 1) + ","
|
||||
repeatedStringForPlugins += strings.Replace(f.String(), "Plugin", "Plugin", 1) + ","
|
||||
}
|
||||
repeatedStringForPlugins += "}"
|
||||
s := strings.Join([]string{`&PluginsResponse{`,
|
||||
@@ -810,7 +809,7 @@ func (this *ServerResponse) String() string {
|
||||
return "nil"
|
||||
}
|
||||
s := strings.Join([]string{`&ServerResponse{`,
|
||||
`UUID:` + fmt.Sprintf("%v", this.UUID) + `,`,
|
||||
`Uuid:` + fmt.Sprintf("%v", this.UUID) + `,`,
|
||||
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
|
||||
`}`,
|
||||
}, "")
|
||||
@@ -978,7 +977,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error {
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Platforms = append(m.Platforms, types.Platform{})
|
||||
m.Platforms = append(m.Platforms, &types.Platform{})
|
||||
if err := m.Platforms[len(m.Platforms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -1341,7 +1340,7 @@ func (m *PluginsResponse) Unmarshal(dAtA []byte) error {
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Plugins = append(m.Plugins, Plugin{})
|
||||
m.Plugins = append(m.Plugins, &Plugin{})
|
||||
if err := m.Plugins[len(m.Plugins)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -1399,7 +1398,7 @@ func (m *ServerResponse) Unmarshal(dAtA []byte) error {
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field UUID", wireType)
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Uuid", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
|
||||
@@ -57,7 +57,7 @@ message Plugin {
|
||||
//
|
||||
// If the plugin prefers certain platforms over others, they should be
|
||||
// listed from most to least preferred.
|
||||
repeated types.Platform platforms = 4 [(gogoproto.nullable) = false];
|
||||
repeated types.Platform platforms = 4;
|
||||
|
||||
// Exports allows plugins to provide values about state or configuration to
|
||||
// interested parties.
|
||||
@@ -96,9 +96,9 @@ message PluginsRequest {
|
||||
}
|
||||
|
||||
message PluginsResponse {
|
||||
repeated Plugin plugins = 1 [(gogoproto.nullable) = false];
|
||||
repeated Plugin plugins = 1;
|
||||
}
|
||||
|
||||
message ServerResponse {
|
||||
string uuid = 1 [(gogoproto.customname) = "UUID"];
|
||||
string uuid = 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user