From cce79b612a1da54eb1db1bb59a9075b5428b540c Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Wed, 26 Jan 2022 12:04:10 +0300 Subject: [PATCH] [#329] Update accessbox protobuf Signed-off-by: Denis Kirillov --- creds/accessbox/accessbox.pb.go | 107 ++++++++++++++++---------------- creds/accessbox/accessbox.proto | 2 +- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/creds/accessbox/accessbox.pb.go b/creds/accessbox/accessbox.pb.go index 736adacaa..86df43ad3 100644 --- a/creds/accessbox/accessbox.pb.go +++ b/creds/accessbox/accessbox.pb.go @@ -34,7 +34,7 @@ type AccessBox struct { func (x *AccessBox) Reset() { *x = AccessBox{} if protoimpl.UnsafeEnabled { - mi := &file_accessbox_proto_msgTypes[0] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -47,7 +47,7 @@ func (x *AccessBox) String() string { func (*AccessBox) ProtoMessage() {} func (x *AccessBox) ProtoReflect() protoreflect.Message { - mi := &file_accessbox_proto_msgTypes[0] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -60,7 +60,7 @@ func (x *AccessBox) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessBox.ProtoReflect.Descriptor instead. func (*AccessBox) Descriptor() ([]byte, []int) { - return file_accessbox_proto_rawDescGZIP(), []int{0} + return file_creds_accessbox_accessbox_proto_rawDescGZIP(), []int{0} } func (x *AccessBox) GetOwnerPublicKey() []byte { @@ -89,15 +89,15 @@ type Tokens struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - AccessKey []byte `protobuf:"bytes,1,opt,name=accessKey,proto3" json:"accessKey,omitempty"` - BearerToken []byte `protobuf:"bytes,2,opt,name=bearerToken,proto3" json:"bearerToken,omitempty"` - SessionToken []byte `protobuf:"bytes,3,opt,name=sessionToken,proto3" json:"sessionToken,omitempty"` + AccessKey []byte `protobuf:"bytes,1,opt,name=accessKey,proto3" json:"accessKey,omitempty"` + BearerToken []byte `protobuf:"bytes,2,opt,name=bearerToken,proto3" json:"bearerToken,omitempty"` + SessionTokens [][]byte `protobuf:"bytes,3,rep,name=sessionTokens,proto3" json:"sessionTokens,omitempty"` } func (x *Tokens) Reset() { *x = Tokens{} if protoimpl.UnsafeEnabled { - mi := &file_accessbox_proto_msgTypes[1] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -110,7 +110,7 @@ func (x *Tokens) String() string { func (*Tokens) ProtoMessage() {} func (x *Tokens) ProtoReflect() protoreflect.Message { - mi := &file_accessbox_proto_msgTypes[1] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -123,7 +123,7 @@ func (x *Tokens) ProtoReflect() protoreflect.Message { // Deprecated: Use Tokens.ProtoReflect.Descriptor instead. func (*Tokens) Descriptor() ([]byte, []int) { - return file_accessbox_proto_rawDescGZIP(), []int{1} + return file_creds_accessbox_accessbox_proto_rawDescGZIP(), []int{1} } func (x *Tokens) GetAccessKey() []byte { @@ -140,9 +140,9 @@ func (x *Tokens) GetBearerToken() []byte { return nil } -func (x *Tokens) GetSessionToken() []byte { +func (x *Tokens) GetSessionTokens() [][]byte { if x != nil { - return x.SessionToken + return x.SessionTokens } return nil } @@ -159,7 +159,7 @@ type AccessBox_Gate struct { func (x *AccessBox_Gate) Reset() { *x = AccessBox_Gate{} if protoimpl.UnsafeEnabled { - mi := &file_accessbox_proto_msgTypes[2] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -172,7 +172,7 @@ func (x *AccessBox_Gate) String() string { func (*AccessBox_Gate) ProtoMessage() {} func (x *AccessBox_Gate) ProtoReflect() protoreflect.Message { - mi := &file_accessbox_proto_msgTypes[2] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -185,7 +185,7 @@ func (x *AccessBox_Gate) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessBox_Gate.ProtoReflect.Descriptor instead. func (*AccessBox_Gate) Descriptor() ([]byte, []int) { - return file_accessbox_proto_rawDescGZIP(), []int{0, 0} + return file_creds_accessbox_accessbox_proto_rawDescGZIP(), []int{0, 0} } func (x *AccessBox_Gate) GetTokens() []byte { @@ -214,7 +214,7 @@ type AccessBox_ContainerPolicy struct { func (x *AccessBox_ContainerPolicy) Reset() { *x = AccessBox_ContainerPolicy{} if protoimpl.UnsafeEnabled { - mi := &file_accessbox_proto_msgTypes[3] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -227,7 +227,7 @@ func (x *AccessBox_ContainerPolicy) String() string { func (*AccessBox_ContainerPolicy) ProtoMessage() {} func (x *AccessBox_ContainerPolicy) ProtoReflect() protoreflect.Message { - mi := &file_accessbox_proto_msgTypes[3] + mi := &file_creds_accessbox_accessbox_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -240,7 +240,7 @@ func (x *AccessBox_ContainerPolicy) ProtoReflect() protoreflect.Message { // Deprecated: Use AccessBox_ContainerPolicy.ProtoReflect.Descriptor instead. func (*AccessBox_ContainerPolicy) Descriptor() ([]byte, []int) { - return file_accessbox_proto_rawDescGZIP(), []int{0, 1} + return file_creds_accessbox_accessbox_proto_rawDescGZIP(), []int{0, 1} } func (x *AccessBox_ContainerPolicy) GetLocationConstraint() string { @@ -257,10 +257,11 @@ func (x *AccessBox_ContainerPolicy) GetPolicy() []byte { return nil } -var File_accessbox_proto protoreflect.FileDescriptor +var File_creds_accessbox_accessbox_proto protoreflect.FileDescriptor -var file_accessbox_proto_rawDesc = []byte{ - 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, +var file_creds_accessbox_accessbox_proto_rawDesc = []byte{ + 0x0a, 0x1f, 0x63, 0x72, 0x65, 0x64, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, + 0x78, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, 0x78, 0x22, 0xd5, 0x02, 0x0a, 0x09, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x6f, 0x78, 0x12, 0x26, 0x0a, 0x0e, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, @@ -283,40 +284,40 @@ var file_accessbox_proto_rawDesc = []byte{ 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x6f, - 0x6c, 0x69, 0x63, 0x79, 0x22, 0x6c, 0x0a, 0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x1c, + 0x6c, 0x69, 0x63, 0x79, 0x22, 0x6e, 0x0a, 0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x22, - 0x0a, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x6e, 0x65, 0x6f, 0x66, 0x73, - 0x2d, 0x73, 0x33, 0x2d, 0x67, 0x77, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x73, 0x2f, 0x74, 0x6f, 0x6b, - 0x65, 0x6e, 0x62, 0x6f, 0x78, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, 0x78, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0c, 0x52, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x24, + 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, + 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x6e, 0x65, 0x6f, + 0x66, 0x73, 0x2d, 0x73, 0x33, 0x2d, 0x67, 0x77, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x73, 0x2f, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x62, 0x6f, 0x78, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, + 0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_accessbox_proto_rawDescOnce sync.Once - file_accessbox_proto_rawDescData = file_accessbox_proto_rawDesc + file_creds_accessbox_accessbox_proto_rawDescOnce sync.Once + file_creds_accessbox_accessbox_proto_rawDescData = file_creds_accessbox_accessbox_proto_rawDesc ) -func file_accessbox_proto_rawDescGZIP() []byte { - file_accessbox_proto_rawDescOnce.Do(func() { - file_accessbox_proto_rawDescData = protoimpl.X.CompressGZIP(file_accessbox_proto_rawDescData) +func file_creds_accessbox_accessbox_proto_rawDescGZIP() []byte { + file_creds_accessbox_accessbox_proto_rawDescOnce.Do(func() { + file_creds_accessbox_accessbox_proto_rawDescData = protoimpl.X.CompressGZIP(file_creds_accessbox_accessbox_proto_rawDescData) }) - return file_accessbox_proto_rawDescData + return file_creds_accessbox_accessbox_proto_rawDescData } -var file_accessbox_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_accessbox_proto_goTypes = []interface{}{ +var file_creds_accessbox_accessbox_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_creds_accessbox_accessbox_proto_goTypes = []interface{}{ (*AccessBox)(nil), // 0: accessbox.AccessBox (*Tokens)(nil), // 1: accessbox.Tokens (*AccessBox_Gate)(nil), // 2: accessbox.AccessBox.Gate (*AccessBox_ContainerPolicy)(nil), // 3: accessbox.AccessBox.ContainerPolicy } -var file_accessbox_proto_depIdxs = []int32{ +var file_creds_accessbox_accessbox_proto_depIdxs = []int32{ 2, // 0: accessbox.AccessBox.gates:type_name -> accessbox.AccessBox.Gate 3, // 1: accessbox.AccessBox.containerPolicy:type_name -> accessbox.AccessBox.ContainerPolicy 2, // [2:2] is the sub-list for method output_type @@ -326,13 +327,13 @@ var file_accessbox_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_accessbox_proto_init() } -func file_accessbox_proto_init() { - if File_accessbox_proto != nil { +func init() { file_creds_accessbox_accessbox_proto_init() } +func file_creds_accessbox_accessbox_proto_init() { + if File_creds_accessbox_accessbox_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_accessbox_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_creds_accessbox_accessbox_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AccessBox); i { case 0: return &v.state @@ -344,7 +345,7 @@ func file_accessbox_proto_init() { return nil } } - file_accessbox_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_creds_accessbox_accessbox_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Tokens); i { case 0: return &v.state @@ -356,7 +357,7 @@ func file_accessbox_proto_init() { return nil } } - file_accessbox_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_creds_accessbox_accessbox_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AccessBox_Gate); i { case 0: return &v.state @@ -368,7 +369,7 @@ func file_accessbox_proto_init() { return nil } } - file_accessbox_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_creds_accessbox_accessbox_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AccessBox_ContainerPolicy); i { case 0: return &v.state @@ -385,18 +386,18 @@ func file_accessbox_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_accessbox_proto_rawDesc, + RawDescriptor: file_creds_accessbox_accessbox_proto_rawDesc, NumEnums: 0, NumMessages: 4, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_accessbox_proto_goTypes, - DependencyIndexes: file_accessbox_proto_depIdxs, - MessageInfos: file_accessbox_proto_msgTypes, + GoTypes: file_creds_accessbox_accessbox_proto_goTypes, + DependencyIndexes: file_creds_accessbox_accessbox_proto_depIdxs, + MessageInfos: file_creds_accessbox_accessbox_proto_msgTypes, }.Build() - File_accessbox_proto = out.File - file_accessbox_proto_rawDesc = nil - file_accessbox_proto_goTypes = nil - file_accessbox_proto_depIdxs = nil + File_creds_accessbox_accessbox_proto = out.File + file_creds_accessbox_accessbox_proto_rawDesc = nil + file_creds_accessbox_accessbox_proto_goTypes = nil + file_creds_accessbox_accessbox_proto_depIdxs = nil } diff --git a/creds/accessbox/accessbox.proto b/creds/accessbox/accessbox.proto index d85aa5cc0..303fb6569 100644 --- a/creds/accessbox/accessbox.proto +++ b/creds/accessbox/accessbox.proto @@ -25,6 +25,6 @@ message AccessBox { message Tokens { bytes accessKey = 1 [json_name = "accessKey"]; bytes bearerToken = 2 [json_name = "bearerToken"]; - bytes sessionToken = 3 [json_name = "sessionToken"]; + repeated bytes sessionTokens = 3 [json_name = "sessionTokens"]; }