From 0f938a8b10ffb15e2ec44823b1999b06f0f78d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 17 Jun 2020 15:15:18 +0200 Subject: [PATCH] drop redundant id for create requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- pkg/proto/v0/accounts.pb.go | 269 +++++++++++++++++------------------- pkg/proto/v0/accounts.proto | 10 +- pkg/service/v0/service.go | 11 +- 3 files changed, 133 insertions(+), 157 deletions(-) diff --git a/pkg/proto/v0/accounts.pb.go b/pkg/proto/v0/accounts.pb.go index ac05a115a..217a615f1 100644 --- a/pkg/proto/v0/accounts.pb.go +++ b/pkg/proto/v0/accounts.pb.go @@ -204,10 +204,8 @@ func (m *GetAccountRequest) GetId() string { } type CreateAccountRequest struct { - // The account id to use for this account - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // The account resource to create - Account *Account `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` + Account *Account `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -238,13 +236,6 @@ func (m *CreateAccountRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateAccountRequest proto.InternalMessageInfo -func (m *CreateAccountRequest) GetId() string { - if m != nil { - return m.Id - } - return "" -} - func (m *CreateAccountRequest) GetAccount() *Account { if m != nil { return m.Account @@ -999,10 +990,8 @@ func (m *GetGroupRequest) GetId() string { } type CreateGroupRequest struct { - // The group id to use for this group - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // The account resource to create - Group *Group `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"` + Group *Group `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1033,13 +1022,6 @@ func (m *CreateGroupRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateGroupRequest proto.InternalMessageInfo -func (m *CreateGroupRequest) GetId() string { - if m != nil { - return m.Id - } - return "" -} - func (m *CreateGroupRequest) GetGroup() *Group { if m != nil { return m.Group @@ -1685,128 +1667,127 @@ func init() { func init() { proto.RegisterFile("accounts.proto", fileDescriptor_e1e7723af4c007b7) } var fileDescriptor_e1e7723af4c007b7 = []byte{ - // 1959 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x5b, 0x6f, 0x1b, 0xc7, - 0x15, 0x06, 0x25, 0x4b, 0xa2, 0x0e, 0x25, 0x4b, 0x1c, 0x31, 0xd2, 0x8a, 0xba, 0x98, 0x59, 0x5b, - 0x8e, 0x2c, 0xa5, 0xa2, 0xa1, 0x26, 0xbd, 0x38, 0x4d, 0x01, 0x59, 0xb2, 0x5d, 0xa1, 0xb6, 0x23, - 0x50, 0x4e, 0x83, 0x5e, 0x90, 0xc5, 0x6a, 0x77, 0x48, 0x4d, 0xcc, 0xbd, 0x64, 0x66, 0x96, 0x16, - 0x53, 0x04, 0x28, 0xfa, 0xd4, 0xb7, 0x3e, 0xf4, 0x87, 0xf4, 0xf2, 0x47, 0xfa, 0xd0, 0x3f, 0x90, - 0x87, 0x3e, 0xf5, 0x57, 0x14, 0x73, 0xd9, 0xdd, 0x21, 0x97, 0x97, 0x04, 0x09, 0x50, 0x04, 0xe8, - 0x93, 0x76, 0xe7, 0x7c, 0xf3, 0x9d, 0x33, 0xe7, 0x1c, 0xce, 0x7c, 0x3b, 0x82, 0xdb, 0xae, 0xe7, - 0x45, 0x49, 0xc8, 0xd9, 0x51, 0x4c, 0x23, 0x1e, 0xa1, 0x32, 0xc3, 0x9c, 0x93, 0xb0, 0xc3, 0xea, - 0x77, 0x3a, 0x51, 0xd4, 0xe9, 0xe2, 0xa6, 0x1b, 0x93, 0x66, 0x9b, 0xe0, 0xae, 0xef, 0x5c, 0xe1, - 0x6b, 0xb7, 0x47, 0x22, 0xaa, 0xa0, 0xf5, 0x6d, 0x03, 0xe0, 0x86, 0x61, 0xc4, 0x5d, 0x4e, 0xa2, - 0x50, 0x13, 0xd5, 0xb7, 0xb4, 0x55, 0xbe, 0x5d, 0x25, 0xed, 0x26, 0x0e, 0x62, 0xde, 0xd7, 0xc6, - 0xc6, 0xb0, 0x51, 0x39, 0x08, 0x5c, 0xf6, 0x5a, 0x23, 0xee, 0x0c, 0x23, 0x38, 0x09, 0x30, 0xe3, - 0x6e, 0x10, 0x2b, 0x80, 0xfd, 0xf7, 0x12, 0xac, 0x3d, 0x27, 0x8c, 0x9f, 0xe8, 0xf8, 0x5b, 0xf8, - 0xf3, 0x04, 0x33, 0x8e, 0x1a, 0xb0, 0x18, 0xbb, 0x1d, 0xec, 0x30, 0xf2, 0x05, 0xb6, 0x4a, 0x8d, - 0xd2, 0xfe, 0xdc, 0xe3, 0xd9, 0xaf, 0x4e, 0x4a, 0xad, 0xb2, 0x18, 0xbd, 0x24, 0x5f, 0x60, 0x64, - 0x03, 0x48, 0x04, 0x8f, 0x5e, 0xe3, 0xd0, 0x9a, 0x69, 0x94, 0xf6, 0x17, 0x15, 0x44, 0x4e, 0x7c, - 0x25, 0x46, 0xd1, 0x4f, 0x01, 0xf2, 0x90, 0xac, 0xd9, 0x46, 0x69, 0xbf, 0x72, 0x5c, 0x3f, 0x52, - 0x31, 0x1d, 0xa5, 0x31, 0x1d, 0x3d, 0x15, 0x90, 0x17, 0x2e, 0x7b, 0xdd, 0x5a, 0x6c, 0xa7, 0x8f, - 0x68, 0x13, 0xe6, 0x3e, 0x4f, 0x30, 0xed, 0x5b, 0xb7, 0x72, 0x66, 0x35, 0x62, 0x07, 0x50, 0x1b, - 0x0c, 0x99, 0xc5, 0x51, 0xc8, 0x30, 0xfa, 0x01, 0x94, 0xd3, 0x32, 0x58, 0xa5, 0xc6, 0xec, 0x7e, - 0xe5, 0xb8, 0x7a, 0x94, 0xd6, 0xe1, 0x48, 0xa3, 0x5b, 0x19, 0x04, 0xdd, 0x87, 0x95, 0x10, 0xdf, - 0x70, 0x67, 0x78, 0x15, 0xad, 0x65, 0x31, 0x7c, 0x91, 0x2e, 0xc2, 0xbe, 0x0b, 0xd5, 0x67, 0x38, - 0xf5, 0x96, 0xe6, 0xe7, 0x36, 0xcc, 0x10, 0x5f, 0x26, 0x66, 0xb1, 0x35, 0x43, 0x7c, 0xfb, 0x12, - 0x6a, 0xa7, 0x14, 0xbb, 0x1c, 0x4f, 0xc6, 0xa1, 0x43, 0x58, 0xd0, 0x01, 0x48, 0x67, 0x23, 0x43, - 0x4c, 0x11, 0xf6, 0x1f, 0x4a, 0x50, 0xfb, 0x38, 0xf6, 0x8b, 0xac, 0x06, 0x4b, 0x69, 0x1a, 0x0b, - 0xfa, 0x00, 0x2a, 0x89, 0x24, 0x51, 0x55, 0x98, 0x99, 0x5a, 0x05, 0x50, 0x70, 0xf1, 0x6c, 0xdf, - 0x87, 0xda, 0x19, 0xee, 0xe2, 0x69, 0xeb, 0xb2, 0xff, 0xb4, 0x0c, 0x0b, 0x1a, 0x52, 0x58, 0xf3, - 0x3b, 0xb0, 0xa2, 0x63, 0x71, 0x70, 0xe8, 0x5e, 0x75, 0xb1, 0x2f, 0x83, 0x28, 0xb7, 0xd2, 0x5f, - 0xcd, 0x13, 0x35, 0x8a, 0x8e, 0x60, 0x8d, 0x30, 0x87, 0x62, 0x16, 0x25, 0xd4, 0xc3, 0x4e, 0xba, - 0xc4, 0x59, 0x09, 0xae, 0x12, 0x51, 0x69, 0x69, 0x49, 0x1d, 0xdd, 0x85, 0x65, 0x4f, 0x24, 0x9d, - 0x44, 0xa1, 0xc3, 0xfb, 0x31, 0x56, 0xbd, 0xd2, 0x5a, 0x4a, 0x07, 0x5f, 0xf5, 0x63, 0x8c, 0xde, - 0x03, 0x20, 0x3e, 0x0e, 0x39, 0xe1, 0x04, 0x33, 0x6b, 0x4e, 0xf6, 0x45, 0x2d, 0x4f, 0xd7, 0x79, - 0x66, 0x6b, 0x19, 0x38, 0xf4, 0x36, 0x2c, 0xf9, 0x84, 0xc5, 0x5d, 0xb7, 0xef, 0x84, 0x6e, 0x80, - 0xad, 0x79, 0xc9, 0x5c, 0xd1, 0x63, 0x2f, 0xdd, 0x00, 0xa3, 0x3d, 0xb8, 0x1d, 0x53, 0xdc, 0xc6, - 0x94, 0x62, 0x5f, 0x81, 0x16, 0x54, 0xfb, 0x64, 0xa3, 0x12, 0xb6, 0x03, 0x90, 0x10, 0xdf, 0x09, - 0x93, 0xe0, 0x0a, 0x53, 0xab, 0xdc, 0x28, 0xed, 0xcf, 0xb6, 0x16, 0x13, 0xe2, 0xbf, 0x94, 0x03, - 0xc2, 0xdc, 0xc9, 0xcd, 0x8b, 0xca, 0xdc, 0xc9, 0xcc, 0x08, 0x6e, 0x05, 0x2e, 0xe9, 0x5a, 0x20, - 0xa9, 0xe5, 0x33, 0x6a, 0x40, 0xc5, 0xc7, 0xcc, 0xa3, 0x24, 0x16, 0x8b, 0xb4, 0x2a, 0x3a, 0xb4, - 0x7c, 0x08, 0x9d, 0xc1, 0x6a, 0xec, 0x32, 0xf6, 0x26, 0xa2, 0xbe, 0x13, 0xd3, 0xa8, 0x4d, 0xba, - 0xd8, 0x5a, 0x92, 0x75, 0xdf, 0xcc, 0x57, 0x7e, 0xa1, 0x11, 0x17, 0x0a, 0xd0, 0x5a, 0x89, 0x07, - 0x07, 0xd0, 0x21, 0x94, 0x03, 0x2c, 0xa2, 0xf8, 0xa8, 0x6d, 0x2d, 0xcb, 0xbc, 0xad, 0xe4, 0xb3, - 0x9f, 0xd1, 0x28, 0x89, 0x5b, 0x19, 0x00, 0x3d, 0x85, 0xaa, 0x4c, 0x3b, 0xf6, 0x1d, 0xd9, 0x6b, - 0x62, 0xa3, 0xb1, 0x56, 0xc7, 0xf4, 0xda, 0xab, 0x74, 0x17, 0x6a, 0xad, 0xe8, 0x49, 0x67, 0x2e, - 0xc7, 0x62, 0x54, 0xf0, 0xf8, 0xb2, 0xe1, 0x4c, 0x9e, 0xea, 0x74, 0x1e, 0x3d, 0x29, 0xe3, 0xf9, - 0x31, 0x58, 0x51, 0xe8, 0xc4, 0x14, 0x07, 0x84, 0x61, 0xe6, 0xb0, 0x7e, 0xe8, 0x65, 0xdd, 0x57, - 0x93, 0x0d, 0xf5, 0x56, 0x14, 0x5e, 0x68, 0xf3, 0x65, 0x3f, 0xf4, 0xd2, 0x26, 0x1c, 0x9a, 0x48, - 0x82, 0x20, 0xe1, 0xc2, 0xe2, 0x10, 0xdf, 0x7a, 0x4b, 0xa6, 0xda, 0x98, 0x78, 0x9e, 0x5a, 0xcf, - 0x7d, 0xf4, 0x04, 0xee, 0x0c, 0x78, 0xc4, 0x5e, 0x42, 0x09, 0xef, 0x3b, 0xaa, 0xab, 0xda, 0x04, - 0x53, 0x6b, 0x5d, 0xce, 0xdf, 0x36, 0x1c, 0x6b, 0xd0, 0x79, 0x86, 0x41, 0xa7, 0xb0, 0x6b, 0xd2, - 0xf8, 0x84, 0x89, 0x84, 0x27, 0x84, 0x5d, 0xa7, 0x6d, 0xb6, 0x21, 0x59, 0xb6, 0x72, 0x96, 0x33, - 0x13, 0x23, 0x9b, 0xee, 0xe7, 0xb0, 0x3d, 0x10, 0x8b, 0x1b, 0xa4, 0xbf, 0x26, 0x45, 0x61, 0x49, - 0x0a, 0xcb, 0x08, 0xc4, 0x0d, 0xf4, 0xaf, 0x4a, 0xce, 0x7f, 0x1f, 0x36, 0x06, 0x82, 0x88, 0x02, - 0x97, 0x84, 0x6a, 0xea, 0xa6, 0x9c, 0x5a, 0x33, 0xbc, 0x4b, 0xa3, 0x9c, 0x76, 0x36, 0x98, 0x82, - 0x84, 0x61, 0xea, 0xc4, 0x94, 0x84, 0x1e, 0x89, 0xdd, 0xae, 0x9a, 0x5e, 0x1f, 0x0e, 0xfe, 0x63, - 0x86, 0xe9, 0x45, 0x8a, 0x91, 0x2c, 0xce, 0x20, 0x4b, 0xd7, 0x65, 0x5c, 0xd5, 0x2f, 0x6f, 0x88, - 0xed, 0xa9, 0x0d, 0x51, 0xcf, 0x3d, 0x3c, 0x77, 0x19, 0x17, 0x15, 0xce, 0x7a, 0xa3, 0x3b, 0xe8, - 0x20, 0xa6, 0x51, 0x8f, 0x30, 0x12, 0x85, 0x24, 0xec, 0x38, 0x98, 0xd2, 0x88, 0x32, 0x6b, 0x47, - 0xf6, 0xfb, 0x5e, 0xde, 0xef, 0x1f, 0x65, 0x74, 0x17, 0x06, 0xfc, 0x89, 0x40, 0x9b, 0x05, 0x2d, - 0x18, 0x99, 0xd8, 0xd5, 0xf0, 0x0d, 0xc7, 0x34, 0x74, 0xbb, 0x2a, 0x23, 0x8c, 0xbb, 0x1c, 0x5b, - 0xfb, 0x32, 0x11, 0xd5, 0xd4, 0x24, 0xd2, 0x70, 0x29, 0x0c, 0x88, 0xc0, 0xbd, 0x11, 0x78, 0xc7, - 0xbb, 0x76, 0xc3, 0x0e, 0x36, 0x72, 0xf0, 0x60, 0x6a, 0x0e, 0xee, 0x14, 0xc8, 0x4f, 0x25, 0x49, - 0x96, 0x88, 0x0e, 0xdc, 0xa5, 0xb8, 0x4d, 0x31, 0xbb, 0x56, 0x07, 0x20, 0x73, 0x7a, 0x6e, 0x97, - 0xf8, 0x4e, 0x9b, 0x46, 0x81, 0xe1, 0xe9, 0x67, 0x53, 0x3d, 0xed, 0x6a, 0x1a, 0x79, 0x62, 0xb2, - 0x5f, 0x09, 0x92, 0xa7, 0x34, 0x0a, 0x32, 0x47, 0x9f, 0xc1, 0x1e, 0x23, 0x9d, 0xd0, 0x21, 0xa1, - 0xc3, 0x30, 0x13, 0xf9, 0x19, 0xe3, 0xea, 0xc3, 0xe9, 0x8b, 0x12, 0x44, 0xe7, 0xe1, 0xa5, 0xa6, - 0x29, 0xf8, 0xb2, 0x39, 0x40, 0xbe, 0xa9, 0xa3, 0x06, 0x2c, 0xa5, 0x9e, 0xe5, 0x11, 0xa1, 0x8e, - 0x25, 0x50, 0x24, 0xf2, 0x80, 0x58, 0x87, 0x79, 0xc2, 0x58, 0x82, 0xa9, 0x3e, 0xfe, 0xf5, 0x1b, - 0x7a, 0x17, 0x90, 0x7a, 0x72, 0x5c, 0x26, 0xe0, 0xd8, 0x17, 0x5b, 0xc0, 0xac, 0xc4, 0xac, 0x2a, - 0xcb, 0x89, 0x36, 0x9c, 0xfb, 0xf6, 0x57, 0x33, 0xb0, 0x32, 0xb4, 0xa3, 0xa2, 0x3a, 0x94, 0xd3, - 0x3d, 0x55, 0xfb, 0xcd, 0xde, 0xd1, 0xa7, 0xb0, 0x2b, 0x1b, 0x3b, 0xdb, 0xa7, 0x0b, 0xf5, 0x9d, - 0x99, 0xde, 0xe3, 0x82, 0x21, 0x75, 0x3a, 0x54, 0xda, 0x43, 0xa8, 0xe6, 0x47, 0x40, 0xd4, 0x25, - 0x9e, 0x38, 0xfd, 0x66, 0x1b, 0xb3, 0x22, 0xf8, 0x6c, 0xa3, 0xd7, 0xe3, 0xe8, 0x1c, 0xec, 0x76, - 0x24, 0x8e, 0x5c, 0x1d, 0x44, 0x36, 0x53, 0x0a, 0x24, 0x9d, 0x3f, 0x79, 0xba, 0x96, 0x5b, 0x3b, - 0x12, 0xa9, 0xbc, 0xa5, 0xbe, 0x5f, 0xe2, 0x1b, 0x7e, 0x29, 0x33, 0x8a, 0x7e, 0x0d, 0x87, 0xd3, - 0xa9, 0x9c, 0x37, 0x84, 0x5f, 0x3b, 0x41, 0xdb, 0xb5, 0xe6, 0x24, 0xe7, 0xbd, 0x89, 0x9c, 0x9f, - 0x10, 0x7e, 0xfd, 0xa2, 0xed, 0xda, 0x7f, 0x2d, 0x41, 0x55, 0x08, 0x3f, 0x79, 0xf4, 0x7c, 0x2f, - 0x94, 0x2a, 0x06, 0x64, 0x06, 0xac, 0x75, 0xea, 0x3b, 0x30, 0xdf, 0x91, 0x23, 0x5a, 0xa5, 0x16, - 0x4e, 0x55, 0x6d, 0xfe, 0xda, 0x0a, 0xf5, 0x6d, 0x58, 0x79, 0x86, 0x95, 0x97, 0x71, 0xfa, 0xec, - 0x97, 0x80, 0x94, 0x3e, 0x9d, 0x84, 0x42, 0x7b, 0x30, 0x27, 0x5d, 0xeb, 0xde, 0x2b, 0x04, 0xa6, - 0xac, 0xf6, 0x0d, 0x20, 0x25, 0x4b, 0x07, 0xc8, 0xb2, 0xc9, 0xa5, 0x49, 0x93, 0xbf, 0x9d, 0x1c, - 0xbd, 0x07, 0x48, 0xc9, 0xd1, 0x89, 0x8b, 0xb5, 0x61, 0xf5, 0xc4, 0xf7, 0x5f, 0x48, 0x69, 0x32, - 0x0e, 0xb3, 0x07, 0x6b, 0x2d, 0x1c, 0x44, 0x3d, 0x3c, 0x19, 0xf6, 0xb7, 0x92, 0x2a, 0xa1, 0x42, - 0x7d, 0x2f, 0x9a, 0xee, 0x33, 0xf5, 0x45, 0x97, 0x45, 0xac, 0xbb, 0xee, 0x10, 0x16, 0x94, 0x58, - 0x9b, 0xf0, 0x71, 0x94, 0x22, 0xbe, 0x76, 0xe7, 0xfd, 0xa7, 0x0c, 0x73, 0xb2, 0x14, 0x85, 0x56, - 0x1a, 0x16, 0xd0, 0x33, 0x45, 0x01, 0x6d, 0x44, 0x34, 0x3b, 0x35, 0xa2, 0x07, 0x30, 0x1f, 0xbd, - 0x09, 0x05, 0xf6, 0xd6, 0x38, 0xac, 0x06, 0x0c, 0xeb, 0xe3, 0xb9, 0xa2, 0x3e, 0x1e, 0x14, 0xdd, - 0xf3, 0xc3, 0xa2, 0x7b, 0xa4, 0x96, 0x5d, 0xf8, 0x8e, 0xb4, 0x6c, 0xf9, 0x9b, 0x6b, 0xd9, 0xe7, - 0x50, 0xc3, 0x37, 0x31, 0xa1, 0xea, 0x4b, 0x27, 0xa7, 0x5a, 0x9c, 0x4a, 0x85, 0xf2, 0x79, 0x19, - 0xdb, 0xfb, 0xb0, 0x71, 0x4d, 0x7c, 0xac, 0x4e, 0x5e, 0xd7, 0xf7, 0x29, 0x66, 0xcc, 0xe9, 0x12, - 0xc6, 0x99, 0xfc, 0xca, 0x28, 0xb7, 0x6a, 0xc2, 0x2c, 0x8e, 0xd4, 0x13, 0x65, 0x14, 0xdd, 0xc4, - 0xd0, 0x2e, 0x80, 0x50, 0x36, 0x57, 0xa4, 0x4b, 0x78, 0x5f, 0x7f, 0x74, 0x18, 0x23, 0xff, 0x17, - 0xdc, 0xff, 0x0b, 0xc1, 0xfd, 0x13, 0xd8, 0x34, 0xa7, 0x85, 0x98, 0x3b, 0x57, 0x24, 0x62, 0xa6, - 0xd4, 0x36, 0x92, 0xf7, 0x12, 0xf3, 0xc7, 0x24, 0x62, 0x72, 0xe6, 0xe9, 0x74, 0x91, 0xbd, 0x25, - 0xe7, 0x7f, 0x4b, 0x21, 0xbd, 0xfd, 0x9d, 0x09, 0x69, 0xfb, 0x9f, 0x25, 0xd8, 0x9a, 0x30, 0x5b, - 0xc8, 0x2d, 0xcf, 0xe5, 0xb8, 0x13, 0xd1, 0x7e, 0x2a, 0xb7, 0xd2, 0x77, 0xf4, 0x0b, 0x40, 0x91, - 0xe7, 0x25, 0xf2, 0x5b, 0xfd, 0x9b, 0x48, 0xac, 0xd5, 0x74, 0x56, 0xb6, 0xe6, 0xf7, 0x60, 0x3d, - 0xa6, 0x51, 0x8c, 0x29, 0xef, 0x3b, 0x9e, 0x9b, 0xb0, 0x6c, 0xad, 0x5a, 0x1a, 0xd6, 0x52, 0xeb, - 0xa9, 0x32, 0xaa, 0xd8, 0x6a, 0x30, 0xd7, 0x73, 0xbb, 0x49, 0x7a, 0x45, 0xa1, 0x5e, 0x8e, 0xff, - 0x7c, 0x0b, 0x56, 0xd2, 0x6b, 0xac, 0x4b, 0x4c, 0x7b, 0xc4, 0xc3, 0xc8, 0x83, 0x25, 0xf3, 0x76, - 0x0b, 0xed, 0xe4, 0xa9, 0x1b, 0x71, 0x51, 0x57, 0xdf, 0x1d, 0x67, 0x56, 0xdb, 0xbe, 0x5d, 0xfb, - 0xe3, 0xbf, 0xfe, 0xfd, 0x97, 0x99, 0xdb, 0x68, 0xa9, 0xd9, 0x7b, 0xd8, 0xcc, 0xee, 0xbe, 0x7e, - 0x07, 0x90, 0xdf, 0x69, 0xa1, 0x2d, 0xe3, 0xa8, 0x1e, 0xbe, 0xe9, 0xaa, 0x17, 0x37, 0x5a, 0x7b, - 0x57, 0x72, 0x5a, 0x68, 0xcd, 0xe4, 0x6c, 0xfe, 0x9e, 0xf8, 0x1f, 0x1e, 0x7c, 0xf9, 0xa8, 0x74, - 0x80, 0x5c, 0x58, 0x1e, 0xb8, 0x0c, 0x43, 0x46, 0x90, 0xa3, 0x6e, 0xc9, 0x46, 0xf9, 0xd8, 0x91, - 0x3e, 0x36, 0xec, 0x81, 0xb8, 0x1f, 0x65, 0x97, 0x5a, 0x31, 0x2c, 0x0f, 0xdc, 0x8c, 0x99, 0x2e, - 0x46, 0x5d, 0x99, 0x8d, 0x72, 0xf1, 0xae, 0x74, 0x71, 0xff, 0x78, 0x6b, 0x70, 0x19, 0xfa, 0xe9, - 0x48, 0x2d, 0x27, 0xf3, 0xe8, 0xc3, 0xf2, 0xc0, 0x4d, 0x98, 0xe9, 0x71, 0xd4, 0x15, 0x59, 0x7d, - 0xbd, 0xd0, 0x56, 0x4f, 0x82, 0x98, 0xf7, 0xed, 0x2d, 0xe9, 0xf6, 0xad, 0x83, 0x51, 0xd9, 0x3b, - 0xfe, 0xc7, 0x3c, 0x2c, 0x2b, 0xb9, 0x98, 0xf6, 0xc3, 0x6f, 0x01, 0x72, 0x0d, 0x69, 0x96, 0xaa, - 0x20, 0x85, 0xeb, 0xdb, 0xa3, 0x8d, 0xba, 0x13, 0x90, 0xf4, 0xbb, 0x84, 0x40, 0xf8, 0xd5, 0x0a, - 0xf3, 0x15, 0x94, 0x53, 0xe5, 0x88, 0x36, 0x07, 0xba, 0xc0, 0x14, 0x58, 0xf5, 0x61, 0x2d, 0x67, - 0x6f, 0x4b, 0xae, 0x75, 0x54, 0xcd, 0xb9, 0x8c, 0xfa, 0x7f, 0x02, 0x15, 0x43, 0x6c, 0xa2, 0xed, - 0xe1, 0xea, 0x4f, 0xe6, 0xde, 0x94, 0xdc, 0x6b, 0xb6, 0x11, 0xe7, 0x23, 0xad, 0x1d, 0x7d, 0xa8, - 0x18, 0xc2, 0xd3, 0x24, 0x2e, 0xea, 0xd1, 0x22, 0xf1, 0x7d, 0x49, 0xdc, 0x38, 0xde, 0x30, 0x83, - 0x96, 0x7f, 0x75, 0xad, 0xb5, 0x97, 0x4f, 0xa1, 0x62, 0x88, 0x4c, 0xd3, 0x4b, 0x51, 0x7b, 0x8e, - 0xad, 0xb2, 0x5e, 0xc5, 0x41, 0x31, 0x43, 0xc8, 0x83, 0xc5, 0x4c, 0x9e, 0xa2, 0xba, 0xd1, 0x97, - 0x43, 0x9a, 0xb5, 0xb8, 0x82, 0x07, 0x92, 0xf4, 0xae, 0xbd, 0x5b, 0x20, 0x6d, 0x6a, 0x9d, 0xd4, - 0xbc, 0x47, 0x71, 0x5b, 0xd4, 0xa0, 0x07, 0x4b, 0xa6, 0xbe, 0x35, 0xb7, 0x91, 0x11, 0xba, 0xb7, - 0xe8, 0xea, 0x47, 0xd2, 0xd5, 0xc3, 0x83, 0xc3, 0xf1, 0xae, 0x8c, 0x5f, 0xca, 0x97, 0x99, 0x5f, - 0x0a, 0x15, 0x43, 0x7d, 0xa2, 0xa1, 0x96, 0x1c, 0x94, 0xd1, 0xf5, 0x9d, 0x31, 0x56, 0xdd, 0xb1, - 0xba, 0x60, 0x68, 0xca, 0x72, 0x1f, 0xd7, 0x7e, 0x83, 0xe2, 0xd7, 0x1d, 0xf5, 0x4f, 0x8e, 0x66, - 0xef, 0xe1, 0x07, 0xaa, 0x14, 0xf3, 0xf2, 0xcf, 0x0f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x83, - 0xbc, 0xbd, 0x54, 0x9c, 0x19, 0x00, 0x00, + // 1951 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x5b, 0x4f, 0x1c, 0xc9, + 0x15, 0xd6, 0x80, 0x81, 0xe1, 0x0c, 0x18, 0x28, 0xc6, 0xd0, 0x0c, 0x17, 0xcf, 0xb6, 0x8d, 0x17, + 0xc3, 0x06, 0x2c, 0xb2, 0x9b, 0x8b, 0x9d, 0x8d, 0x84, 0xc1, 0x76, 0x90, 0x6c, 0x2f, 0x1a, 0xbc, + 0x59, 0xe5, 0xa2, 0x6d, 0x35, 0xdd, 0x35, 0x43, 0xad, 0xa7, 0x2f, 0x5b, 0x55, 0x3d, 0x66, 0x36, + 0x5a, 0x29, 0xca, 0x53, 0xde, 0xf2, 0x90, 0x1f, 0x92, 0xcb, 0x1f, 0xc9, 0x43, 0xfe, 0xc0, 0x3e, + 0xe4, 0x29, 0xbf, 0x22, 0xaa, 0x4b, 0x77, 0xd7, 0x74, 0xcf, 0x30, 0xbb, 0xf1, 0x4a, 0x91, 0xa5, + 0x3c, 0xd1, 0x5d, 0xe7, 0x3b, 0xdf, 0x39, 0x75, 0xea, 0x4c, 0xd5, 0xd7, 0x05, 0xdc, 0x74, 0x3d, + 0x2f, 0x4a, 0x42, 0xce, 0xf6, 0x63, 0x1a, 0xf1, 0x08, 0x55, 0x19, 0xe6, 0x9c, 0x84, 0x1d, 0xd6, + 0xb8, 0xdd, 0x89, 0xa2, 0x4e, 0x17, 0x1f, 0xb8, 0x31, 0x39, 0x68, 0x13, 0xdc, 0xf5, 0x9d, 0x0b, + 0x7c, 0xe9, 0xf6, 0x48, 0x44, 0x15, 0xb4, 0xb1, 0x61, 0x00, 0xdc, 0x30, 0x8c, 0xb8, 0xcb, 0x49, + 0x14, 0x6a, 0xa2, 0xc6, 0xba, 0xb6, 0xca, 0xb7, 0x8b, 0xa4, 0x7d, 0x80, 0x83, 0x98, 0xf7, 0xb5, + 0xb1, 0x59, 0x34, 0xaa, 0x00, 0x81, 0xcb, 0x5e, 0x6b, 0xc4, 0xed, 0x22, 0x82, 0x93, 0x00, 0x33, + 0xee, 0x06, 0xb1, 0x02, 0xd8, 0x7f, 0xab, 0xc0, 0xf2, 0x73, 0xc2, 0xf8, 0x91, 0xce, 0xbf, 0x85, + 0xbf, 0x4c, 0x30, 0xe3, 0xa8, 0x09, 0xb3, 0xb1, 0xdb, 0xc1, 0x0e, 0x23, 0x5f, 0x61, 0xab, 0xd2, + 0xac, 0xec, 0x4c, 0x3d, 0x9e, 0xfc, 0xe6, 0xa8, 0xd2, 0xaa, 0x8a, 0xd1, 0x73, 0xf2, 0x15, 0x46, + 0x36, 0x80, 0x44, 0xf0, 0xe8, 0x35, 0x0e, 0xad, 0x89, 0x66, 0x65, 0x67, 0x56, 0x41, 0xa4, 0xe3, + 0x2b, 0x31, 0x8a, 0x7e, 0x0a, 0x90, 0xa7, 0x64, 0x4d, 0x36, 0x2b, 0x3b, 0xb5, 0xc3, 0xc6, 0xbe, + 0xca, 0x69, 0x3f, 0xcd, 0x69, 0xff, 0xa9, 0x80, 0xbc, 0x70, 0xd9, 0xeb, 0xd6, 0x6c, 0x3b, 0x7d, + 0x44, 0x6b, 0x30, 0xf5, 0x65, 0x82, 0x69, 0xdf, 0xba, 0x91, 0x33, 0xab, 0x11, 0x3b, 0x80, 0xfa, + 0x60, 0xca, 0x2c, 0x8e, 0x42, 0x86, 0xd1, 0x0f, 0xa0, 0x9a, 0x2e, 0x83, 0x55, 0x69, 0x4e, 0xee, + 0xd4, 0x0e, 0x97, 0xf6, 0xd3, 0x75, 0xd8, 0xd7, 0xe8, 0x56, 0x06, 0x41, 0xf7, 0x60, 0x21, 0xc4, + 0x57, 0xdc, 0x29, 0xce, 0xa2, 0x35, 0x2f, 0x86, 0xcf, 0xd2, 0x49, 0xd8, 0x77, 0x60, 0xe9, 0x19, + 0x4e, 0xa3, 0xa5, 0xf5, 0xb9, 0x09, 0x13, 0xc4, 0x97, 0x85, 0x99, 0x6d, 0x4d, 0x10, 0xdf, 0x3e, + 0x86, 0xfa, 0x31, 0xc5, 0x2e, 0xc7, 0x05, 0xdc, 0x1e, 0xcc, 0xe8, 0x80, 0x12, 0x3c, 0x34, 0xa5, + 0x14, 0x61, 0xff, 0xbe, 0x02, 0xf5, 0x4f, 0x63, 0xff, 0xed, 0x58, 0xd0, 0x23, 0xa8, 0x25, 0x92, + 0x44, 0x55, 0x7d, 0x62, 0x6c, 0xd5, 0x41, 0xc1, 0xc5, 0xb3, 0x7d, 0x0f, 0xea, 0x27, 0xb8, 0x8b, + 0x4b, 0x19, 0x14, 0xe7, 0xfb, 0xc7, 0x79, 0x98, 0xd1, 0x90, 0xa2, 0x0d, 0xbd, 0x0f, 0x0b, 0x3a, + 0x17, 0x07, 0x87, 0xee, 0x45, 0x17, 0xfb, 0x32, 0x89, 0x6a, 0x2b, 0xfd, 0x95, 0x3c, 0x51, 0xa3, + 0x68, 0x1f, 0x96, 0x09, 0x73, 0x28, 0x66, 0x51, 0x42, 0x3d, 0xec, 0xa4, 0x53, 0x9c, 0x94, 0xe0, + 0x25, 0x22, 0x56, 0x56, 0x5a, 0xd2, 0x40, 0x77, 0x60, 0xde, 0x13, 0x45, 0x26, 0x51, 0xe8, 0xf0, + 0x7e, 0x8c, 0x55, 0x6f, 0xb4, 0xe6, 0xd2, 0xc1, 0x57, 0xfd, 0x18, 0xa3, 0x0f, 0x01, 0x88, 0x8f, + 0x43, 0x4e, 0x38, 0xc1, 0xcc, 0x9a, 0x92, 0x7d, 0x50, 0xcf, 0xcb, 0x75, 0x9a, 0xd9, 0x5a, 0x06, + 0x0e, 0xbd, 0x07, 0x73, 0x3e, 0x61, 0x71, 0xd7, 0xed, 0x3b, 0xa1, 0x1b, 0x60, 0x6b, 0x5a, 0x32, + 0xd7, 0xf4, 0xd8, 0x4b, 0x37, 0xc0, 0x68, 0x1b, 0x6e, 0xc6, 0x14, 0xb7, 0x31, 0xa5, 0xd8, 0x57, + 0xa0, 0x19, 0xd5, 0x2e, 0xd9, 0xa8, 0x84, 0x6d, 0x02, 0x24, 0xc4, 0x77, 0xc2, 0x24, 0xb8, 0xc0, + 0xd4, 0xaa, 0x36, 0x2b, 0x3b, 0x93, 0xad, 0xd9, 0x84, 0xf8, 0x2f, 0xe5, 0x80, 0x30, 0x77, 0x72, + 0xf3, 0xac, 0x32, 0x77, 0x32, 0x33, 0x82, 0x1b, 0x81, 0x4b, 0xba, 0x16, 0x48, 0x6a, 0xf9, 0x8c, + 0x9a, 0x50, 0xf3, 0x31, 0xf3, 0x28, 0x89, 0xc5, 0x24, 0xad, 0x9a, 0x4e, 0x2d, 0x1f, 0x42, 0x27, + 0xb0, 0x18, 0xbb, 0x8c, 0xbd, 0x89, 0xa8, 0xef, 0xc4, 0x34, 0x6a, 0x93, 0x2e, 0xb6, 0xe6, 0xe4, + 0xba, 0xaf, 0xe5, 0x33, 0x3f, 0xd3, 0x88, 0x33, 0x05, 0x68, 0x2d, 0xc4, 0x83, 0x03, 0x68, 0x0f, + 0xaa, 0x01, 0x16, 0x59, 0x7c, 0xd2, 0xb6, 0xe6, 0x65, 0xdd, 0x16, 0x72, 0xef, 0x67, 0x34, 0x4a, + 0xe2, 0x56, 0x06, 0x40, 0x4f, 0x61, 0x49, 0x96, 0x1d, 0xfb, 0x8e, 0xec, 0x35, 0xb1, 0xb1, 0x58, + 0x8b, 0x23, 0x7a, 0xed, 0x55, 0xba, 0xeb, 0xb4, 0x16, 0xb4, 0xd3, 0x89, 0xcb, 0xb1, 0x18, 0x15, + 0x3c, 0xbe, 0x6c, 0x38, 0x93, 0x67, 0x69, 0x3c, 0x8f, 0x76, 0xca, 0x78, 0x7e, 0x0c, 0x56, 0x14, + 0x3a, 0x31, 0xc5, 0x01, 0x61, 0x98, 0x39, 0xac, 0x1f, 0x7a, 0x59, 0xf7, 0xd5, 0x65, 0x43, 0xdd, + 0x8a, 0xc2, 0x33, 0x6d, 0x3e, 0xef, 0x87, 0x5e, 0xda, 0x84, 0x05, 0x47, 0x12, 0x04, 0x09, 0x17, + 0x16, 0x87, 0xf8, 0xd6, 0x2d, 0x59, 0x6a, 0xc3, 0xf1, 0x34, 0xb5, 0x9e, 0xfa, 0xe8, 0x09, 0xdc, + 0x1e, 0x88, 0x88, 0xbd, 0x84, 0x12, 0xde, 0x77, 0x54, 0x57, 0xb5, 0x09, 0xa6, 0xd6, 0x8a, 0xf4, + 0xdf, 0x30, 0x02, 0x6b, 0xd0, 0x69, 0x86, 0x41, 0xc7, 0xb0, 0x65, 0xd2, 0xf8, 0x84, 0x89, 0x82, + 0x27, 0x84, 0x5d, 0xa6, 0x6d, 0xb6, 0x2a, 0x59, 0xd6, 0x73, 0x96, 0x13, 0x13, 0x23, 0x9b, 0xee, + 0xe7, 0xb0, 0x31, 0x90, 0x8b, 0x1b, 0xa4, 0xbf, 0x26, 0x45, 0x61, 0x49, 0x0a, 0xcb, 0x48, 0xc4, + 0x0d, 0xf4, 0xaf, 0x4a, 0xfa, 0x7f, 0x04, 0xab, 0x03, 0x49, 0x44, 0x81, 0x4b, 0x42, 0xe5, 0xba, + 0x26, 0x5d, 0xeb, 0x46, 0x74, 0x69, 0x94, 0x6e, 0x27, 0x83, 0x25, 0x48, 0x18, 0xa6, 0x4e, 0x4c, + 0x49, 0xe8, 0x91, 0xd8, 0xed, 0x2a, 0xf7, 0x46, 0x31, 0xf9, 0x4f, 0x19, 0xa6, 0x67, 0x29, 0x46, + 0xb2, 0x38, 0x83, 0x2c, 0x5d, 0x97, 0x71, 0xb5, 0x7e, 0x79, 0x43, 0x6c, 0x8c, 0x6d, 0x88, 0x46, + 0x1e, 0xe1, 0xb9, 0xcb, 0xb8, 0x58, 0xe1, 0xac, 0x37, 0xba, 0x83, 0x01, 0x62, 0x1a, 0xf5, 0x08, + 0x23, 0x51, 0x48, 0xc2, 0x8e, 0x83, 0x29, 0x8d, 0x28, 0xb3, 0x36, 0x65, 0xbf, 0x6f, 0xe7, 0xfd, + 0xfe, 0x49, 0x46, 0x77, 0x66, 0xc0, 0x9f, 0x08, 0xb4, 0xb9, 0xa0, 0x25, 0x23, 0x13, 0xbb, 0x1a, + 0xbe, 0xe2, 0x98, 0x86, 0x6e, 0x57, 0x55, 0x84, 0x71, 0x97, 0x63, 0x6b, 0x47, 0x16, 0x62, 0x29, + 0x35, 0x89, 0x32, 0x9c, 0x0b, 0x03, 0x22, 0x70, 0x77, 0x08, 0xde, 0xf1, 0x2e, 0xdd, 0xb0, 0x83, + 0x8d, 0x1a, 0xdc, 0x1f, 0x5b, 0x83, 0xdb, 0x25, 0xf2, 0x63, 0x49, 0x92, 0x15, 0xa2, 0x03, 0x77, + 0x28, 0x6e, 0x53, 0xcc, 0x2e, 0xd5, 0x81, 0xc7, 0x9c, 0x9e, 0xdb, 0x25, 0xbe, 0xd3, 0xa6, 0x51, + 0x60, 0x44, 0xfa, 0xd9, 0xd8, 0x48, 0x5b, 0x9a, 0x46, 0x9e, 0x90, 0xec, 0x97, 0x82, 0xe4, 0x29, + 0x8d, 0x82, 0x2c, 0xd0, 0x17, 0xb0, 0xcd, 0x48, 0x27, 0x74, 0x48, 0xe8, 0x30, 0xcc, 0x44, 0x7d, + 0x46, 0x84, 0xfa, 0x78, 0xfc, 0xa4, 0x04, 0xd1, 0x69, 0x78, 0xae, 0x69, 0x4a, 0xb1, 0x6c, 0x0e, + 0x90, 0x6f, 0xea, 0xa8, 0x09, 0x73, 0x69, 0x64, 0x79, 0x44, 0xa8, 0x63, 0x09, 0x14, 0x89, 0x3c, + 0x20, 0x56, 0x60, 0x9a, 0x30, 0x96, 0x60, 0xaa, 0x8f, 0x7b, 0xfd, 0x86, 0x3e, 0x00, 0xa4, 0x9e, + 0x1c, 0x97, 0x09, 0x38, 0xf6, 0xc5, 0x16, 0x30, 0x29, 0x31, 0x8b, 0xca, 0x72, 0xa4, 0x0d, 0xa7, + 0xbe, 0xfd, 0xcd, 0x04, 0x2c, 0x14, 0x76, 0x54, 0xd4, 0x80, 0x6a, 0xba, 0xa7, 0xea, 0xb8, 0xd9, + 0x3b, 0xfa, 0x1c, 0xb6, 0x64, 0x63, 0x67, 0xfb, 0x74, 0x69, 0x7d, 0x27, 0xc6, 0xf7, 0xb8, 0x60, + 0x48, 0x83, 0x16, 0x96, 0x76, 0x0f, 0x96, 0xf2, 0x23, 0x20, 0xea, 0x12, 0x4f, 0x9c, 0x7e, 0x93, + 0xcd, 0x49, 0x91, 0x7c, 0xb6, 0xd1, 0xeb, 0x71, 0x74, 0x0a, 0x76, 0x3b, 0x12, 0x47, 0xae, 0x4e, + 0x22, 0xf3, 0x94, 0x82, 0x48, 0xd7, 0x4f, 0x9e, 0xae, 0xd5, 0xd6, 0xa6, 0x44, 0xaa, 0x68, 0x69, + 0xec, 0x97, 0xf8, 0x8a, 0x9f, 0xcb, 0x8a, 0xa2, 0x5f, 0xc1, 0xde, 0x78, 0x2a, 0xe7, 0x0d, 0xe1, + 0x97, 0x4e, 0xd0, 0x76, 0xad, 0x29, 0xc9, 0x79, 0xf7, 0x5a, 0xce, 0xcf, 0x08, 0xbf, 0x7c, 0xd1, + 0x76, 0xed, 0xbf, 0x54, 0x60, 0x49, 0x08, 0x3d, 0x79, 0xf4, 0xbc, 0x13, 0xca, 0x14, 0x03, 0x32, + 0x13, 0xd6, 0xba, 0xf4, 0x7d, 0x98, 0xee, 0xc8, 0x11, 0xad, 0x4a, 0x4b, 0xa7, 0xaa, 0x36, 0x7f, + 0x6b, 0x45, 0xfa, 0x1e, 0x2c, 0x3c, 0xc3, 0x2a, 0xca, 0x28, 0x7d, 0xf6, 0x08, 0x90, 0xd2, 0xa3, + 0x03, 0xa8, 0x6d, 0x98, 0x92, 0xa1, 0xb4, 0x8a, 0x2c, 0x25, 0xa2, 0xac, 0xf6, 0x15, 0x20, 0x25, + 0x43, 0xff, 0x0b, 0xe7, 0xb7, 0x93, 0x9f, 0x77, 0x01, 0x29, 0xf9, 0x79, 0xed, 0xe4, 0x6c, 0x58, + 0x3c, 0xf2, 0xfd, 0x17, 0x52, 0x8a, 0x8c, 0xc2, 0x6c, 0xc3, 0x72, 0x0b, 0x07, 0x51, 0x0f, 0x5f, + 0x0f, 0xfb, 0x6b, 0x45, 0x2d, 0x99, 0x42, 0xbd, 0x13, 0x4d, 0xf6, 0x85, 0xfa, 0x62, 0xcb, 0x32, + 0xd6, 0x5d, 0xb6, 0x07, 0x33, 0x4a, 0x9c, 0x5d, 0xf3, 0xf1, 0x93, 0x22, 0xbe, 0x75, 0xa7, 0xfd, + 0xbb, 0x0a, 0x53, 0x72, 0x29, 0x4a, 0x22, 0xbf, 0x28, 0x98, 0x27, 0xca, 0x82, 0xd9, 0xc8, 0x68, + 0x72, 0x6c, 0x46, 0xf7, 0x61, 0x3a, 0x7a, 0x13, 0x0a, 0xec, 0x8d, 0x51, 0x58, 0x0d, 0x28, 0xea, + 0xe1, 0xa9, 0xb2, 0x1e, 0x1e, 0x14, 0xd9, 0xd3, 0x45, 0x91, 0x3d, 0x54, 0xbb, 0xce, 0x7c, 0x4f, + 0xda, 0xb5, 0xfa, 0xdd, 0xb5, 0xeb, 0x73, 0xa8, 0xe3, 0xab, 0x98, 0x50, 0xf5, 0x65, 0x93, 0x53, + 0xcd, 0x8e, 0xa5, 0x42, 0xb9, 0x5f, 0xc6, 0xf6, 0x11, 0xac, 0x5e, 0x12, 0x1f, 0xab, 0x93, 0xd6, + 0xf5, 0x7d, 0x8a, 0x19, 0x73, 0xba, 0x84, 0x71, 0x26, 0xbf, 0x2a, 0xaa, 0xad, 0xba, 0x30, 0x8b, + 0x23, 0xf4, 0x48, 0x19, 0x45, 0x37, 0x31, 0xb4, 0x05, 0x20, 0x94, 0xcc, 0x05, 0xe9, 0x12, 0xde, + 0xd7, 0x1f, 0x19, 0xc6, 0xc8, 0xff, 0x05, 0xf6, 0xff, 0x42, 0x60, 0xff, 0x04, 0xd6, 0x4c, 0xb7, + 0x10, 0x73, 0xe7, 0x82, 0x44, 0xcc, 0x94, 0xd6, 0x46, 0xf1, 0x5e, 0x62, 0xfe, 0x98, 0x44, 0x4c, + 0x7a, 0x1e, 0x8f, 0x17, 0xd5, 0xeb, 0xd2, 0xff, 0x2d, 0x85, 0xf3, 0xc6, 0xf7, 0x26, 0x9c, 0xed, + 0x7f, 0x54, 0x60, 0xfd, 0x1a, 0x6f, 0x21, 0xaf, 0x3c, 0x97, 0xe3, 0x4e, 0x44, 0xfb, 0xa9, 0xbc, + 0x4a, 0xdf, 0xd1, 0x2f, 0x00, 0x45, 0x9e, 0x97, 0xc8, 0x6f, 0xf3, 0xef, 0x22, 0xa9, 0x16, 0x53, + 0xaf, 0x6c, 0xce, 0x1f, 0xc2, 0x4a, 0x4c, 0xa3, 0x18, 0x53, 0xde, 0x77, 0x3c, 0x37, 0x61, 0xd9, + 0x5c, 0xb5, 0x14, 0xac, 0xa7, 0xd6, 0x63, 0x65, 0x54, 0xb9, 0xd5, 0x61, 0xaa, 0xe7, 0x76, 0x93, + 0xf4, 0x4a, 0x42, 0xbd, 0x1c, 0xfe, 0xe9, 0x06, 0x2c, 0xa4, 0xd7, 0x54, 0xe7, 0x98, 0xf6, 0x88, + 0x87, 0x91, 0x07, 0x73, 0xe6, 0xed, 0x15, 0xda, 0xcc, 0x4b, 0x37, 0xe4, 0x22, 0xae, 0xb1, 0x35, + 0xca, 0xac, 0xb6, 0x7d, 0xbb, 0xfe, 0x87, 0x7f, 0xfe, 0xeb, 0xcf, 0x13, 0x37, 0xd1, 0xdc, 0x41, + 0xef, 0xc1, 0x41, 0x76, 0xb7, 0xf5, 0x5b, 0x80, 0xfc, 0xce, 0x0a, 0xad, 0x1b, 0x47, 0x75, 0xf1, + 0x26, 0xab, 0x51, 0xde, 0x68, 0xed, 0x2d, 0xc9, 0x69, 0xa1, 0x65, 0x93, 0xf3, 0xe0, 0x77, 0xc4, + 0xff, 0x78, 0xf7, 0xeb, 0x87, 0x95, 0x5d, 0xe4, 0xc2, 0xfc, 0xc0, 0x65, 0x17, 0x32, 0x92, 0x1c, + 0x76, 0x0b, 0x36, 0x2c, 0xc6, 0xa6, 0x8c, 0xb1, 0x6a, 0x0f, 0xe4, 0xfd, 0x30, 0xbb, 0xc4, 0x8a, + 0x61, 0x7e, 0xe0, 0x26, 0xcc, 0x0c, 0x31, 0xec, 0x8a, 0x6c, 0x58, 0x88, 0x0f, 0x64, 0x88, 0x7b, + 0x87, 0xeb, 0x83, 0xd3, 0xd0, 0x4f, 0xfb, 0x6a, 0x3a, 0x59, 0x44, 0x1f, 0xe6, 0x07, 0x6e, 0xbe, + 0xcc, 0x88, 0xc3, 0xae, 0xc4, 0x1a, 0x2b, 0xa5, 0xb6, 0x7a, 0x12, 0xc4, 0xbc, 0x6f, 0xaf, 0xcb, + 0xb0, 0xb7, 0x76, 0x87, 0x55, 0xef, 0xf0, 0xef, 0xd3, 0x30, 0xaf, 0xe4, 0x61, 0xda, 0x0f, 0xbf, + 0x01, 0xc8, 0x35, 0xa3, 0xb9, 0x54, 0x25, 0xe9, 0xdb, 0xd8, 0x18, 0x6e, 0xd4, 0x9d, 0x80, 0x64, + 0xdc, 0x39, 0x04, 0x22, 0xae, 0x56, 0x94, 0xaf, 0xa0, 0x9a, 0x2a, 0x45, 0xb4, 0x36, 0xd0, 0x05, + 0xa6, 0xc0, 0x6a, 0x14, 0xb5, 0x9c, 0xbd, 0x21, 0xb9, 0x56, 0xd0, 0x52, 0xce, 0x65, 0xac, 0xff, + 0x67, 0x50, 0x33, 0xc4, 0x25, 0xda, 0x28, 0xae, 0xfe, 0xf5, 0xdc, 0x6b, 0x92, 0x7b, 0xd9, 0x36, + 0xf2, 0x7c, 0xa8, 0xb5, 0xa3, 0x0f, 0x35, 0x43, 0x78, 0x9a, 0xc4, 0x65, 0x3d, 0x5a, 0x26, 0xbe, + 0x27, 0x89, 0x9b, 0x87, 0xab, 0x66, 0xd2, 0xf2, 0xaf, 0x5e, 0x6b, 0x1d, 0xe5, 0x73, 0xa8, 0x19, + 0x22, 0xd3, 0x8c, 0x52, 0xd6, 0x9e, 0x23, 0x57, 0x59, 0xcf, 0x62, 0xb7, 0x5c, 0x21, 0xe4, 0xc1, + 0x6c, 0x26, 0x4f, 0x51, 0xc3, 0xe8, 0xcb, 0x82, 0x66, 0x2d, 0xcf, 0xe0, 0xbe, 0x24, 0xbd, 0x63, + 0x6f, 0x95, 0x48, 0x0f, 0xb4, 0x4e, 0x3a, 0xb8, 0x4b, 0x71, 0x5b, 0xac, 0x41, 0x0f, 0xe6, 0x4c, + 0x7d, 0x6b, 0x6e, 0x23, 0x43, 0x74, 0x6f, 0x39, 0xd4, 0x8f, 0x64, 0xa8, 0x07, 0xbb, 0x7b, 0xa3, + 0x43, 0x19, 0xbf, 0x94, 0xaf, 0xb3, 0xb8, 0x14, 0x6a, 0x86, 0xfa, 0x44, 0x85, 0x96, 0x1c, 0x94, + 0xd1, 0x8d, 0xcd, 0x11, 0x56, 0xdd, 0xb1, 0x7a, 0xc1, 0xd0, 0x98, 0xe9, 0x3e, 0xae, 0xff, 0x1a, + 0xc5, 0xaf, 0x3b, 0xea, 0x9f, 0x18, 0x07, 0xbd, 0x07, 0x8f, 0xd4, 0x52, 0x4c, 0xcb, 0x3f, 0x3f, + 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x7b, 0x5d, 0x05, 0x7c, 0x19, 0x00, 0x00, } diff --git a/pkg/proto/v0/accounts.proto b/pkg/proto/v0/accounts.proto index 02fb9c5b9..f2ba6b475 100644 --- a/pkg/proto/v0/accounts.proto +++ b/pkg/proto/v0/accounts.proto @@ -180,11 +180,8 @@ message GetAccountRequest { } message CreateAccountRequest { - // The account id to use for this account - string id = 1; - // The account resource to create - Account account = 2; + Account account = 1; } message UpdateAccountRequest { @@ -456,11 +453,8 @@ message GetGroupRequest { } message CreateGroupRequest { - // The group id to use for this group - string id = 1; - // The account resource to create - Group group = 2; + Group group = 1; } message UpdateGroupRequest { diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index b574b3d5a..34a7be485 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -226,13 +226,14 @@ func (s Service) GetAccount(c context.Context, req *proto.GetAccountRequest, res // CreateAccount implements the AccountsServiceHandler interface func (s Service) CreateAccount(c context.Context, req *proto.CreateAccountRequest, res *proto.Account) (err error) { var id string - if req.Id == "" { - req.Id = uuid.Must(uuid.NewV4()).String() + if req.Account == nil { + return fmt.Errorf("account missing") + } + if req.Account.Id == "" { + req.Account.Id = uuid.Must(uuid.NewV4()).String() } - // we are always ignoring the id in the account here ... hmm just do away with the extra id property? - req.Account.Id = req.Id - if id, err = cleanupID(req.Id); err != nil { + if id, err = cleanupID(req.Account.Id); err != nil { return } path := filepath.Join(s.Config.Server.AccountsDataPath, "accounts", id)