some 'not backwards' compatible changes

thank goodness I can make all the dumb mistakes now
Google must internally be 10 years ahead of everyone else
hmm. well, ok, 5 years ahead of us

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-26 00:47:51 -07:00
parent b91dbf093b
commit d01fe4e1cf
2 changed files with 79 additions and 119 deletions

View File

@ -76,15 +76,11 @@ type Event struct {
Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"` Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"`
Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
Comment string `protobuf:"bytes,3,opt,name=comment,proto3" json:"comment,omitempty"` Comment string `protobuf:"bytes,3,opt,name=comment,proto3" json:"comment,omitempty"`
Username string `protobuf:"bytes,4,opt,name=username,proto3" json:"username,omitempty"` Config *Config `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
Email string `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"` Account *Account `protobuf:"bytes,5,opt,name=account,proto3" json:"account,omitempty"`
Password string `protobuf:"bytes,6,opt,name=password,proto3" json:"password,omitempty"` Results []*Event_Response `protobuf:"bytes,6,rep,name=results,proto3" json:"results,omitempty"`
Token string `protobuf:"bytes,7,opt,name=token,proto3" json:"token,omitempty"` Networks []*Event_Network `protobuf:"bytes,7,rep,name=networks,proto3" json:"networks,omitempty"`
Results []*Event_Response `protobuf:"bytes,8,rep,name=results,proto3" json:"results,omitempty"` Vms []*Event_VM `protobuf:"bytes,8,rep,name=vms,proto3" json:"vms,omitempty"`
Networks []*Event_Network `protobuf:"bytes,9,rep,name=networks,proto3" json:"networks,omitempty"`
Vms []*Event_VM `protobuf:"bytes,10,rep,name=vms,proto3" json:"vms,omitempty"`
Test *Config `protobuf:"bytes,11,opt,name=test,proto3" json:"test,omitempty"`
Account *Account `protobuf:"bytes,12,opt,name=account,proto3" json:"account,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -136,32 +132,18 @@ func (m *Event) GetComment() string {
return "" return ""
} }
func (m *Event) GetUsername() string { func (m *Event) GetConfig() *Config {
if m != nil { if m != nil {
return m.Username return m.Config
} }
return "" return nil
} }
func (m *Event) GetEmail() string { func (m *Event) GetAccount() *Account {
if m != nil { if m != nil {
return m.Email return m.Account
} }
return "" return nil
}
func (m *Event) GetPassword() string {
if m != nil {
return m.Password
}
return ""
}
func (m *Event) GetToken() string {
if m != nil {
return m.Token
}
return ""
} }
func (m *Event) GetResults() []*Event_Response { func (m *Event) GetResults() []*Event_Response {
@ -185,20 +167,6 @@ func (m *Event) GetVms() []*Event_VM {
return nil return nil
} }
func (m *Event) GetTest() *Config {
if m != nil {
return m.Test
}
return nil
}
func (m *Event) GetAccount() *Account {
if m != nil {
return m.Account
}
return nil
}
type Event_Response struct { type Event_Response struct {
Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"` Type Event_EventType `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"`
Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
@ -455,43 +423,40 @@ func init() {
func init() { proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) } func init() { proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) }
var fileDescriptor_8f22242cb04491f9 = []byte{ var fileDescriptor_8f22242cb04491f9 = []byte{
// 598 bytes of a gzipped FileDescriptorProto // 558 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x4f, 0xdb, 0x30, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x4f, 0x6b, 0xdb, 0x40,
0x14, 0x5e, 0x7e, 0x35, 0xc9, 0x6b, 0x41, 0x91, 0xc7, 0x26, 0x2b, 0x70, 0xa8, 0xb8, 0xd0, 0x53, 0x10, 0xc5, 0x2b, 0xc9, 0xfa, 0x37, 0x4e, 0x82, 0xd8, 0xa6, 0x65, 0x51, 0x72, 0x10, 0xb9, 0x54,
0x35, 0x31, 0x8d, 0x7b, 0x47, 0x03, 0xab, 0x46, 0x5b, 0x64, 0x75, 0xec, 0x88, 0x42, 0x6b, 0x58, 0x50, 0x30, 0x25, 0xa5, 0xb9, 0xbb, 0xb1, 0x92, 0x8a, 0xc6, 0x7f, 0x58, 0xdc, 0xf4, 0x18, 0x6c,
0x44, 0x12, 0x47, 0xb6, 0x03, 0xe2, 0x3e, 0x69, 0xf7, 0xfd, 0x1b, 0xfb, 0x4f, 0xf6, 0x57, 0x4d, 0x79, 0xe3, 0x8a, 0x48, 0x5a, 0xa1, 0x5d, 0x39, 0xf8, 0x5e, 0xe8, 0xbd, 0x1f, 0xab, 0xfd, 0x52,
0xb6, 0x93, 0x52, 0xb4, 0xee, 0xb6, 0x4b, 0xf5, 0xbe, 0xf7, 0x7d, 0x9f, 0x9f, 0xdd, 0xef, 0x29, 0x65, 0x57, 0xb2, 0xe3, 0x50, 0xf7, 0xd6, 0x8b, 0x99, 0x37, 0xef, 0x37, 0xfb, 0x46, 0xbb, 0x18,
0xd0, 0xa3, 0x0f, 0xb4, 0x94, 0x62, 0x58, 0x71, 0x26, 0x19, 0xea, 0x3e, 0x66, 0xf2, 0x52, 0x55, 0x0e, 0xe8, 0x8a, 0x16, 0x82, 0xf7, 0xca, 0x8a, 0x09, 0x86, 0xba, 0x8f, 0xa9, 0x98, 0xc8, 0x6a,
0x37, 0xf5, 0x6d, 0xdc, 0x5b, 0xb2, 0xf2, 0x36, 0xbb, 0x33, 0x54, 0xbc, 0x93, 0x2e, 0x97, 0xac, 0x5e, 0xdf, 0xfb, 0x07, 0x09, 0x2b, 0xee, 0xd3, 0x65, 0x63, 0xf9, 0x87, 0xb3, 0x24, 0x61, 0x75,
0x2e, 0xa5, 0x81, 0x87, 0xbf, 0x02, 0xf0, 0x12, 0x65, 0x45, 0xef, 0xc0, 0x95, 0x4f, 0x15, 0xc5, 0x21, 0x1a, 0x79, 0xf6, 0xdb, 0x06, 0x33, 0x92, 0xa3, 0xe8, 0x1d, 0x74, 0xc4, 0xba, 0xa4, 0x58,
0x56, 0xdf, 0x1a, 0xec, 0x1e, 0x1f, 0x0c, 0x37, 0x8e, 0x18, 0x6a, 0x85, 0xf9, 0x5d, 0x3c, 0x55, 0x0b, 0xb4, 0xf0, 0xe8, 0xfc, 0xb4, 0xb7, 0x73, 0x44, 0x4f, 0x11, 0xcd, 0xef, 0x74, 0x5d, 0x52,
0x94, 0x68, 0x25, 0xda, 0x05, 0x3b, 0x5b, 0x61, 0xbb, 0x6f, 0x0d, 0x3c, 0x62, 0x67, 0x2b, 0x84, 0xa2, 0x48, 0x74, 0x04, 0x7a, 0xba, 0xc0, 0x7a, 0xa0, 0x85, 0x26, 0xd1, 0xd3, 0x05, 0xc2, 0x60,
0xc1, 0x5f, 0xb2, 0xa2, 0xa0, 0xa5, 0xc4, 0x4e, 0xdf, 0x1a, 0x84, 0xa4, 0x85, 0x28, 0x86, 0xa0, 0x27, 0x2c, 0xcf, 0x69, 0x21, 0xb0, 0x11, 0x68, 0xa1, 0x4b, 0x36, 0x12, 0xbd, 0x05, 0xab, 0x59,
0x16, 0x94, 0x97, 0x69, 0x41, 0xb1, 0xab, 0xa9, 0x35, 0x46, 0x7b, 0xe0, 0xd1, 0x22, 0xcd, 0x72, 0x02, 0x77, 0x02, 0x2d, 0xec, 0x9e, 0xbf, 0x7c, 0x76, 0xfa, 0xa5, 0xb2, 0x48, 0x8b, 0xa0, 0x1e,
0xec, 0x69, 0xc2, 0x00, 0xe5, 0xa8, 0x52, 0x21, 0x1e, 0x19, 0x5f, 0xe1, 0x8e, 0x71, 0xb4, 0x58, 0xd8, 0xed, 0x8e, 0xd8, 0x54, 0xf4, 0xf1, 0x33, 0xba, 0xdf, 0x78, 0x64, 0x03, 0xa1, 0x0f, 0x60,
0x39, 0x24, 0xbb, 0xa7, 0x25, 0xf6, 0x8d, 0x43, 0x03, 0xf4, 0x01, 0x7c, 0x4e, 0x45, 0x9d, 0x4b, 0x57, 0x94, 0xd7, 0x99, 0xe0, 0xd8, 0x0a, 0x8c, 0xb0, 0x7b, 0x7e, 0xb2, 0x67, 0x77, 0x42, 0x79,
0x81, 0x83, 0xbe, 0x33, 0xe8, 0x1e, 0xef, 0x6f, 0x79, 0x02, 0xa1, 0xa2, 0x62, 0xa5, 0xa0, 0xa4, 0xc9, 0x0a, 0x4e, 0xc9, 0x86, 0x45, 0x17, 0xe0, 0x14, 0x54, 0x3c, 0xb2, 0xea, 0x81, 0x63, 0x5b,
0xd5, 0xa2, 0x13, 0x08, 0x4a, 0x2a, 0x1f, 0x19, 0xbf, 0x17, 0x38, 0xd4, 0xbe, 0x78, 0x8b, 0x6f, 0xcd, 0xf9, 0x7b, 0xe6, 0x46, 0x0d, 0x42, 0xb6, 0x2c, 0x7a, 0x03, 0xc6, 0x2a, 0xe7, 0xd8, 0x51,
0x66, 0x24, 0x64, 0xad, 0x45, 0x47, 0xe0, 0x3c, 0x14, 0x02, 0x83, 0xb6, 0xbc, 0xd9, 0x62, 0xb9, 0x23, 0xaf, 0xf6, 0x8c, 0xdc, 0x0e, 0x89, 0x24, 0xfc, 0x9f, 0x1a, 0x38, 0x9b, 0xd8, 0xff, 0x70,
0x9a, 0x12, 0xa5, 0x40, 0x47, 0xe0, 0x4a, 0x2a, 0x24, 0xee, 0xf6, 0xad, 0x41, 0xf7, 0xf8, 0xf5, 0xbb, 0x08, 0x3a, 0xc5, 0x2c, 0xa7, 0xed, 0xd5, 0xaa, 0x1a, 0x1d, 0x83, 0x49, 0xab, 0x8a, 0x55,
0x0b, 0xe5, 0xa9, 0x4e, 0x86, 0x68, 0x01, 0x1a, 0x82, 0xdf, 0x64, 0x83, 0x7b, 0x5a, 0xbb, 0xf7, 0xea, 0x5a, 0x5d, 0xd2, 0x08, 0xe4, 0x83, 0xc3, 0x8b, 0xb4, 0x2c, 0xa9, 0xe0, 0xd8, 0x0c, 0x8c,
0x42, 0x3b, 0x32, 0x1c, 0x69, 0x45, 0xf1, 0x4f, 0x0b, 0x82, 0xf6, 0x3d, 0xff, 0x21, 0x3d, 0x04, 0xd0, 0x25, 0x5b, 0xed, 0x7f, 0xd7, 0xc0, 0x6e, 0xbf, 0xa9, 0x4d, 0xd0, 0xfe, 0x4a, 0xd0, 0x77,
0xae, 0xce, 0xc7, 0x44, 0xe7, 0xae, 0xb3, 0xe1, 0x9c, 0xf1, 0x26, 0x34, 0x03, 0x54, 0x36, 0xa2, 0x12, 0x4e, 0xc0, 0x15, 0x4c, 0xcc, 0xb2, 0xbb, 0xa4, 0xac, 0x55, 0xb4, 0x41, 0x1c, 0xd5, 0xb8,
0xcc, 0xaa, 0x8a, 0x4a, 0x81, 0xbd, 0xbe, 0xa3, 0xb2, 0x69, 0x71, 0xfc, 0xdd, 0x02, 0xbf, 0xf9, 0x2c, 0xeb, 0x27, 0x33, 0xa7, 0xb9, 0x5a, 0x61, 0x63, 0x0e, 0x69, 0x2e, 0xcd, 0x8c, 0x2d, 0xd3,
0xb3, 0x9a, 0x09, 0xd6, 0x5f, 0x13, 0xec, 0x8d, 0x09, 0xfb, 0x10, 0x4a, 0x26, 0xd3, 0xfc, 0x7a, 0xe2, 0xae, 0xae, 0x32, 0xf5, 0x90, 0x2e, 0x71, 0x54, 0xe3, 0x4b, 0x95, 0xf9, 0xbf, 0x34, 0xd0,
0x59, 0xd5, 0x7a, 0xb4, 0x43, 0x02, 0xdd, 0x38, 0xad, 0xea, 0x67, 0xb2, 0xa0, 0x85, 0xbe, 0x42, 0x6f, 0x87, 0x3b, 0x1b, 0x18, 0xff, 0xdc, 0xc0, 0x07, 0xe7, 0x1b, 0xe3, 0x62, 0xe7, 0xdb, 0xb7,
0x4b, 0x4e, 0x69, 0xa1, 0xc8, 0x9c, 0xdd, 0x65, 0xe5, 0x75, 0xcd, 0xdb, 0xdd, 0x09, 0x74, 0xe3, 0x5a, 0xf2, 0x49, 0x59, 0xf3, 0x36, 0x5b, 0xd5, 0xe8, 0x35, 0x58, 0x39, 0xcd, 0x59, 0xb5, 0x56,
0x0b, 0xcf, 0xe3, 0xdf, 0x16, 0xd8, 0x57, 0xd3, 0x8d, 0x1b, 0x38, 0xff, 0xbc, 0x41, 0x0c, 0xc1, 0xa1, 0x06, 0x69, 0x95, 0x64, 0x17, 0x29, 0x7f, 0xc0, 0x56, 0xc3, 0xca, 0x5a, 0xf6, 0xe2, 0xc9,
0x37, 0x26, 0xe4, 0xc6, 0xdb, 0xd7, 0x58, 0xe9, 0x97, 0x55, 0x2d, 0x9a, 0xd9, 0xba, 0x46, 0x6f, 0xea, 0x02, 0xdb, 0x4d, 0x9e, 0xac, 0x65, 0xaf, 0x62, 0x19, 0xc5, 0x4e, 0xd3, 0x93, 0x35, 0x3a,
0xa1, 0x53, 0xd0, 0x82, 0xf1, 0x27, 0x3d, 0xd4, 0x21, 0x0d, 0x52, 0xda, 0x55, 0x26, 0xee, 0xf5, 0x05, 0x77, 0x3e, 0xe3, 0x34, 0xce, 0x67, 0x4b, 0x8a, 0x5d, 0x65, 0x3c, 0x35, 0xce, 0x7e, 0x68,
0xb6, 0x3a, 0x44, 0xd7, 0xaa, 0x37, 0xb9, 0x7c, 0x38, 0x69, 0x16, 0x55, 0xd7, 0xaa, 0xc7, 0x59, 0xe0, 0x6e, 0x5f, 0x0f, 0xd9, 0x60, 0xf4, 0x07, 0x03, 0xef, 0x05, 0x02, 0xb0, 0x06, 0xd1, 0x4d,
0x4e, 0x71, 0x60, 0x7a, 0xaa, 0x46, 0x07, 0x10, 0xde, 0xa4, 0x82, 0x4e, 0x8a, 0xf4, 0x8e, 0xe2, 0x34, 0x8d, 0x3c, 0x0d, 0x75, 0xc1, 0x9e, 0x8c, 0xbf, 0x46, 0x64, 0x3c, 0xf2, 0x74, 0x74, 0x00,
0x50, 0x13, 0xcf, 0x8d, 0xc3, 0x1f, 0x16, 0x84, 0xeb, 0xf4, 0x90, 0x0f, 0xce, 0x68, 0x3c, 0x8e, 0x4e, 0x23, 0xae, 0xae, 0x3c, 0x03, 0x1d, 0x82, 0xfb, 0x29, 0xfe, 0x18, 0x91, 0x51, 0x7f, 0x1a,
0x5e, 0x21, 0x80, 0xce, 0x38, 0xb9, 0x48, 0x16, 0x49, 0x64, 0xa1, 0x2e, 0xf8, 0x97, 0xf3, 0xaf, 0x79, 0x1d, 0x49, 0x0e, 0xe3, 0x6b, 0x22, 0x85, 0x89, 0x1c, 0xe8, 0x0c, 0xa2, 0xe1, 0xd8, 0xb3,
0x09, 0x99, 0xcf, 0x22, 0x1b, 0xf5, 0x20, 0x30, 0xe0, 0xec, 0x2c, 0x72, 0xd0, 0x0e, 0x84, 0x9f, 0xe4, 0xa9, 0xd7, 0xd1, 0xd4, 0xb3, 0x91, 0x0b, 0xe6, 0xcd, 0xf8, 0x3a, 0x1e, 0x79, 0x0e, 0xb2,
0x26, 0x1f, 0x13, 0x32, 0x1b, 0x2d, 0x92, 0xc8, 0x55, 0xca, 0xe9, 0xe4, 0x9c, 0x28, 0xe0, 0xa1, 0x40, 0x1f, 0x7f, 0xf6, 0x5c, 0x49, 0x5d, 0xf5, 0xe3, 0x1b, 0x0f, 0xe6, 0x96, 0xfa, 0x53, 0xbf,
0x00, 0xdc, 0x71, 0x32, 0x9d, 0x47, 0x1d, 0x75, 0xea, 0x79, 0xb2, 0x88, 0x7c, 0x14, 0x82, 0x77, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xd7, 0x94, 0x54, 0x0e, 0x04, 0x00, 0x00,
0x31, 0x3f, 0x9f, 0xcc, 0xa2, 0x00, 0x75, 0xc0, 0x9e, 0x7f, 0x8e, 0x42, 0xa5, 0x3a, 0x1b, 0x4d,
0x2e, 0x22, 0xb8, 0xe9, 0xe8, 0x8f, 0xc6, 0xfb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xcc,
0x22, 0x51, 0x6e, 0x04, 0x00, 0x00,
} }

View File

@ -8,17 +8,12 @@ message Event {
EventType type = 1; EventType type = 1;
int32 id = 2; int32 id = 2;
string comment = 3; string comment = 3;
string username = 4; Config config = 4;
string email = 5; Account account = 5; // this is the user
string password = 6;
string token = 7;
repeated Response results = 8; repeated Response results = 6;
repeated Network networks = 9; repeated Network networks = 7;
repeated VM vms = 10; repeated VM vms = 8;
Config test = 11;
Account account = 12;
enum EventType { enum EventType {
ADD = 0; ADD = 0;