From 8aca8c57873fc6efa2193c4ce545041191da43a5 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 14 Aug 2020 09:49:05 +0300 Subject: [PATCH] Update proto files from latest jindo --- Makefile | 7 +- v2/accounting/service.pb.go | 107 ++-- v2/acl/types.pb.go | 204 ++++--- v2/container/service.pb.go | 254 +++++---- v2/container/types.pb.go | 77 +-- v2/netmap/types.pb.go | 1056 ++++++++++++++++++----------------- v2/object/service.pb.go | 750 ++++++++++--------------- v2/object/types.pb.go | 101 ++-- v2/refs/types.pb.go | 13 +- v2/service/meta.pb.go | 245 ++++---- v2/service/verify.pb.go | 48 +- v2/session/service.pb.go | 106 ++-- v2/storagegroup/types.pb.go | 40 +- 13 files changed, 1471 insertions(+), 1537 deletions(-) diff --git a/Makefile b/Makefile index 0847abe4..f4a54c4c 100644 --- a/Makefile +++ b/Makefile @@ -50,17 +50,12 @@ docgen: deps protoc: @echo "${B}${G}⇒ Cleanup old files ${R}" @find . -type f -name '*.pb.go' -not -path './vendor/*' -exec rm {} \; - - @echo "${B}${G}⇒ Install specific version for gogo-proto ${R}" - @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/gogo/protobuf | xargs go get -v - @echo "${B}${G}⇒ Install specific version for protobuf lib ${R}" - @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/golang/protobuf | xargs go get -v @echo "${B}${G}⇒ Protoc generate ${R}" @for f in `find . -type f -name '*.proto' -not -path './vendor/*'`; do \ echo "${B}${G}⇒ Processing $$f ${R}"; \ protoc \ --proto_path=.:./vendor:/usr/local/include \ - --gofast_out=plugins=grpc,paths=source_relative:. $$f; \ + --gofast_out=plugins=grpc,paths=source_relative:. $$f; \ done update: docgen protoc diff --git a/v2/accounting/service.pb.go b/v2/accounting/service.pb.go index 0a4deda7..f8a40e88 100644 --- a/v2/accounting/service.pb.go +++ b/v2/accounting/service.pb.go @@ -104,6 +104,7 @@ func (m *BalanceRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +//Request body type BalanceRequest_Body struct { // Carries user identifier in NeoFS system for which the balance // is requested. @@ -283,6 +284,7 @@ func (m *BalanceResponse) GetVerifyHeader() *service.ResponseVerificationHeader return nil } +//Request body type BalanceResponse_Body struct { // Carries the amount of funds on the account. Balance *Decimal `protobuf:"bytes,1,opt,name=balance,proto3" json:"balance,omitempty"` @@ -342,36 +344,37 @@ func init() { func init() { proto.RegisterFile("v2/accounting/service.proto", fileDescriptor_484f6b0e24e3172f) } var fileDescriptor_484f6b0e24e3172f = []byte{ - // 464 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6a, 0x13, 0x41, - 0x18, 0xc5, 0xdd, 0xb4, 0x1a, 0xfd, 0x6a, 0x15, 0xc6, 0x48, 0x4b, 0xd4, 0x20, 0xa1, 0x05, 0x15, - 0x33, 0x03, 0xeb, 0x85, 0x20, 0x54, 0x69, 0xa8, 0xc5, 0x5c, 0xf8, 0x6f, 0x85, 0x22, 0xde, 0x94, - 0xc9, 0xec, 0x97, 0x74, 0x20, 0x99, 0x59, 0x77, 0x36, 0x2b, 0x79, 0x13, 0x5f, 0xc0, 0x1b, 0x2f, - 0x7c, 0x0e, 0x2f, 0x7d, 0x04, 0x89, 0x2f, 0x22, 0x3b, 0x33, 0x49, 0x36, 0xb0, 0x6d, 0x73, 0xb7, - 0x33, 0x73, 0xce, 0x99, 0xef, 0xfc, 0xd8, 0x81, 0x7b, 0x79, 0xc8, 0xb8, 0x10, 0x7a, 0xa2, 0x32, - 0xa9, 0x86, 0xcc, 0x60, 0x9a, 0x4b, 0x81, 0x34, 0x49, 0x75, 0xa6, 0x49, 0x43, 0xa1, 0xa6, 0x03, - 0x43, 0xf3, 0x90, 0x2e, 0x35, 0xcd, 0x3b, 0x79, 0xc8, 0x52, 0x1c, 0x18, 0x96, 0x4d, 0x13, 0x34, - 0x4e, 0xda, 0xbc, 0x9b, 0x87, 0x73, 0x33, 0x1b, 0x63, 0xc6, 0xfd, 0xf6, 0x4e, 0x69, 0x3b, 0xc7, - 0x54, 0x0e, 0xa6, 0xee, 0xa0, 0xfd, 0xa3, 0x06, 0xb7, 0xba, 0x7c, 0xc4, 0x95, 0xc0, 0x08, 0xbf, - 0x4e, 0xd0, 0x64, 0xe4, 0x00, 0x36, 0xfb, 0x3a, 0x9e, 0xee, 0x06, 0x0f, 0x83, 0x47, 0x5b, 0xe1, - 0x63, 0x5a, 0x75, 0x39, 0x5d, 0xf5, 0xd0, 0xae, 0x8e, 0xa7, 0x91, 0xb5, 0x91, 0xd7, 0xb0, 0x55, - 0x5c, 0x7c, 0x7a, 0x86, 0x3c, 0xc6, 0x74, 0xb7, 0x66, 0x53, 0xf6, 0x4a, 0x29, 0xf3, 0x6e, 0xde, - 0xfb, 0x16, 0x33, 0xfe, 0xc6, 0x6a, 0x23, 0x18, 0x2f, 0xbe, 0xc9, 0x47, 0xd8, 0x76, 0x83, 0xce, - 0x83, 0x36, 0x6c, 0xd0, 0xd3, 0xf3, 0x83, 0x4e, 0x0a, 0xb9, 0x14, 0x3c, 0x93, 0x5a, 0xf9, 0xc0, - 0x9b, 0x2e, 0xc2, 0xad, 0x9a, 0x2f, 0x60, 0xb3, 0x98, 0x93, 0x84, 0x70, 0x5d, 0x7f, 0x53, 0x98, - 0x9e, 0xca, 0xd8, 0x97, 0xdc, 0x29, 0xa5, 0x16, 0x48, 0xe9, 0xfb, 0xe2, 0xbc, 0x77, 0x14, 0xd5, - 0xad, 0xb0, 0x17, 0xb7, 0x0f, 0xa0, 0x7e, 0x84, 0x42, 0x8e, 0xf9, 0x88, 0x34, 0xe0, 0x6a, 0xce, - 0x47, 0x13, 0xb4, 0xde, 0x8d, 0xc8, 0x2d, 0xc8, 0x7d, 0xb8, 0x91, 0xa4, 0x28, 0xa4, 0x91, 0x5a, - 0xd9, 0xd2, 0xdb, 0xd1, 0x72, 0xa3, 0xfd, 0xab, 0x06, 0xb7, 0x17, 0xc8, 0x4c, 0xa2, 0x95, 0x41, - 0xf2, 0x72, 0x85, 0xf3, 0x93, 0x4b, 0x38, 0x3b, 0x53, 0x19, 0xf4, 0x71, 0x15, 0xe8, 0xfd, 0x4a, - 0x3e, 0xce, 0x7c, 0x0e, 0xe9, 0xa8, 0x9a, 0x74, 0xe7, 0x82, 0xa4, 0x4b, 0x51, 0xbf, 0xf2, 0xa8, - 0x9f, 0x43, 0xbd, 0xef, 0x1a, 0xf8, 0x9a, 0x0f, 0xaa, 0x6b, 0x7a, 0xb6, 0xd1, 0x5c, 0x1d, 0xc6, - 0x00, 0x87, 0x8b, 0x63, 0x72, 0x02, 0x75, 0x0f, 0x82, 0xec, 0xad, 0xf3, 0x3f, 0x36, 0xf7, 0xd7, - 0xa2, 0xd9, 0xfd, 0xfc, 0x7b, 0xd6, 0x0a, 0xfe, 0xcc, 0x5a, 0xc1, 0xdf, 0x59, 0x2b, 0xf8, 0xfe, - 0xaf, 0x75, 0xe5, 0x0b, 0x1b, 0xca, 0xec, 0x6c, 0xd2, 0xa7, 0x42, 0x8f, 0x99, 0x32, 0x89, 0x10, - 0x9d, 0x18, 0x73, 0xa6, 0x50, 0x0f, 0x4c, 0x87, 0x27, 0xb2, 0x33, 0xd4, 0x6c, 0xe5, 0xa5, 0xfe, - 0xac, 0x35, 0xde, 0xa1, 0x3e, 0xfe, 0x44, 0x0f, 0x3f, 0xf4, 0xe8, 0x72, 0xe2, 0xfe, 0x35, 0xfb, - 0xbc, 0x9e, 0xfd, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x91, 0xf3, 0x3d, 0xd8, 0x03, 0x00, 0x00, + // 472 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6e, 0xd3, 0x30, + 0x18, 0xc5, 0x49, 0x37, 0x28, 0x78, 0x0c, 0x84, 0x19, 0xea, 0x54, 0xa0, 0x42, 0xd5, 0x26, 0x01, + 0xa2, 0x8e, 0x14, 0x2e, 0x90, 0x86, 0x06, 0x5a, 0x35, 0x26, 0x7a, 0xc1, 0xbf, 0x4c, 0xda, 0x05, + 0x37, 0x93, 0xeb, 0x7c, 0xe9, 0x2c, 0x5a, 0x3b, 0xc4, 0xae, 0x51, 0xdf, 0x84, 0x17, 0xe0, 0x86, + 0x0b, 0x9e, 0x83, 0x4b, 0x1e, 0x01, 0x95, 0x17, 0x41, 0xb1, 0xdd, 0x36, 0x95, 0xb2, 0xad, 0x77, + 0xb1, 0x7d, 0xce, 0xf9, 0x7c, 0x7e, 0x8a, 0xd1, 0x7d, 0x13, 0x85, 0x94, 0x31, 0x39, 0x16, 0x9a, + 0x8b, 0x41, 0xa8, 0x20, 0x37, 0x9c, 0x01, 0xc9, 0x72, 0xa9, 0x25, 0xde, 0x12, 0x20, 0x49, 0xaa, + 0x88, 0x89, 0xc8, 0x42, 0xd3, 0xbc, 0x6b, 0xa2, 0x30, 0x87, 0x54, 0x85, 0x7a, 0x92, 0x81, 0x72, + 0xd2, 0xe6, 0x3d, 0x13, 0xcd, 0xcc, 0xe1, 0x08, 0x34, 0xf5, 0xdb, 0x8d, 0xd2, 0xb6, 0x81, 0x9c, + 0xa7, 0x13, 0x77, 0xd0, 0xfe, 0x51, 0x43, 0xb7, 0xba, 0x74, 0x48, 0x05, 0x83, 0x18, 0xbe, 0x8e, + 0x41, 0x69, 0xbc, 0x8f, 0xd6, 0xfb, 0x32, 0x99, 0x6c, 0x07, 0x8f, 0x82, 0xc7, 0x1b, 0xd1, 0x13, + 0x52, 0x35, 0x9c, 0x2c, 0x7b, 0x48, 0x57, 0x26, 0x93, 0xd8, 0xda, 0xf0, 0x1b, 0xb4, 0x51, 0x0c, + 0x3e, 0x3d, 0x03, 0x9a, 0x40, 0xbe, 0x5d, 0xb3, 0x29, 0x3b, 0xa5, 0x94, 0x59, 0x37, 0xef, 0x7d, + 0x07, 0x9a, 0xbe, 0xb5, 0xda, 0x18, 0x8d, 0xe6, 0xdf, 0xf8, 0x13, 0xda, 0x74, 0x17, 0x9d, 0x05, + 0xad, 0xd9, 0xa0, 0x67, 0xe7, 0x07, 0x9d, 0x14, 0x72, 0xce, 0xa8, 0xe6, 0x52, 0xf8, 0xc0, 0x9b, + 0x2e, 0xc2, 0xad, 0x9a, 0x7b, 0x68, 0xbd, 0xb8, 0x27, 0x8e, 0xd0, 0x75, 0xf9, 0x4d, 0x40, 0x7e, + 0xca, 0x13, 0x5f, 0xb2, 0x51, 0x4a, 0x2d, 0x90, 0x92, 0x0f, 0xc5, 0x79, 0xef, 0x30, 0xae, 0x5b, + 0x61, 0x2f, 0x69, 0xef, 0xa3, 0xfa, 0x21, 0x30, 0x3e, 0xa2, 0x43, 0xbc, 0x85, 0xae, 0x1a, 0x3a, + 0x1c, 0x83, 0xf5, 0xae, 0xc5, 0x6e, 0x81, 0x1f, 0xa0, 0x1b, 0x59, 0x0e, 0x8c, 0x2b, 0x2e, 0x85, + 0x2d, 0xbd, 0x19, 0x2f, 0x36, 0xda, 0xbf, 0x6a, 0xe8, 0xf6, 0x1c, 0x99, 0xca, 0xa4, 0x50, 0x80, + 0x5f, 0x2d, 0x71, 0x7e, 0x7a, 0x09, 0x67, 0x67, 0x2a, 0x83, 0x3e, 0xaa, 0x02, 0xbd, 0x5b, 0xc9, + 0xc7, 0x99, 0xcf, 0x21, 0x1d, 0x57, 0x93, 0xee, 0x5c, 0x90, 0x74, 0x29, 0xea, 0xd7, 0x1e, 0xf5, + 0x0b, 0x54, 0xef, 0xbb, 0x06, 0xbe, 0xe6, 0xc3, 0xea, 0x9a, 0x9e, 0x6d, 0x3c, 0x53, 0x47, 0x5f, + 0xd0, 0x9d, 0x83, 0xf9, 0xf1, 0xb1, 0x1b, 0x8f, 0x4f, 0x50, 0xdd, 0xf3, 0xc0, 0x3b, 0xab, 0xfc, + 0x96, 0xcd, 0xdd, 0x95, 0xa0, 0x76, 0xd3, 0xdf, 0xd3, 0x56, 0xf0, 0x67, 0xda, 0x0a, 0xfe, 0x4e, + 0x5b, 0xc1, 0xf7, 0x7f, 0xad, 0x2b, 0x9f, 0xf7, 0x06, 0x5c, 0x9f, 0x8d, 0xfb, 0x84, 0xc9, 0x51, + 0x28, 0x54, 0xc6, 0x58, 0x27, 0x01, 0x13, 0x0a, 0x90, 0xa9, 0xea, 0xd0, 0x8c, 0x77, 0x06, 0x32, + 0x5c, 0x7a, 0xb0, 0x2f, 0x17, 0x9f, 0x3f, 0x6b, 0x8d, 0xf7, 0x20, 0x8f, 0x8e, 0xc9, 0xc1, 0xc7, + 0x5e, 0x31, 0x77, 0x51, 0xa3, 0x7f, 0xcd, 0xbe, 0xb9, 0xe7, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x1e, 0x24, 0x48, 0xec, 0xed, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -382,74 +385,74 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// AccountingClient is the client API for Accounting service. +// AccountingServiceClient is the client API for AccountingService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type AccountingClient interface { +type AccountingServiceClient interface { // Returns the amount of funds for the requested NeoFS account. Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) } -type accountingClient struct { +type accountingServiceClient struct { cc *grpc.ClientConn } -func NewAccountingClient(cc *grpc.ClientConn) AccountingClient { - return &accountingClient{cc} +func NewAccountingServiceClient(cc *grpc.ClientConn) AccountingServiceClient { + return &accountingServiceClient{cc} } -func (c *accountingClient) Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) { +func (c *accountingServiceClient) Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) { out := new(BalanceResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.accounting.Accounting/Balance", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.accounting.AccountingService/Balance", in, out, opts...) if err != nil { return nil, err } return out, nil } -// AccountingServer is the server API for Accounting service. -type AccountingServer interface { +// AccountingServiceServer is the server API for AccountingService service. +type AccountingServiceServer interface { // Returns the amount of funds for the requested NeoFS account. Balance(context.Context, *BalanceRequest) (*BalanceResponse, error) } -// UnimplementedAccountingServer can be embedded to have forward compatible implementations. -type UnimplementedAccountingServer struct { +// UnimplementedAccountingServiceServer can be embedded to have forward compatible implementations. +type UnimplementedAccountingServiceServer struct { } -func (*UnimplementedAccountingServer) Balance(ctx context.Context, req *BalanceRequest) (*BalanceResponse, error) { +func (*UnimplementedAccountingServiceServer) Balance(ctx context.Context, req *BalanceRequest) (*BalanceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Balance not implemented") } -func RegisterAccountingServer(s *grpc.Server, srv AccountingServer) { - s.RegisterService(&_Accounting_serviceDesc, srv) +func RegisterAccountingServiceServer(s *grpc.Server, srv AccountingServiceServer) { + s.RegisterService(&_AccountingService_serviceDesc, srv) } -func _Accounting_Balance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AccountingService_Balance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(BalanceRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(AccountingServer).Balance(ctx, in) + return srv.(AccountingServiceServer).Balance(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.accounting.Accounting/Balance", + FullMethod: "/neo.fs.v2.accounting.AccountingService/Balance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AccountingServer).Balance(ctx, req.(*BalanceRequest)) + return srv.(AccountingServiceServer).Balance(ctx, req.(*BalanceRequest)) } return interceptor(ctx, in, info, handler) } -var _Accounting_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neo.fs.v2.accounting.Accounting", - HandlerType: (*AccountingServer)(nil), +var _AccountingService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neo.fs.v2.accounting.AccountingService", + HandlerType: (*AccountingServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Balance", - Handler: _Accounting_Balance_Handler, + Handler: _AccountingService_Balance_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/v2/acl/types.pb.go b/v2/acl/types.pb.go index e05fcf5e..0425329e 100644 --- a/v2/acl/types.pb.go +++ b/v2/acl/types.pb.go @@ -27,8 +27,8 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Target int32 const ( - // Unknown target, default value. - Target_UNKNOWN Target = 0 + // Unspecified target, default value. + Target_TARGET_UNSPECIFIED Target = 0 // User target rule is applied if sender is the owner of the container. Target_USER Target = 1 // System target rule is applied if sender is the storage node within the @@ -39,17 +39,17 @@ const ( ) var Target_name = map[int32]string{ - 0: "UNKNOWN", + 0: "TARGET_UNSPECIFIED", 1: "USER", 2: "SYSTEM", 3: "OTHERS", } var Target_value = map[string]int32{ - "UNKNOWN": 0, - "USER": 1, - "SYSTEM": 2, - "OTHERS": 3, + "TARGET_UNSPECIFIED": 0, + "USER": 1, + "SYSTEM": 2, + "OTHERS": 3, } func (x Target) String() string { @@ -64,18 +64,26 @@ func (Target) EnumDescriptor() ([]byte, []int) { type EACLRecord_Operation int32 const ( - EACLRecord_OPERATION_UNKNOWN EACLRecord_Operation = 0 - EACLRecord_GET EACLRecord_Operation = 1 - EACLRecord_HEAD EACLRecord_Operation = 2 - EACLRecord_PUT EACLRecord_Operation = 3 - EACLRecord_DELETE EACLRecord_Operation = 4 - EACLRecord_SEARCH EACLRecord_Operation = 5 - EACLRecord_GETRANGE EACLRecord_Operation = 6 - EACLRecord_GETRANGEHASH EACLRecord_Operation = 7 + // Unspecified operation, default value. + EACLRecord_OPERATION_UNSPECIFIED EACLRecord_Operation = 0 + // Get + EACLRecord_GET EACLRecord_Operation = 1 + // Head + EACLRecord_HEAD EACLRecord_Operation = 2 + // Put + EACLRecord_PUT EACLRecord_Operation = 3 + // Delete + EACLRecord_DELETE EACLRecord_Operation = 4 + // Search + EACLRecord_SEARCH EACLRecord_Operation = 5 + // GetRange + EACLRecord_GETRANGE EACLRecord_Operation = 6 + // GetRangeHash + EACLRecord_GETRANGEHASH EACLRecord_Operation = 7 ) var EACLRecord_Operation_name = map[int32]string{ - 0: "OPERATION_UNKNOWN", + 0: "OPERATION_UNSPECIFIED", 1: "GET", 2: "HEAD", 3: "PUT", @@ -86,14 +94,14 @@ var EACLRecord_Operation_name = map[int32]string{ } var EACLRecord_Operation_value = map[string]int32{ - "OPERATION_UNKNOWN": 0, - "GET": 1, - "HEAD": 2, - "PUT": 3, - "DELETE": 4, - "SEARCH": 5, - "GETRANGE": 6, - "GETRANGEHASH": 7, + "OPERATION_UNSPECIFIED": 0, + "GET": 1, + "HEAD": 2, + "PUT": 3, + "DELETE": 4, + "SEARCH": 5, + "GETRANGE": 6, + "GETRANGEHASH": 7, } func (x EACLRecord_Operation) String() string { @@ -108,21 +116,24 @@ func (EACLRecord_Operation) EnumDescriptor() ([]byte, []int) { type EACLRecord_Action int32 const ( - EACLRecord_ACTION_UNKNOWN EACLRecord_Action = 0 - EACLRecord_ALLOW EACLRecord_Action = 1 - EACLRecord_DENY EACLRecord_Action = 2 + // Unspecified action, default value. + EACLRecord_ACTION_UNSPECIFIED EACLRecord_Action = 0 + // Allow action + EACLRecord_ALLOW EACLRecord_Action = 1 + // Deny action + EACLRecord_DENY EACLRecord_Action = 2 ) var EACLRecord_Action_name = map[int32]string{ - 0: "ACTION_UNKNOWN", + 0: "ACTION_UNSPECIFIED", 1: "ALLOW", 2: "DENY", } var EACLRecord_Action_value = map[string]int32{ - "ACTION_UNKNOWN": 0, - "ALLOW": 1, - "DENY": 2, + "ACTION_UNSPECIFIED": 0, + "ALLOW": 1, + "DENY": 2, } func (x EACLRecord_Action) String() string { @@ -137,21 +148,24 @@ func (EACLRecord_Action) EnumDescriptor() ([]byte, []int) { type EACLRecord_FilterInfo_Header int32 const ( - EACLRecord_FilterInfo_HEADER_UNKNOWN EACLRecord_FilterInfo_Header = 0 - EACLRecord_FilterInfo_REQUEST EACLRecord_FilterInfo_Header = 1 - EACLRecord_FilterInfo_OBJECT EACLRecord_FilterInfo_Header = 2 + // Unspecified header, default value. + EACLRecord_FilterInfo_HEADER_UNSPECIFIED EACLRecord_FilterInfo_Header = 0 + // Filter request headers + EACLRecord_FilterInfo_REQUEST EACLRecord_FilterInfo_Header = 1 + // Filter object headers + EACLRecord_FilterInfo_OBJECT EACLRecord_FilterInfo_Header = 2 ) var EACLRecord_FilterInfo_Header_name = map[int32]string{ - 0: "HEADER_UNKNOWN", + 0: "HEADER_UNSPECIFIED", 1: "REQUEST", 2: "OBJECT", } var EACLRecord_FilterInfo_Header_value = map[string]int32{ - "HEADER_UNKNOWN": 0, - "REQUEST": 1, - "OBJECT": 2, + "HEADER_UNSPECIFIED": 0, + "REQUEST": 1, + "OBJECT": 2, } func (x EACLRecord_FilterInfo_Header) String() string { @@ -166,21 +180,24 @@ func (EACLRecord_FilterInfo_Header) EnumDescriptor() ([]byte, []int) { type EACLRecord_FilterInfo_MatchType int32 const ( - EACLRecord_FilterInfo_MATCH_UNKNOWN EACLRecord_FilterInfo_MatchType = 0 - EACLRecord_FilterInfo_STRING_EQUAL EACLRecord_FilterInfo_MatchType = 1 + // Unspecified match type, default value. + EACLRecord_FilterInfo_MATCH_TYPE_UNSPECIFIED EACLRecord_FilterInfo_MatchType = 0 + // Return true if strings are equal + EACLRecord_FilterInfo_STRING_EQUAL EACLRecord_FilterInfo_MatchType = 1 + // Return true if strings are different EACLRecord_FilterInfo_STRING_NOT_EQUAL EACLRecord_FilterInfo_MatchType = 2 ) var EACLRecord_FilterInfo_MatchType_name = map[int32]string{ - 0: "MATCH_UNKNOWN", + 0: "MATCH_TYPE_UNSPECIFIED", 1: "STRING_EQUAL", 2: "STRING_NOT_EQUAL", } var EACLRecord_FilterInfo_MatchType_value = map[string]int32{ - "MATCH_UNKNOWN": 0, - "STRING_EQUAL": 1, - "STRING_NOT_EQUAL": 2, + "MATCH_TYPE_UNSPECIFIED": 0, + "STRING_EQUAL": 1, + "STRING_NOT_EQUAL": 2, } func (x EACLRecord_FilterInfo_MatchType) String() string { @@ -243,14 +260,14 @@ func (m *EACLRecord) GetOperation() EACLRecord_Operation { if m != nil { return m.Operation } - return EACLRecord_OPERATION_UNKNOWN + return EACLRecord_OPERATION_UNSPECIFIED } func (m *EACLRecord) GetAction() EACLRecord_Action { if m != nil { return m.Action } - return EACLRecord_ACTION_UNKNOWN + return EACLRecord_ACTION_UNSPECIFIED } func (m *EACLRecord) GetFilters() []*EACLRecord_FilterInfo { @@ -319,14 +336,14 @@ func (m *EACLRecord_FilterInfo) GetHeader() EACLRecord_FilterInfo_Header { if m != nil { return m.Header } - return EACLRecord_FilterInfo_HEADER_UNKNOWN + return EACLRecord_FilterInfo_HEADER_UNSPECIFIED } func (m *EACLRecord_FilterInfo) GetMatchType() EACLRecord_FilterInfo_MatchType { if m != nil { return m.MatchType } - return EACLRecord_FilterInfo_MATCH_UNKNOWN + return EACLRecord_FilterInfo_MATCH_TYPE_UNSPECIFIED } func (m *EACLRecord_FilterInfo) GetHeaderName() string { @@ -391,7 +408,7 @@ func (m *EACLRecord_TargetInfo) GetTarget() Target { if m != nil { return m.Target } - return Target_UNKNOWN + return Target_TARGET_UNSPECIFIED } func (m *EACLRecord_TargetInfo) GetKeyList() [][]byte { @@ -475,50 +492,51 @@ func init() { func init() { proto.RegisterFile("v2/acl/types.proto", fileDescriptor_d237ab7979f0d6cf) } var fileDescriptor_d237ab7979f0d6cf = []byte{ - // 683 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xda, 0x40, - 0x10, 0x8e, 0x8d, 0x63, 0x60, 0x20, 0xd1, 0x66, 0xdb, 0x54, 0x24, 0x95, 0x10, 0xa2, 0x3d, 0xa0, - 0x46, 0x31, 0x2a, 0x51, 0xd5, 0x9e, 0x22, 0x39, 0xb0, 0x01, 0x12, 0x30, 0xc9, 0xda, 0x34, 0x4a, - 0x2f, 0xc8, 0x31, 0x4b, 0x82, 0x6a, 0x6c, 0x64, 0x3b, 0x48, 0xdc, 0xfa, 0x18, 0x7d, 0x86, 0x3e, - 0x49, 0x8f, 0xbd, 0xf6, 0x56, 0x25, 0x2f, 0x52, 0xad, 0x17, 0x82, 0x1b, 0x29, 0x6a, 0x4e, 0x3b, - 0xde, 0xf9, 0xbe, 0xf9, 0xf9, 0x66, 0xbc, 0x80, 0x67, 0xb5, 0xaa, 0xed, 0xb8, 0xd5, 0x68, 0x3e, - 0x65, 0xa1, 0x36, 0x0d, 0xfc, 0xc8, 0xc7, 0x1b, 0x1e, 0xf3, 0xb5, 0x51, 0xa8, 0xcd, 0x6a, 0x9a, - 0xed, 0xb8, 0xbb, 0x2f, 0x66, 0xb5, 0x6a, 0xc0, 0x46, 0x61, 0x12, 0x53, 0xbe, 0x57, 0x01, 0x88, - 0x5e, 0xef, 0x50, 0xe6, 0xf8, 0xc1, 0x10, 0xeb, 0x90, 0xf5, 0xa7, 0x2c, 0xb0, 0xa3, 0xb1, 0xef, - 0x15, 0xa4, 0x92, 0x54, 0xd9, 0xac, 0xbd, 0xd1, 0xfe, 0x09, 0xa3, 0xad, 0xd0, 0x5a, 0x6f, 0x09, - 0xa5, 0xd9, 0x07, 0x13, 0x7f, 0x02, 0xd5, 0x76, 0x62, 0xbe, 0x1c, 0xf3, 0x4b, 0x4f, 0xf3, 0xf5, - 0x18, 0x47, 0x55, 0x71, 0xe2, 0x43, 0x48, 0x8f, 0xc6, 0x6e, 0xc4, 0x82, 0xb0, 0x90, 0x2a, 0xa5, - 0x2a, 0xb9, 0xda, 0xdb, 0xa7, 0xa9, 0xc7, 0x31, 0xb0, 0xed, 0x8d, 0x7c, 0x9a, 0x16, 0x76, 0xc8, - 0xf9, 0x91, 0x1d, 0x5c, 0xb3, 0x28, 0x2c, 0x28, 0xff, 0xe3, 0x5b, 0x31, 0x50, 0xf0, 0x85, 0x1d, - 0xee, 0xfe, 0x96, 0x01, 0x56, 0x71, 0x71, 0x13, 0xd4, 0x1b, 0x66, 0x0f, 0x59, 0xb0, 0x10, 0x62, - 0xef, 0x39, 0xd5, 0x68, 0xad, 0x98, 0x42, 0x41, 0x9c, 0xd6, 0x7c, 0xca, 0x70, 0x17, 0x60, 0x62, - 0x47, 0xce, 0xcd, 0x80, 0x0b, 0xbf, 0x50, 0x45, 0x7b, 0x56, 0xb0, 0x2e, 0xa7, 0xf1, 0x18, 0x34, - 0xfb, 0x60, 0xe2, 0x1d, 0xc8, 0x89, 0xba, 0x06, 0x9e, 0x3d, 0x61, 0x85, 0x54, 0x49, 0xaa, 0x64, - 0xa9, 0x62, 0xd8, 0x13, 0xee, 0x82, 0x85, 0x6b, 0x66, 0xbb, 0x05, 0x25, 0xf6, 0xac, 0x7f, 0xb6, - 0xdd, 0x5b, 0x56, 0xfe, 0x00, 0xaa, 0x28, 0x09, 0x63, 0xd8, 0x6c, 0x11, 0xbd, 0x41, 0xe8, 0xa0, - 0x6f, 0x9c, 0x1a, 0xbd, 0x0b, 0x03, 0xad, 0xe1, 0x1c, 0xa4, 0x29, 0x39, 0xef, 0x13, 0xd3, 0x42, - 0x12, 0x06, 0x50, 0x7b, 0x47, 0x27, 0xa4, 0x6e, 0x21, 0xb9, 0x7c, 0x0c, 0x89, 0xcc, 0x5b, 0xb0, - 0xd1, 0xd5, 0xad, 0x7a, 0x2b, 0x41, 0x44, 0x90, 0x37, 0x2d, 0xda, 0x36, 0x9a, 0x03, 0x72, 0xde, - 0xd7, 0x3b, 0x48, 0xc2, 0x2f, 0x01, 0x2d, 0x6e, 0x8c, 0x9e, 0xb5, 0xb8, 0x95, 0x77, 0xcf, 0x01, - 0x56, 0x92, 0xe3, 0x3d, 0x50, 0xc5, 0xa4, 0x16, 0xd2, 0x6e, 0x3f, 0x52, 0x43, 0x40, 0xa9, 0x42, - 0x7d, 0x97, 0xe1, 0x57, 0x90, 0xf9, 0xca, 0xe6, 0x03, 0x77, 0x1c, 0x46, 0x05, 0xb9, 0x94, 0xaa, - 0xe4, 0xa9, 0x72, 0xca, 0xe6, 0x61, 0x79, 0x06, 0x89, 0xad, 0xdb, 0x86, 0xad, 0xde, 0x19, 0xa1, - 0xba, 0xd5, 0xee, 0x19, 0x89, 0xf2, 0xd2, 0x90, 0x6a, 0x12, 0xde, 0x53, 0x06, 0x14, 0xde, 0x34, - 0x92, 0xf9, 0xd5, 0x59, 0xdf, 0x42, 0x29, 0xde, 0x66, 0x83, 0x74, 0x88, 0x45, 0x90, 0xc2, 0x6d, - 0x93, 0xe8, 0xb4, 0xde, 0x42, 0xeb, 0x38, 0x0f, 0x99, 0x26, 0xb1, 0xa8, 0x6e, 0x34, 0x09, 0x52, - 0x79, 0x83, 0xcb, 0xaf, 0x96, 0x6e, 0xb6, 0x50, 0xba, 0xfc, 0x1e, 0x96, 0x0b, 0x8b, 0x61, 0x53, - 0xaf, 0x3f, 0xca, 0x98, 0x85, 0x75, 0xbd, 0xd3, 0xe9, 0x5d, 0x88, 0x9c, 0x0d, 0x62, 0x5c, 0x22, - 0xb9, 0xfc, 0x4d, 0x82, 0x2c, 0x9f, 0xb0, 0x65, 0x5f, 0xb9, 0x0c, 0x1f, 0x42, 0xde, 0xf1, 0xbd, - 0xc8, 0x1e, 0x7b, 0x2c, 0x18, 0x8c, 0x87, 0xb1, 0x06, 0xb9, 0xda, 0xeb, 0x84, 0x06, 0xfc, 0x37, - 0xd5, 0xea, 0x4b, 0x4c, 0xbb, 0x41, 0x73, 0x89, 0x0f, 0x7c, 0x00, 0xe9, 0x20, 0x5e, 0x95, 0x30, - 0xd6, 0x23, 0x57, 0xdb, 0x79, 0x72, 0x99, 0x68, 0x5a, 0x9c, 0xe1, 0xbb, 0x8f, 0xa0, 0x0a, 0x55, - 0xf9, 0xac, 0x57, 0xe5, 0x66, 0x40, 0xe9, 0x9b, 0x84, 0x8a, 0xa9, 0x9b, 0x97, 0xa6, 0x45, 0xba, - 0x48, 0x8e, 0x37, 0xc0, 0x6a, 0x11, 0x6a, 0xa2, 0xd4, 0xd1, 0xc9, 0xcf, 0xbb, 0xa2, 0xf4, 0xeb, - 0xae, 0x28, 0xfd, 0xb9, 0x2b, 0x4a, 0xdf, 0xef, 0x8b, 0x6b, 0x5f, 0x2a, 0xd7, 0xe3, 0xe8, 0xe6, - 0xf6, 0x4a, 0x73, 0xfc, 0x49, 0xd5, 0x0b, 0xa7, 0x8e, 0xb3, 0x3f, 0x64, 0xb3, 0xaa, 0xc7, 0xfc, - 0x51, 0xb8, 0x6f, 0x4f, 0xc7, 0xfb, 0xd7, 0x7e, 0x55, 0xbc, 0x46, 0x3f, 0xe4, 0x0d, 0x83, 0xf9, - 0xc7, 0xa6, 0xa6, 0x9f, 0xb5, 0x35, 0xdd, 0x71, 0xaf, 0xd4, 0xf8, 0xd1, 0x39, 0xf8, 0x1b, 0x00, - 0x00, 0xff, 0xff, 0x60, 0xb0, 0x68, 0x1a, 0xae, 0x04, 0x00, 0x00, + // 703 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xda, 0x3c, + 0x18, 0x6d, 0x42, 0x1a, 0xe0, 0x83, 0xff, 0x97, 0xe5, 0xad, 0x88, 0x32, 0x09, 0x21, 0xb6, 0x0b, + 0xb4, 0xae, 0x41, 0xa2, 0x9a, 0xb4, 0x69, 0x52, 0xa5, 0x14, 0x5c, 0x60, 0x83, 0x00, 0x8e, 0xd9, + 0xd4, 0xdd, 0xa0, 0x34, 0x98, 0x16, 0x2d, 0x24, 0x28, 0x49, 0x91, 0xd8, 0xd5, 0x1e, 0x63, 0xcf, + 0xb0, 0x27, 0xd9, 0xe5, 0x1e, 0x61, 0xea, 0xa4, 0x3d, 0xc3, 0x2e, 0x27, 0x27, 0xd0, 0x32, 0xb4, + 0x6a, 0xbd, 0xf2, 0x17, 0xfb, 0x9c, 0xcf, 0xc7, 0xc7, 0x27, 0x06, 0xbc, 0xa8, 0x55, 0x2d, 0xdb, + 0xa9, 0x86, 0xcb, 0x39, 0x0f, 0xb4, 0xb9, 0xef, 0x85, 0x1e, 0xfe, 0xcf, 0xe5, 0x9e, 0x36, 0x09, + 0xb4, 0x45, 0x4d, 0xb3, 0x6c, 0xa7, 0xf0, 0x60, 0x51, 0xab, 0xfa, 0x7c, 0x12, 0x6c, 0x62, 0xca, + 0xbf, 0x54, 0x00, 0xa2, 0xd7, 0x3b, 0x94, 0xdb, 0x9e, 0x3f, 0xc6, 0x3a, 0xa4, 0xbd, 0x39, 0xf7, + 0xad, 0x70, 0xea, 0xb9, 0x79, 0xa9, 0x24, 0x55, 0xfe, 0xaf, 0x3d, 0xd6, 0xfe, 0x68, 0xa3, 0xdd, + 0xa2, 0xb5, 0xde, 0x1a, 0x4a, 0xd3, 0x37, 0x25, 0x7e, 0x01, 0xaa, 0x65, 0x47, 0x7c, 0x39, 0xe2, + 0x97, 0xee, 0xe6, 0xeb, 0x11, 0x8e, 0xaa, 0xf1, 0x88, 0x8f, 0x21, 0x39, 0x99, 0x3a, 0x21, 0xf7, + 0x83, 0x7c, 0xa2, 0x94, 0xa8, 0x64, 0x6a, 0x4f, 0xee, 0xa6, 0x9e, 0x46, 0xc0, 0xb6, 0x3b, 0xf1, + 0x68, 0x32, 0xae, 0x03, 0xc1, 0x0f, 0x2d, 0xff, 0x82, 0x87, 0x41, 0x5e, 0xf9, 0x17, 0x9f, 0x45, + 0xc0, 0x98, 0x1f, 0xd7, 0x41, 0xe1, 0xa7, 0x0c, 0x70, 0xdb, 0x17, 0x37, 0x41, 0xbd, 0xe4, 0xd6, + 0x98, 0xfb, 0x2b, 0x23, 0x0e, 0xee, 0xa3, 0x46, 0x6b, 0x45, 0x14, 0x0a, 0xf1, 0xc8, 0x96, 0x73, + 0x8e, 0xbb, 0x00, 0x33, 0x2b, 0xb4, 0x2f, 0x47, 0xc2, 0xf8, 0x95, 0x2b, 0xda, 0xbd, 0x9a, 0x75, + 0x05, 0x4d, 0xf4, 0xa0, 0xe9, 0x9b, 0x12, 0xef, 0x43, 0x26, 0xd6, 0x35, 0x72, 0xad, 0x19, 0xcf, + 0x27, 0x4a, 0x52, 0x25, 0x4d, 0x15, 0xc3, 0x9a, 0x89, 0x25, 0x58, 0x2d, 0x2d, 0x2c, 0x27, 0xaf, + 0x44, 0x2b, 0xbb, 0x6f, 0x2d, 0xe7, 0x8a, 0x97, 0x5f, 0x82, 0x1a, 0x4b, 0xc2, 0x39, 0xc0, 0x2d, + 0xa2, 0x37, 0x08, 0x1d, 0x0d, 0x0d, 0xb3, 0x4f, 0xea, 0xed, 0xd3, 0x36, 0x69, 0xa0, 0x1d, 0x9c, + 0x81, 0x24, 0x25, 0x83, 0x21, 0x31, 0x19, 0x92, 0x30, 0x80, 0xda, 0x3b, 0x79, 0x4d, 0xea, 0x0c, + 0xc9, 0xe5, 0x1e, 0x6c, 0xec, 0x5e, 0x80, 0x5c, 0x57, 0x67, 0xf5, 0xd6, 0x88, 0x9d, 0xf5, 0xc9, + 0x56, 0x07, 0x04, 0x59, 0x93, 0xd1, 0xb6, 0xd1, 0x1c, 0x91, 0xc1, 0x50, 0xef, 0x20, 0x09, 0x3f, + 0x04, 0xb4, 0x9a, 0x31, 0x7a, 0x6c, 0x35, 0x2b, 0x17, 0x06, 0x00, 0xb7, 0xfe, 0xe3, 0x03, 0x50, + 0xe3, 0x6b, 0x5b, 0xf9, 0xbc, 0xb7, 0x65, 0x4d, 0x0c, 0xa5, 0x0a, 0xf5, 0x1c, 0x8e, 0x73, 0x90, + 0xfa, 0xc0, 0x97, 0x23, 0x67, 0x1a, 0x84, 0x79, 0xb9, 0x94, 0xa8, 0x64, 0xa9, 0xf2, 0x86, 0x2f, + 0x83, 0xf2, 0x47, 0xd8, 0x88, 0xe0, 0x3e, 0xec, 0xf5, 0xfa, 0x84, 0xea, 0xac, 0xdd, 0x33, 0xb6, + 0x24, 0x26, 0x21, 0xd1, 0x24, 0xe2, 0x80, 0x29, 0x50, 0x84, 0x0b, 0x48, 0x16, 0x53, 0xfd, 0x21, + 0x43, 0x09, 0x71, 0xe6, 0x06, 0xe9, 0x10, 0x46, 0x90, 0x22, 0x6a, 0x93, 0xe8, 0xb4, 0xde, 0x42, + 0xbb, 0x38, 0x0b, 0xa9, 0x26, 0x61, 0x54, 0x37, 0x9a, 0x04, 0xa9, 0xe2, 0x90, 0xeb, 0xaf, 0x96, + 0x6e, 0xb6, 0x50, 0xb2, 0xfc, 0x1c, 0xd6, 0x09, 0xce, 0x01, 0xd6, 0xeb, 0x7f, 0xd9, 0x35, 0x0d, + 0xbb, 0x7a, 0xa7, 0xd3, 0x7b, 0x17, 0xef, 0xdb, 0x20, 0xc6, 0x19, 0x92, 0xcb, 0x9f, 0x24, 0x48, + 0x8b, 0x6b, 0x67, 0xd6, 0xb9, 0xc3, 0xf1, 0x31, 0x64, 0x6d, 0xcf, 0x0d, 0xad, 0xa9, 0xcb, 0xfd, + 0xd1, 0x74, 0x1c, 0x79, 0x91, 0xa9, 0x3d, 0xda, 0xf0, 0x42, 0xfc, 0xbb, 0x5a, 0x7d, 0x8d, 0x69, + 0x37, 0x68, 0x66, 0xe3, 0x03, 0x1f, 0x41, 0xd2, 0x8f, 0xf2, 0x13, 0x44, 0xbe, 0x64, 0x6a, 0xfb, + 0x77, 0x26, 0x8c, 0x26, 0xe3, 0x31, 0x78, 0x7a, 0x02, 0x6a, 0xec, 0xae, 0x50, 0xce, 0x74, 0xda, + 0x24, 0x6c, 0x4b, 0x79, 0x0a, 0x94, 0xa1, 0x49, 0x68, 0x9c, 0x08, 0xf3, 0xcc, 0x64, 0xa4, 0x8b, + 0xe4, 0x28, 0x1d, 0xac, 0x45, 0xa8, 0x89, 0x12, 0x27, 0x83, 0xaf, 0xd7, 0x45, 0xe9, 0xdb, 0x75, + 0x51, 0xfa, 0x7e, 0x5d, 0x94, 0x3e, 0xff, 0x28, 0xee, 0xbc, 0x7f, 0x76, 0x31, 0x0d, 0x2f, 0xaf, + 0xce, 0x35, 0xdb, 0x9b, 0x55, 0xdd, 0x60, 0x6e, 0xdb, 0x87, 0x63, 0xbe, 0xa8, 0xba, 0xdc, 0x9b, + 0x04, 0x87, 0xd6, 0x7c, 0x7a, 0x78, 0xe1, 0x55, 0xe3, 0xd7, 0xea, 0x95, 0x65, 0x3b, 0x5f, 0x64, + 0x64, 0x70, 0xef, 0xd4, 0xd4, 0xf4, 0x7e, 0x5b, 0x48, 0xd5, 0x6d, 0xe7, 0x5c, 0x8d, 0xde, 0xa6, + 0xa3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x0d, 0x90, 0x3a, 0xd5, 0x04, 0x00, 0x00, } func (m *EACLRecord) Marshal() (dAtA []byte, err error) { diff --git a/v2/container/service.pb.go b/v2/container/service.pb.go index 2c7861d4..50a93478 100644 --- a/v2/container/service.pb.go +++ b/v2/container/service.pb.go @@ -29,6 +29,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +// New NeoFS Container creation request type PutRequest struct { // Body of container put request message. Body *PutRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -98,6 +99,7 @@ func (m *PutRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type PutRequest_Body struct { // Container to create in NeoFS. Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` @@ -165,6 +167,7 @@ func (m *PutRequest_Body) GetSignature() []byte { return nil } +// New NeoFS Container creation response type PutResponse struct { // Body of container put response message. Body *PutResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -234,6 +237,7 @@ func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type PutResponse_Body struct { // container_id carries identifier of the new container. ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -282,6 +286,7 @@ func (m *PutResponse_Body) GetContainerId() *refs.ContainerID { return nil } +// Container removal request type DeleteRequest struct { // Body of container delete request message. Body *DeleteRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -351,6 +356,7 @@ func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type DeleteRequest_Body struct { // container_id carries identifier of the container to delete // from NeoFS. @@ -480,6 +486,7 @@ func (m *DeleteResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type DeleteResponse_Body struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -519,6 +526,7 @@ func (m *DeleteResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteResponse_Body proto.InternalMessageInfo +// Get container structure type GetRequest struct { // Body of container get request message. Body *GetRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -588,6 +596,7 @@ func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type GetRequest_Body struct { // container_id carries identifier of the container to get. ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -636,6 +645,7 @@ func (m *GetRequest_Body) GetContainerId() *refs.ContainerID { return nil } +// Get container structure type GetResponse struct { // Body of container get response message. Body *GetResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -705,6 +715,7 @@ func (m *GetResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type GetResponse_Body struct { // Container that has been requested. Container *Container `protobuf:"bytes,1,opt,name=container,proto3" json:"container,omitempty"` @@ -753,6 +764,7 @@ func (m *GetResponse_Body) GetContainer() *Container { return nil } +// List containers type ListRequest struct { // Body of list containers request message. Body *ListRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -822,6 +834,7 @@ func (m *ListRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type ListRequest_Body struct { // owner_id carries identifier of the container owner. OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` @@ -870,6 +883,7 @@ func (m *ListRequest_Body) GetOwnerId() *refs.OwnerID { return nil } +// List containers type ListResponse struct { // Body of list containers response message. Body *ListResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -939,6 +953,7 @@ func (m *ListResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type ListResponse_Body struct { // ContainerIDs carries list of identifiers of the containers that belong to the owner. ContainerIds []*refs.ContainerID `protobuf:"bytes,1,rep,name=container_ids,json=containerIds,proto3" json:"container_ids,omitempty"` @@ -987,6 +1002,7 @@ func (m *ListResponse_Body) GetContainerIds() []*refs.ContainerID { return nil } +// Set Extended ACL type SetExtendedACLRequest struct { // Body of set extended acl request message. Body *SetExtendedACLRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1056,6 +1072,7 @@ func (m *SetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHe return nil } +// Request body type SetExtendedACLRequest_Body struct { // Extended ACL to set for the container. Eacl *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` @@ -1113,6 +1130,7 @@ func (m *SetExtendedACLRequest_Body) GetSignature() []byte { return nil } +// Set Extended ACL type SetExtendedACLResponse struct { // Body of set extended acl response message. Body *SetExtendedACLResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1182,6 +1200,7 @@ func (m *SetExtendedACLResponse) GetVerifyHeader() *service.ResponseVerification return nil } +// Response body type SetExtendedACLResponse_Body struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1221,6 +1240,7 @@ func (m *SetExtendedACLResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_SetExtendedACLResponse_Body proto.InternalMessageInfo +// Get Extended ACL type GetExtendedACLRequest struct { // Body of get extended acl request message. Body *GetExtendedACLRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1290,6 +1310,7 @@ func (m *GetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHe return nil } +// Request body type GetExtendedACLRequest_Body struct { // container_id carries identifier of the container that has Extended ACL. ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -1338,6 +1359,7 @@ func (m *GetExtendedACLRequest_Body) GetContainerId() *refs.ContainerID { return nil } +// Get Extended ACL type GetExtendedACLResponse struct { // Body of get extended acl response message. Body *GetExtendedACLResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1407,6 +1429,7 @@ func (m *GetExtendedACLResponse) GetVerifyHeader() *service.ResponseVerification return nil } +// Response body type GetExtendedACLResponse_Body struct { // Extended ACL that has been requested if it was set up. Eacl *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` @@ -1494,59 +1517,60 @@ func init() { func init() { proto.RegisterFile("v2/container/service.proto", fileDescriptor_6e23291a5a71033a) } var fileDescriptor_6e23291a5a71033a = []byte{ - // 823 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0xc1, 0x52, 0xd3, 0x5c, - 0x14, 0xc7, 0xbf, 0x84, 0x0e, 0x7c, 0x9c, 0x16, 0x16, 0x97, 0x01, 0x3a, 0x51, 0x6b, 0x8d, 0xa2, - 0x8c, 0xd2, 0xc4, 0x89, 0x1b, 0x45, 0xc6, 0x11, 0x5a, 0x08, 0x1d, 0x50, 0x21, 0x38, 0x2c, 0xdc, - 0x30, 0x69, 0x72, 0x0a, 0x19, 0x4b, 0x52, 0x9b, 0x34, 0xd8, 0xa5, 0xbe, 0x82, 0x1b, 0x57, 0xae, - 0x1d, 0xc6, 0x85, 0x4f, 0xe0, 0xda, 0x71, 0x1c, 0xc7, 0x47, 0x70, 0xd0, 0x27, 0xf0, 0x09, 0x9c, - 0x26, 0x69, 0x93, 0x60, 0x4a, 0x5a, 0xa6, 0x2e, 0xb2, 0x6b, 0x6f, 0xce, 0x39, 0xf7, 0x9c, 0xdf, - 0xfc, 0xcf, 0x3d, 0x37, 0x01, 0xc6, 0x16, 0x78, 0xc5, 0xd0, 0x2d, 0x59, 0xd3, 0xb1, 0xc1, 0x9b, - 0xd8, 0xb0, 0x35, 0x05, 0xb9, 0x7a, 0xc3, 0xb0, 0x0c, 0x32, 0xa5, 0xa3, 0xc1, 0x55, 0x4d, 0xce, - 0x16, 0xb8, 0xae, 0x09, 0x43, 0x6c, 0x81, 0x97, 0x95, 0x1a, 0x6f, 0xb5, 0xea, 0x68, 0xba, 0x86, - 0x4c, 0x36, 0x14, 0x24, 0xf8, 0x64, 0xca, 0x16, 0xf8, 0x06, 0x56, 0xcd, 0xd0, 0xe2, 0xb4, 0x2d, - 0x74, 0x76, 0xe2, 0x0f, 0xd1, 0x92, 0xbd, 0xe5, 0xd9, 0xc0, 0xb2, 0x8d, 0x0d, 0xad, 0xda, 0x72, - 0x1f, 0xb0, 0xbf, 0x68, 0x80, 0xad, 0xa6, 0x25, 0xe1, 0x8b, 0x26, 0x9a, 0x16, 0xb9, 0x0b, 0xa9, - 0x8a, 0xa1, 0xb6, 0xb2, 0x54, 0x9e, 0x9a, 0x4f, 0x0b, 0xd7, 0xb8, 0x88, 0x2c, 0x39, 0xdf, 0x9c, - 0x5b, 0x31, 0xd4, 0x96, 0xe4, 0x78, 0x90, 0x55, 0x48, 0xb7, 0xf7, 0xdb, 0x3b, 0x40, 0x59, 0xc5, - 0x46, 0x96, 0xfe, 0x2b, 0x40, 0xa7, 0x7e, 0xcf, 0xf7, 0x11, 0x5a, 0xf2, 0xba, 0x63, 0x2b, 0xc1, - 0x61, 0xf7, 0x37, 0xd9, 0x86, 0x09, 0x37, 0xbf, 0x4e, 0xa0, 0x11, 0x27, 0xd0, 0x42, 0xef, 0x40, - 0xbb, 0x6d, 0x73, 0x4d, 0x91, 0x2d, 0xcd, 0xd0, 0xbd, 0x80, 0x19, 0x37, 0x84, 0xfb, 0x8f, 0x79, - 0x45, 0x41, 0xaa, 0x9d, 0x28, 0x59, 0x82, 0xf1, 0x6e, 0x15, 0x5e, 0x85, 0xb9, 0xc8, 0x0a, 0x8b, - 0x9d, 0x5f, 0x92, 0xef, 0x40, 0x2e, 0x01, 0xd4, 0x9b, 0x95, 0x9a, 0xa6, 0xec, 0x3d, 0xc7, 0x96, - 0x53, 0x5f, 0x46, 0x1a, 0x77, 0x57, 0x36, 0xb0, 0x45, 0x2e, 0xc2, 0xb8, 0xa9, 0xed, 0xeb, 0xb2, - 0xd5, 0x6c, 0xa0, 0x93, 0x74, 0x46, 0xf2, 0x17, 0xd8, 0x0f, 0x34, 0xa4, 0x1d, 0x6e, 0x66, 0xdd, - 0xd0, 0x4d, 0x24, 0xf7, 0x42, 0x9c, 0xe7, 0x7a, 0x73, 0x76, 0xed, 0x83, 0xa0, 0xd7, 0xa2, 0x40, - 0xcf, 0x45, 0xf2, 0x71, 0x9d, 0x7b, 0x90, 0x96, 0xa2, 0x49, 0x17, 0xce, 0x88, 0x14, 0x8b, 0x7a, - 0xcd, 0x23, 0xfd, 0x00, 0x32, 0xdd, 0x3a, 0xf6, 0x34, 0xd5, 0x2b, 0xf3, 0x42, 0x20, 0x74, 0x5b, - 0xb8, 0x3e, 0xe7, 0x72, 0x49, 0x4a, 0x77, 0x1d, 0xca, 0x2a, 0xfb, 0x95, 0x86, 0x89, 0x12, 0xd6, - 0xd0, 0xc2, 0x8e, 0x30, 0xef, 0x87, 0x80, 0xdd, 0x88, 0x04, 0x16, 0xf2, 0x48, 0x86, 0x36, 0xd5, - 0xe1, 0x00, 0x0b, 0xab, 0x8f, 0x3e, 0xad, 0xbe, 0xdf, 0x14, 0x4c, 0x76, 0xe0, 0x78, 0x02, 0x5c, - 0x0a, 0xf1, 0x9c, 0x3f, 0x93, 0x67, 0xb2, 0x34, 0x38, 0xea, 0x22, 0x65, 0xdf, 0xd3, 0x00, 0x22, - 0x0e, 0x74, 0xb2, 0xf9, 0xe6, 0xc9, 0x50, 0xcf, 0xb0, 0xda, 0xed, 0x98, 0x86, 0xb4, 0x53, 0xfb, - 0x00, 0xa7, 0x53, 0xc0, 0x3e, 0x29, 0xca, 0x28, 0x0d, 0x63, 0x0e, 0xb0, 0xef, 0x68, 0x48, 0x6f, - 0x6a, 0x66, 0x57, 0x58, 0xfd, 0xc0, 0x0a, 0xd8, 0x27, 0x43, 0x59, 0x8b, 0x1e, 0x2a, 0x01, 0xfe, - 0x37, 0x8e, 0x42, 0xaa, 0x9a, 0x3d, 0xad, 0xaa, 0x27, 0x47, 0xae, 0xa2, 0xc6, 0x1c, 0xc3, 0xb2, - 0xca, 0x7e, 0xa4, 0x21, 0xe3, 0x16, 0xec, 0xc9, 0x69, 0x31, 0x44, 0xe8, 0xfa, 0x19, 0x84, 0x92, - 0xa5, 0xa7, 0x75, 0x0f, 0xd2, 0x43, 0x98, 0x08, 0xb6, 0x9f, 0x99, 0xa5, 0xf2, 0x23, 0x71, 0xfd, - 0x97, 0x09, 0xf4, 0x9f, 0xc9, 0x7e, 0xa1, 0x61, 0x7a, 0x07, 0xad, 0xd5, 0x97, 0x16, 0xea, 0x2a, - 0xaa, 0xcb, 0xc5, 0xcd, 0x8e, 0xba, 0x8a, 0x21, 0x76, 0x7c, 0x24, 0xbb, 0x48, 0xcf, 0x64, 0xe8, - 0x4c, 0xf2, 0x10, 0x2e, 0x40, 0x0a, 0x65, 0xa5, 0xe6, 0x95, 0x99, 0x0d, 0x44, 0x94, 0x95, 0x1a, - 0xb7, 0xba, 0x5c, 0xdc, 0x7c, 0x2a, 0x57, 0x6a, 0x28, 0x39, 0x56, 0x31, 0xd3, 0xee, 0x35, 0x0d, - 0x33, 0xa7, 0x91, 0x78, 0x4a, 0x2c, 0x85, 0x68, 0xde, 0xee, 0x8b, 0x66, 0x32, 0xa7, 0xdf, 0x27, - 0x1a, 0xa6, 0xc5, 0x73, 0x2b, 0x4a, 0x4c, 0xae, 0xa2, 0x86, 0x35, 0x13, 0xbf, 0xd1, 0x30, 0x23, - 0x9e, 0x5f, 0x45, 0x62, 0xa2, 0x55, 0xf4, 0x0f, 0xda, 0x52, 0x78, 0x93, 0x82, 0xb1, 0x1d, 0x37, - 0x11, 0xb2, 0x0e, 0x23, 0x5b, 0x4d, 0x8b, 0x5c, 0x8e, 0x79, 0xbf, 0x64, 0xf2, 0x71, 0x2f, 0x46, - 0x64, 0x1b, 0x46, 0xdd, 0x6b, 0x2a, 0x61, 0xe3, 0xdf, 0x09, 0x98, 0xab, 0x7d, 0xdc, 0x73, 0xdb, - 0xc9, 0x89, 0xd8, 0x2b, 0x39, 0xff, 0x8a, 0xd8, 0x23, 0xb9, 0xe0, 0x3d, 0x6a, 0x03, 0x52, 0xed, - 0xb9, 0x46, 0xf2, 0x71, 0x97, 0x02, 0xe6, 0x4a, 0xec, 0x50, 0x24, 0x1a, 0x4c, 0x86, 0x8f, 0x26, - 0x72, 0xb3, 0xff, 0x69, 0xc0, 0xdc, 0x1a, 0xe0, 0xac, 0x6b, 0x6f, 0x25, 0xf6, 0xb3, 0x95, 0x38, - 0xc0, 0x56, 0xd1, 0x0d, 0xb1, 0xb2, 0xfb, 0xf9, 0x24, 0x47, 0x7d, 0x3f, 0xc9, 0x51, 0x3f, 0x4e, - 0x72, 0xd4, 0xdb, 0x9f, 0xb9, 0xff, 0x9e, 0x71, 0xfb, 0x9a, 0x75, 0xd0, 0xac, 0x70, 0x8a, 0x71, - 0xc8, 0xeb, 0x66, 0x5d, 0x51, 0x0a, 0x2a, 0xda, 0xbc, 0x8e, 0x46, 0xd5, 0x2c, 0xc8, 0x75, 0xad, - 0xb0, 0x6f, 0xf0, 0xc1, 0x4f, 0x22, 0xc7, 0xf4, 0xd4, 0x63, 0x34, 0xd6, 0x76, 0xb8, 0xe5, 0xad, - 0xb2, 0xdf, 0xcd, 0x95, 0x51, 0xe7, 0xf3, 0xc6, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbb, - 0x23, 0x10, 0x87, 0x84, 0x11, 0x00, 0x00, + // 833 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0xcd, 0x6e, 0xd3, 0x58, + 0x14, 0xc7, 0xc7, 0x6e, 0xd4, 0x99, 0x9e, 0xa4, 0xd5, 0xe8, 0x56, 0x6d, 0x23, 0xcf, 0x4c, 0x26, + 0xe3, 0x99, 0x0e, 0x15, 0x34, 0x36, 0x32, 0x9b, 0xd2, 0x56, 0x88, 0x36, 0x69, 0xdd, 0xa8, 0x05, + 0x5a, 0x17, 0xb1, 0x60, 0x53, 0x39, 0xf6, 0x49, 0x6b, 0x91, 0xda, 0x21, 0x76, 0x5c, 0xb2, 0x84, + 0xa7, 0x60, 0x81, 0x58, 0xa3, 0x8a, 0x05, 0x4f, 0xc0, 0x1a, 0x21, 0x84, 0x78, 0x04, 0x54, 0x78, + 0x02, 0x9e, 0x00, 0xf9, 0x23, 0x8e, 0x5d, 0x9c, 0x3a, 0xa9, 0xc2, 0xc2, 0x3b, 0xe7, 0xe6, 0x9c, + 0x73, 0xcf, 0xf9, 0xe9, 0x7f, 0xee, 0xb9, 0x36, 0x30, 0xb6, 0xc0, 0x2b, 0x86, 0x6e, 0xc9, 0x9a, + 0x8e, 0x2d, 0xde, 0xc4, 0x96, 0xad, 0x29, 0xc8, 0x35, 0x5b, 0x86, 0x65, 0x90, 0x69, 0x1d, 0x0d, + 0xae, 0x6e, 0x72, 0xb6, 0xc0, 0x05, 0x26, 0x0c, 0xb1, 0x05, 0x5e, 0x56, 0x1a, 0xbc, 0xd5, 0x69, + 0xa2, 0xe9, 0x19, 0x32, 0xf9, 0x48, 0x90, 0xf0, 0x3f, 0xd3, 0xb6, 0xc0, 0xb7, 0xb0, 0x6e, 0x46, + 0x16, 0x67, 0x6c, 0xa1, 0xbb, 0x13, 0x7f, 0x8c, 0x96, 0xec, 0x2f, 0xcf, 0x85, 0x96, 0x6d, 0x6c, + 0x69, 0xf5, 0x8e, 0xf7, 0x07, 0xfb, 0x95, 0x06, 0xd8, 0x6d, 0x5b, 0x12, 0x3e, 0x6e, 0xa3, 0x69, + 0x91, 0x25, 0xc8, 0xd4, 0x0c, 0xb5, 0x93, 0xa7, 0x8a, 0xd4, 0x42, 0x56, 0xf8, 0x8f, 0x8b, 0xc9, + 0x92, 0xeb, 0x99, 0x73, 0xeb, 0x86, 0xda, 0x91, 0x5c, 0x0f, 0xb2, 0x01, 0x59, 0x67, 0xbf, 0x83, + 0x23, 0x94, 0x55, 0x6c, 0xe5, 0xe9, 0x1f, 0x02, 0x74, 0xeb, 0xf7, 0x7d, 0xef, 0xa0, 0x25, 0x6f, + 0xb9, 0xb6, 0x12, 0x1c, 0x07, 0xcf, 0x64, 0x0f, 0x26, 0xbd, 0xfc, 0xba, 0x81, 0xc6, 0xdc, 0x40, + 0x8b, 0xfd, 0x03, 0x3d, 0x70, 0xcc, 0x35, 0x45, 0xb6, 0x34, 0x43, 0xf7, 0x03, 0xe6, 0xbc, 0x10, + 0xde, 0x2f, 0xe6, 0x29, 0x05, 0x19, 0x27, 0x51, 0xb2, 0x0a, 0x13, 0x41, 0x15, 0x7e, 0x85, 0x85, + 0xd8, 0x0a, 0xcb, 0xdd, 0x27, 0xa9, 0xe7, 0x40, 0xfe, 0x02, 0x68, 0xb6, 0x6b, 0x0d, 0x4d, 0x39, + 0x78, 0x84, 0x1d, 0xb7, 0xbe, 0x9c, 0x34, 0xe1, 0xad, 0x6c, 0x63, 0x87, 0xfc, 0x09, 0x13, 0xa6, + 0x76, 0xa8, 0xcb, 0x56, 0xbb, 0x85, 0x6e, 0xd2, 0x39, 0xa9, 0xb7, 0xc0, 0xbe, 0xa6, 0x21, 0xeb, + 0x72, 0x33, 0x9b, 0x86, 0x6e, 0x22, 0xb9, 0x19, 0xe1, 0x3c, 0xdf, 0x9f, 0xb3, 0x67, 0x1f, 0x06, + 0xbd, 0x19, 0x07, 0x7a, 0x3e, 0x96, 0x8f, 0xe7, 0xdc, 0x87, 0xb4, 0x14, 0x4f, 0xba, 0x74, 0x41, + 0xa4, 0x44, 0xd4, 0x9b, 0x3e, 0xe9, 0x5b, 0x90, 0x0b, 0xea, 0x38, 0xd0, 0x54, 0xbf, 0xcc, 0x3f, + 0x42, 0xa1, 0x1d, 0xe1, 0xf6, 0x38, 0x57, 0x2b, 0x52, 0x36, 0x70, 0xa8, 0xaa, 0xec, 0x07, 0x1a, + 0x26, 0x2b, 0xd8, 0x40, 0x0b, 0xbb, 0xc2, 0x5c, 0x89, 0x00, 0xbb, 0x12, 0x0b, 0x2c, 0xe2, 0x91, + 0x0e, 0x6d, 0xaa, 0xa3, 0x01, 0x16, 0x55, 0x1f, 0x7d, 0x5e, 0x7d, 0xdf, 0x28, 0x98, 0xea, 0xc2, + 0xf1, 0x05, 0xb8, 0x1a, 0xe1, 0xb9, 0x70, 0x21, 0xcf, 0x74, 0x69, 0x70, 0xdc, 0x43, 0xca, 0xbe, + 0xa2, 0x01, 0x44, 0x1c, 0xea, 0x64, 0xeb, 0x99, 0xa7, 0x43, 0x3d, 0xa3, 0x6a, 0xb7, 0x53, 0x1a, + 0xb2, 0x6e, 0xed, 0x43, 0x9c, 0x4e, 0x21, 0xfb, 0xb4, 0x28, 0xa3, 0x32, 0x8a, 0x39, 0xc0, 0xbe, + 0xa4, 0x21, 0xbb, 0xa3, 0x99, 0x81, 0xb0, 0x06, 0x81, 0x15, 0xb2, 0x4f, 0x87, 0xb2, 0x96, 0x7d, + 0x54, 0x02, 0xfc, 0x66, 0x9c, 0x44, 0x54, 0x35, 0x77, 0x5e, 0x55, 0xf7, 0x4e, 0x3c, 0x45, 0xfd, + 0xea, 0x1a, 0x56, 0x55, 0xf6, 0x0d, 0x0d, 0x39, 0xaf, 0x60, 0x5f, 0x4e, 0xcb, 0x11, 0x42, 0xff, + 0x5f, 0x40, 0x28, 0x5d, 0x7a, 0xda, 0xf2, 0x21, 0xdd, 0x86, 0xc9, 0x70, 0xfb, 0x99, 0x79, 0xaa, + 0x38, 0x96, 0xd4, 0x7f, 0xb9, 0x50, 0xff, 0x99, 0xec, 0x7b, 0x1a, 0x66, 0xf6, 0xd1, 0xda, 0x78, + 0x62, 0xa1, 0xae, 0xa2, 0xba, 0x56, 0xde, 0xe9, 0xaa, 0xab, 0x1c, 0x61, 0xc7, 0xc7, 0xb2, 0x8b, + 0xf5, 0x4c, 0x87, 0xce, 0x24, 0x1f, 0xe1, 0x22, 0x64, 0x50, 0x56, 0x1a, 0x7e, 0x99, 0xf9, 0x50, + 0x44, 0x59, 0x69, 0x70, 0x1b, 0x6b, 0xe5, 0x9d, 0xfb, 0x72, 0xad, 0x81, 0x92, 0x6b, 0x95, 0x30, + 0xed, 0x9e, 0xd1, 0x30, 0x7b, 0x1e, 0x89, 0xaf, 0xc4, 0x4a, 0x84, 0xe6, 0xf5, 0x81, 0x68, 0xa6, + 0x73, 0xfa, 0xbd, 0xa5, 0x61, 0x46, 0xbc, 0xb4, 0xa2, 0xc4, 0xf4, 0x2a, 0x6a, 0x54, 0x33, 0xf1, + 0x23, 0x0d, 0xb3, 0xe2, 0xe5, 0x55, 0x24, 0xa6, 0x5a, 0x45, 0x3f, 0xa1, 0x2d, 0x85, 0x17, 0x19, + 0xf8, 0x3d, 0xa0, 0xbd, 0xef, 0x65, 0x44, 0xb6, 0x60, 0x6c, 0xb7, 0x6d, 0x91, 0xbf, 0x13, 0x5e, + 0x34, 0x99, 0x62, 0xd2, 0x1b, 0x12, 0xd9, 0x83, 0x71, 0xef, 0xbe, 0x4a, 0xd8, 0xe4, 0x97, 0x03, + 0xe6, 0xdf, 0x01, 0x2e, 0xbc, 0x4e, 0x72, 0x22, 0xf6, 0x4b, 0xae, 0x77, 0x57, 0xec, 0x93, 0x5c, + 0xf8, 0x42, 0xb5, 0x0d, 0x19, 0x67, 0xc0, 0x91, 0x62, 0xd2, 0xed, 0x80, 0xf9, 0x27, 0x71, 0x3a, + 0x12, 0x0d, 0xa6, 0xa2, 0x67, 0x14, 0xb9, 0x3a, 0xf8, 0x58, 0x60, 0xae, 0x0d, 0x71, 0xe8, 0x39, + 0x5b, 0x89, 0x83, 0x6c, 0x25, 0x0e, 0xb1, 0x55, 0x7c, 0x67, 0xac, 0x2b, 0xef, 0xce, 0x0a, 0xd4, + 0xa7, 0xb3, 0x02, 0xf5, 0xf9, 0xac, 0x40, 0x3d, 0xff, 0x52, 0xf8, 0xe5, 0xe1, 0xd2, 0xa1, 0x66, + 0x1d, 0xb5, 0x6b, 0x9c, 0x62, 0x1c, 0xf3, 0xba, 0xd9, 0x54, 0x94, 0x92, 0x8a, 0x36, 0xaf, 0xa3, + 0x51, 0x37, 0x4b, 0x72, 0x53, 0x2b, 0x1d, 0x1a, 0x7c, 0xf8, 0xdb, 0xc8, 0x4a, 0xf0, 0x74, 0x4a, + 0xcf, 0xde, 0x45, 0x63, 0x73, 0x9f, 0x5b, 0xdb, 0xad, 0x3a, 0x7b, 0x07, 0xaa, 0xab, 0x8d, 0xbb, + 0x1f, 0x3d, 0x6e, 0x7c, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x12, 0xb4, 0xb7, 0x71, 0x9a, 0x11, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1557,10 +1581,10 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// ServiceClient is the client API for Service service. +// ContainerServiceClient is the client API for ContainerService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type ServiceClient interface { +type ContainerServiceClient interface { // Put invokes 'Put' method in container smart-contract and returns // response immediately. After new block in morph chain, request is verified // by inner ring nodes. After one more block in morph chain, container @@ -1585,70 +1609,70 @@ type ServiceClient interface { GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc.CallOption) (*GetExtendedACLResponse, error) } -type serviceClient struct { +type containerServiceClient struct { cc *grpc.ClientConn } -func NewServiceClient(cc *grpc.ClientConn) ServiceClient { - return &serviceClient{cc} +func NewContainerServiceClient(cc *grpc.ClientConn) ContainerServiceClient { + return &containerServiceClient{cc} } -func (c *serviceClient) Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) { +func (c *containerServiceClient) Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) { out := new(PutResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/Put", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Put", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { +func (c *containerServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { out := new(DeleteResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/Delete", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Delete", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) { +func (c *containerServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) { out := new(GetResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/Get", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Get", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { +func (c *containerServiceClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { out := new(ListResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/List", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/List", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc.CallOption) (*SetExtendedACLResponse, error) { +func (c *containerServiceClient) SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc.CallOption) (*SetExtendedACLResponse, error) { out := new(SetExtendedACLResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/SetExtendedACL", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/SetExtendedACL", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc.CallOption) (*GetExtendedACLResponse, error) { +func (c *containerServiceClient) GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc.CallOption) (*GetExtendedACLResponse, error) { out := new(GetExtendedACLResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.container.Service/GetExtendedACL", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/GetExtendedACL", in, out, opts...) if err != nil { return nil, err } return out, nil } -// ServiceServer is the server API for Service service. -type ServiceServer interface { +// ContainerServiceServer is the server API for ContainerService service. +type ContainerServiceServer interface { // Put invokes 'Put' method in container smart-contract and returns // response immediately. After new block in morph chain, request is verified // by inner ring nodes. After one more block in morph chain, container @@ -1673,168 +1697,168 @@ type ServiceServer interface { GetExtendedACL(context.Context, *GetExtendedACLRequest) (*GetExtendedACLResponse, error) } -// UnimplementedServiceServer can be embedded to have forward compatible implementations. -type UnimplementedServiceServer struct { +// UnimplementedContainerServiceServer can be embedded to have forward compatible implementations. +type UnimplementedContainerServiceServer struct { } -func (*UnimplementedServiceServer) Put(ctx context.Context, req *PutRequest) (*PutResponse, error) { +func (*UnimplementedContainerServiceServer) Put(ctx context.Context, req *PutRequest) (*PutResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Put not implemented") } -func (*UnimplementedServiceServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { +func (*UnimplementedContainerServiceServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") } -func (*UnimplementedServiceServer) Get(ctx context.Context, req *GetRequest) (*GetResponse, error) { +func (*UnimplementedContainerServiceServer) Get(ctx context.Context, req *GetRequest) (*GetResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Get not implemented") } -func (*UnimplementedServiceServer) List(ctx context.Context, req *ListRequest) (*ListResponse, error) { +func (*UnimplementedContainerServiceServer) List(ctx context.Context, req *ListRequest) (*ListResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method List not implemented") } -func (*UnimplementedServiceServer) SetExtendedACL(ctx context.Context, req *SetExtendedACLRequest) (*SetExtendedACLResponse, error) { +func (*UnimplementedContainerServiceServer) SetExtendedACL(ctx context.Context, req *SetExtendedACLRequest) (*SetExtendedACLResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SetExtendedACL not implemented") } -func (*UnimplementedServiceServer) GetExtendedACL(ctx context.Context, req *GetExtendedACLRequest) (*GetExtendedACLResponse, error) { +func (*UnimplementedContainerServiceServer) GetExtendedACL(ctx context.Context, req *GetExtendedACLRequest) (*GetExtendedACLResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExtendedACL not implemented") } -func RegisterServiceServer(s *grpc.Server, srv ServiceServer) { - s.RegisterService(&_Service_serviceDesc, srv) +func RegisterContainerServiceServer(s *grpc.Server, srv ContainerServiceServer) { + s.RegisterService(&_ContainerService_serviceDesc, srv) } -func _Service_Put_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Put_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(PutRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).Put(ctx, in) + return srv.(ContainerServiceServer).Put(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/Put", + FullMethod: "/neo.fs.v2.container.ContainerService/Put", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).Put(ctx, req.(*PutRequest)) + return srv.(ContainerServiceServer).Put(ctx, req.(*PutRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).Delete(ctx, in) + return srv.(ContainerServiceServer).Delete(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/Delete", + FullMethod: "/neo.fs.v2.container.ContainerService/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).Delete(ctx, req.(*DeleteRequest)) + return srv.(ContainerServiceServer).Delete(ctx, req.(*DeleteRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).Get(ctx, in) + return srv.(ContainerServiceServer).Get(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/Get", + FullMethod: "/neo.fs.v2.container.ContainerService/Get", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).Get(ctx, req.(*GetRequest)) + return srv.(ContainerServiceServer).Get(ctx, req.(*GetRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).List(ctx, in) + return srv.(ContainerServiceServer).List(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/List", + FullMethod: "/neo.fs.v2.container.ContainerService/List", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).List(ctx, req.(*ListRequest)) + return srv.(ContainerServiceServer).List(ctx, req.(*ListRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_SetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_SetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(SetExtendedACLRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).SetExtendedACL(ctx, in) + return srv.(ContainerServiceServer).SetExtendedACL(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/SetExtendedACL", + FullMethod: "/neo.fs.v2.container.ContainerService/SetExtendedACL", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).SetExtendedACL(ctx, req.(*SetExtendedACLRequest)) + return srv.(ContainerServiceServer).SetExtendedACL(ctx, req.(*SetExtendedACLRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_GetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_GetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExtendedACLRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).GetExtendedACL(ctx, in) + return srv.(ContainerServiceServer).GetExtendedACL(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.container.Service/GetExtendedACL", + FullMethod: "/neo.fs.v2.container.ContainerService/GetExtendedACL", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).GetExtendedACL(ctx, req.(*GetExtendedACLRequest)) + return srv.(ContainerServiceServer).GetExtendedACL(ctx, req.(*GetExtendedACLRequest)) } return interceptor(ctx, in, info, handler) } -var _Service_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neo.fs.v2.container.Service", - HandlerType: (*ServiceServer)(nil), +var _ContainerService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neo.fs.v2.container.ContainerService", + HandlerType: (*ContainerServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Put", - Handler: _Service_Put_Handler, + Handler: _ContainerService_Put_Handler, }, { MethodName: "Delete", - Handler: _Service_Delete_Handler, + Handler: _ContainerService_Delete_Handler, }, { MethodName: "Get", - Handler: _Service_Get_Handler, + Handler: _ContainerService_Get_Handler, }, { MethodName: "List", - Handler: _Service_List_Handler, + Handler: _ContainerService_List_Handler, }, { MethodName: "SetExtendedACL", - Handler: _Service_SetExtendedACL_Handler, + Handler: _ContainerService_SetExtendedACL_Handler, }, { MethodName: "GetExtendedACL", - Handler: _Service_GetExtendedACL_Handler, + Handler: _ContainerService_GetExtendedACL_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/v2/container/types.pb.go b/v2/container/types.pb.go index 50a0a36d..175aeeb4 100644 --- a/v2/container/types.pb.go +++ b/v2/container/types.pb.go @@ -38,11 +38,11 @@ type Container struct { BasicAcl uint32 `protobuf:"varint,3,opt,name=basic_acl,json=basicAcl,proto3" json:"basic_acl,omitempty"` // Attributes define any immutable characteristics of container. Attributes []*Container_Attribute `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"` - // Rules define storage policy for the object inside the container. - Rules *netmap.PlacementRule `protobuf:"bytes,5,opt,name=rules,proto3" json:"rules,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Placement policy for the object inside the container. + PlacementPolicy *netmap.PlacementPolicy `protobuf:"bytes,5,opt,name=placement_policy,json=placementPolicy,proto3" json:"placement_policy,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Container) Reset() { *m = Container{} } @@ -106,9 +106,9 @@ func (m *Container) GetAttributes() []*Container_Attribute { return nil } -func (m *Container) GetRules() *netmap.PlacementRule { +func (m *Container) GetPlacementPolicy() *netmap.PlacementPolicy { if m != nil { - return m.Rules + return m.PlacementPolicy } return nil } @@ -179,29 +179,30 @@ func init() { func init() { proto.RegisterFile("v2/container/types.proto", fileDescriptor_ece71f25e6ae314e) } var fileDescriptor_ece71f25e6ae314e = []byte{ - // 345 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xd1, 0x4a, 0xc3, 0x30, - 0x14, 0x86, 0xed, 0xe6, 0x74, 0xcd, 0x14, 0xa4, 0x53, 0x2c, 0x13, 0x6a, 0xf1, 0xaa, 0x37, 0x4b, - 0x20, 0xc3, 0x07, 0x98, 0x8a, 0xb8, 0x1b, 0x1d, 0x11, 0xbc, 0xf0, 0x66, 0xa4, 0xd9, 0xd9, 0x2c, - 0x76, 0x49, 0x69, 0xd2, 0xca, 0xde, 0xc4, 0x47, 0x10, 0x9f, 0xc4, 0x4b, 0x1f, 0x41, 0xe6, 0x8b, - 0x48, 0x5b, 0xb6, 0xf5, 0xc2, 0xbb, 0x9c, 0x93, 0xff, 0x3f, 0x39, 0x5f, 0x7e, 0xe4, 0xe6, 0x94, - 0x08, 0x25, 0x0d, 0x8f, 0x24, 0xa4, 0xc4, 0x2c, 0x13, 0xd0, 0x38, 0x49, 0x95, 0x51, 0x4e, 0x57, - 0x82, 0xc2, 0x33, 0x8d, 0x73, 0x8a, 0x37, 0x82, 0xde, 0x49, 0x4e, 0x89, 0x04, 0xb3, 0xe0, 0x49, - 0x5d, 0xdb, 0xeb, 0xe6, 0x94, 0xa4, 0x30, 0xd3, 0xf5, 0xe6, 0xc5, 0x47, 0x03, 0xd9, 0xd7, 0x6b, - 0xa7, 0x43, 0x51, 0x5b, 0xbd, 0x49, 0x48, 0x27, 0xd1, 0xd4, 0xb5, 0x7c, 0x2b, 0xe8, 0xd0, 0x53, - 0xbc, 0x7d, 0xa1, 0x30, 0xe3, 0x87, 0xe2, 0x7e, 0x74, 0xc3, 0xf6, 0x4b, 0xe1, 0x68, 0xea, 0x1c, - 0xa3, 0x96, 0x54, 0x52, 0x80, 0xdb, 0xf0, 0xad, 0xe0, 0x80, 0x55, 0x85, 0x73, 0x86, 0xec, 0x90, - 0xeb, 0x48, 0x4c, 0xb8, 0x88, 0xdd, 0xa6, 0x6f, 0x05, 0x87, 0xac, 0x5d, 0x36, 0x86, 0x22, 0x76, - 0xee, 0x10, 0xe2, 0xc6, 0xa4, 0x51, 0x98, 0x19, 0xd0, 0xee, 0xae, 0xdf, 0x0c, 0x3a, 0x34, 0xc0, - 0xff, 0xa0, 0xe0, 0xcd, 0x6a, 0x78, 0xb8, 0x36, 0xb0, 0x9a, 0xd7, 0xb9, 0x44, 0xad, 0x34, 0x8b, - 0x41, 0xbb, 0xad, 0x72, 0xdb, 0xf3, 0xda, 0x90, 0xea, 0x07, 0xf0, 0x38, 0xe6, 0x02, 0x16, 0x20, - 0x0d, 0xcb, 0x62, 0x60, 0x95, 0xba, 0x37, 0x40, 0xf6, 0x66, 0x9e, 0x73, 0x84, 0x9a, 0xaf, 0xb0, - 0x2c, 0x79, 0x6d, 0x56, 0x1c, 0x0b, 0xa4, 0x9c, 0xc7, 0x59, 0x85, 0x64, 0xb3, 0xaa, 0xb8, 0x7a, - 0xfa, 0x5a, 0x79, 0xd6, 0xf7, 0xca, 0xb3, 0x7e, 0x56, 0x9e, 0xf5, 0xfe, 0xeb, 0xed, 0x3c, 0xe3, - 0x79, 0x64, 0x5e, 0xb2, 0x10, 0x0b, 0xb5, 0x20, 0x52, 0x27, 0x42, 0xf4, 0xa7, 0x90, 0x13, 0x09, - 0x6a, 0xa6, 0xfb, 0x3c, 0x89, 0xfa, 0x73, 0x45, 0xea, 0xc9, 0x7d, 0x36, 0xba, 0xf7, 0xa0, 0x6e, - 0x1f, 0xf1, 0x70, 0x3c, 0xda, 0x92, 0x85, 0x7b, 0x65, 0x12, 0x83, 0xbf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xde, 0x82, 0x60, 0x33, 0xe6, 0x01, 0x00, 0x00, + // 357 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcd, 0x4a, 0xc3, 0x40, + 0x10, 0x36, 0xad, 0xd5, 0x66, 0xab, 0x58, 0x52, 0x7f, 0x42, 0x85, 0x10, 0x3d, 0xe5, 0xd2, 0x0d, + 0xa4, 0x17, 0xc1, 0x53, 0x55, 0xc4, 0x82, 0x68, 0x89, 0x37, 0x2f, 0x65, 0xb3, 0x9d, 0xd6, 0xc5, + 0x74, 0x77, 0xc9, 0x6e, 0x23, 0x7d, 0x13, 0x9f, 0xc1, 0x97, 0xf0, 0xea, 0xd1, 0x47, 0x90, 0xfa, + 0x22, 0x92, 0x84, 0xc6, 0x08, 0xde, 0x66, 0xbe, 0xfd, 0xbe, 0x9d, 0xef, 0x9b, 0x41, 0x76, 0x1a, + 0xf8, 0x54, 0x70, 0x4d, 0x18, 0x87, 0xc4, 0xd7, 0x4b, 0x09, 0x0a, 0xcb, 0x44, 0x68, 0x61, 0x75, + 0x38, 0x08, 0x3c, 0x55, 0x38, 0x0d, 0x70, 0x49, 0xe8, 0x1e, 0xa4, 0x81, 0xcf, 0x41, 0xcf, 0x89, + 0xac, 0x72, 0xbb, 0x9d, 0x34, 0xf0, 0x13, 0x98, 0xaa, 0x2a, 0x78, 0xfa, 0x5e, 0x43, 0xe6, 0xe5, + 0x5a, 0x69, 0x05, 0xa8, 0x29, 0x5e, 0x38, 0x24, 0x63, 0x36, 0xb1, 0x0d, 0xd7, 0xf0, 0x5a, 0xc1, + 0x11, 0xfe, 0x9d, 0x90, 0x89, 0xf1, 0x7d, 0xf6, 0x3e, 0xbc, 0x0a, 0xb7, 0x73, 0xe2, 0x70, 0x62, + 0xed, 0xa3, 0x06, 0x17, 0x9c, 0x82, 0x5d, 0x73, 0x0d, 0x6f, 0x27, 0x2c, 0x1a, 0xeb, 0x18, 0x99, + 0x11, 0x51, 0x8c, 0x8e, 0x09, 0x8d, 0xed, 0xba, 0x6b, 0x78, 0xbb, 0x61, 0x33, 0x07, 0x06, 0x34, + 0xb6, 0x6e, 0x10, 0x22, 0x5a, 0x27, 0x2c, 0x5a, 0x68, 0x50, 0xf6, 0xa6, 0x5b, 0xf7, 0x5a, 0x81, + 0x87, 0xff, 0x89, 0x82, 0x4b, 0x6b, 0x78, 0xb0, 0x16, 0x84, 0x15, 0xad, 0x75, 0x8b, 0xda, 0x32, + 0x26, 0x14, 0xe6, 0xc0, 0xf5, 0x58, 0x8a, 0x98, 0xd1, 0xa5, 0xdd, 0xc8, 0x8d, 0x9f, 0x54, 0xfe, + 0x2b, 0x96, 0x81, 0x47, 0x6b, 0xe6, 0x28, 0x27, 0x86, 0x7b, 0xf2, 0x2f, 0xd0, 0xed, 0x23, 0xb3, + 0x1c, 0x63, 0xb5, 0x51, 0xfd, 0x19, 0x96, 0xf9, 0x1a, 0xcc, 0x30, 0x2b, 0xb3, 0xa4, 0x29, 0x89, + 0x17, 0x45, 0x52, 0x33, 0x2c, 0x9a, 0x0b, 0xfa, 0xb1, 0x72, 0x8c, 0xcf, 0x95, 0x63, 0x7c, 0xad, + 0x1c, 0xe3, 0xf5, 0xdb, 0xd9, 0x78, 0x3c, 0x9b, 0x31, 0xfd, 0xb4, 0x88, 0x30, 0x15, 0x73, 0x9f, + 0x2b, 0x49, 0x69, 0x6f, 0x02, 0xa9, 0xcf, 0x41, 0x4c, 0x55, 0x8f, 0x48, 0xd6, 0x9b, 0x09, 0xbf, + 0x7a, 0xd0, 0xf3, 0xb2, 0x7a, 0xab, 0x1d, 0xde, 0x81, 0xb8, 0x7e, 0xc0, 0x83, 0xd1, 0x30, 0xf3, + 0x5d, 0xa6, 0x8f, 0xb6, 0xf2, 0x6b, 0xf5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0xf7, 0x99, + 0x45, 0x0a, 0x02, 0x00, 0x00, } func (m *Container) Marshal() (dAtA []byte, err error) { @@ -228,9 +229,9 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Rules != nil { + if m.PlacementPolicy != nil { { - size, err := m.Rules.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PlacementPolicy.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -356,8 +357,8 @@ func (m *Container) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } - if m.Rules != nil { - l = m.Rules.Size() + if m.PlacementPolicy != nil { + l = m.PlacementPolicy.Size() n += 1 + l + sovTypes(uint64(l)) } if m.XXX_unrecognized != nil { @@ -546,7 +547,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Rules", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PlacementPolicy", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -573,10 +574,10 @@ func (m *Container) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Rules == nil { - m.Rules = &netmap.PlacementRule{} + if m.PlacementPolicy == nil { + m.PlacementPolicy = &netmap.PlacementPolicy{} } - if err := m.Rules.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PlacementPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/v2/netmap/types.pb.go b/v2/netmap/types.pb.go index 84e68fc8..bfc2e9e4 100644 --- a/v2/netmap/types.pb.go +++ b/v2/netmap/types.pb.go @@ -22,22 +22,32 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type PlacementRule_SFGroup_Filter_SimpleFilter_Operation int32 +// Filtering operation +type PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation int32 const ( - PlacementRule_SFGroup_Filter_SimpleFilter_NP PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 0 - PlacementRule_SFGroup_Filter_SimpleFilter_EQ PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 1 - PlacementRule_SFGroup_Filter_SimpleFilter_NE PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 2 - PlacementRule_SFGroup_Filter_SimpleFilter_GT PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 3 - PlacementRule_SFGroup_Filter_SimpleFilter_GE PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 4 - PlacementRule_SFGroup_Filter_SimpleFilter_LT PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 5 - PlacementRule_SFGroup_Filter_SimpleFilter_LE PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 6 - PlacementRule_SFGroup_Filter_SimpleFilter_OR PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 7 - PlacementRule_SFGroup_Filter_SimpleFilter_AND PlacementRule_SFGroup_Filter_SimpleFilter_Operation = 8 + // No Operation defined + PlacementPolicy_FilterGroup_Filter_SimpleFilter_OPERATION_UNSPECIFIED PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 0 + // Equal + PlacementPolicy_FilterGroup_Filter_SimpleFilter_EQ PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 1 + // Not Equal + PlacementPolicy_FilterGroup_Filter_SimpleFilter_NE PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 2 + // Greater then + PlacementPolicy_FilterGroup_Filter_SimpleFilter_GT PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 3 + // Greater or equal + PlacementPolicy_FilterGroup_Filter_SimpleFilter_GE PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 4 + // Less then + PlacementPolicy_FilterGroup_Filter_SimpleFilter_LT PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 5 + // Less or equal + PlacementPolicy_FilterGroup_Filter_SimpleFilter_LE PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 6 + // Logical OR + PlacementPolicy_FilterGroup_Filter_SimpleFilter_OR PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 7 + // Logical AND + PlacementPolicy_FilterGroup_Filter_SimpleFilter_AND PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation = 8 ) -var PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name = map[int32]string{ - 0: "NP", +var PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation_name = map[int32]string{ + 0: "OPERATION_UNSPECIFIED", 1: "EQ", 2: "NE", 3: "GT", @@ -48,32 +58,32 @@ var PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name = map[int32]string{ 8: "AND", } -var PlacementRule_SFGroup_Filter_SimpleFilter_Operation_value = map[string]int32{ - "NP": 0, - "EQ": 1, - "NE": 2, - "GT": 3, - "GE": 4, - "LT": 5, - "LE": 6, - "OR": 7, - "AND": 8, +var PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation_value = map[string]int32{ + "OPERATION_UNSPECIFIED": 0, + "EQ": 1, + "NE": 2, + "GT": 3, + "GE": 4, + "LT": 5, + "LE": 6, + "OR": 7, + "AND": 8, } -func (x PlacementRule_SFGroup_Filter_SimpleFilter_Operation) String() string { - return proto.EnumName(PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name, int32(x)) +func (x PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation) String() string { + return proto.EnumName(PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation_name, int32(x)) } -func (PlacementRule_SFGroup_Filter_SimpleFilter_Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 1, 0} +func (PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0, 0} } // Represents the enumeration of various states of the NeoFS node. type NodeInfo_State int32 const ( - // Undefined state. - NodeInfo_UNKNOWN NodeInfo_State = 0 + // Unknown state. + NodeInfo_UNSPECIFIED NodeInfo_State = 0 // Active state in the network. NodeInfo_ONLINE NodeInfo_State = 1 // Network unavailable state. @@ -81,15 +91,15 @@ const ( ) var NodeInfo_State_name = map[int32]string{ - 0: "UNKNOWN", + 0: "UNSPECIFIED", 1: "ONLINE", 2: "OFFLINE", } var NodeInfo_State_value = map[string]int32{ - "UNKNOWN": 0, - "ONLINE": 1, - "OFFLINE": 2, + "UNSPECIFIED": 0, + "ONLINE": 1, + "OFFLINE": 2, } func (x NodeInfo_State) String() string { @@ -100,26 +110,29 @@ func (NodeInfo_State) EnumDescriptor() ([]byte, []int) { return fileDescriptor_1207dc80bd67ddec, []int{1, 0} } -type PlacementRule struct { - ReplFactor uint32 `protobuf:"varint,1,opt,name=repl_factor,json=replFactor,proto3" json:"repl_factor,omitempty"` - SfGroups []*PlacementRule_SFGroup `protobuf:"bytes,2,rep,name=sf_groups,json=sfGroups,proto3" json:"sf_groups,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// Set of rules to select a subset of nodes able to store container's objects +type PlacementPolicy struct { + // Replication factor + ReplFactor uint32 `protobuf:"varint,1,opt,name=repl_factor,json=replFactor,proto3" json:"repl_factor,omitempty"` + // List of filter groups + FilterGroups []*PlacementPolicy_FilterGroup `protobuf:"bytes,2,rep,name=filter_groups,json=filterGroups,proto3" json:"filter_groups,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PlacementRule) Reset() { *m = PlacementRule{} } -func (m *PlacementRule) String() string { return proto.CompactTextString(m) } -func (*PlacementRule) ProtoMessage() {} -func (*PlacementRule) Descriptor() ([]byte, []int) { +func (m *PlacementPolicy) Reset() { *m = PlacementPolicy{} } +func (m *PlacementPolicy) String() string { return proto.CompactTextString(m) } +func (*PlacementPolicy) ProtoMessage() {} +func (*PlacementPolicy) Descriptor() ([]byte, []int) { return fileDescriptor_1207dc80bd67ddec, []int{0} } -func (m *PlacementRule) XXX_Unmarshal(b []byte) error { +func (m *PlacementPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PlacementRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *PlacementPolicy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PlacementRule.Marshal(b, m, deterministic) + return xxx_messageInfo_PlacementPolicy.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -129,53 +142,57 @@ func (m *PlacementRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (m *PlacementRule) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule.Merge(m, src) +func (m *PlacementPolicy) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy.Merge(m, src) } -func (m *PlacementRule) XXX_Size() int { +func (m *PlacementPolicy) XXX_Size() int { return m.Size() } -func (m *PlacementRule) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule.DiscardUnknown(m) +func (m *PlacementPolicy) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy.DiscardUnknown(m) } -var xxx_messageInfo_PlacementRule proto.InternalMessageInfo +var xxx_messageInfo_PlacementPolicy proto.InternalMessageInfo -func (m *PlacementRule) GetReplFactor() uint32 { +func (m *PlacementPolicy) GetReplFactor() uint32 { if m != nil { return m.ReplFactor } return 0 } -func (m *PlacementRule) GetSfGroups() []*PlacementRule_SFGroup { +func (m *PlacementPolicy) GetFilterGroups() []*PlacementPolicy_FilterGroup { if m != nil { - return m.SfGroups + return m.FilterGroups } return nil } -type PlacementRule_SFGroup struct { - Filters []*PlacementRule_SFGroup_Filter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"` - Selectors []*PlacementRule_SFGroup_Selector `protobuf:"bytes,2,rep,name=selectors,proto3" json:"selectors,omitempty"` - Exclude []uint32 `protobuf:"varint,3,rep,packed,name=exclude,proto3" json:"exclude,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// Filters to apply to Network Map +type PlacementPolicy_FilterGroup struct { + // Resulting filter list + Filters []*PlacementPolicy_FilterGroup_Filter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"` + // List of selectors + Selectors []*PlacementPolicy_FilterGroup_Selector `protobuf:"bytes,2,rep,name=selectors,proto3" json:"selectors,omitempty"` + // Parts of graph to exclude. Internal use. + Exclude []uint32 `protobuf:"varint,3,rep,packed,name=exclude,proto3" json:"exclude,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PlacementRule_SFGroup) Reset() { *m = PlacementRule_SFGroup{} } -func (m *PlacementRule_SFGroup) String() string { return proto.CompactTextString(m) } -func (*PlacementRule_SFGroup) ProtoMessage() {} -func (*PlacementRule_SFGroup) Descriptor() ([]byte, []int) { +func (m *PlacementPolicy_FilterGroup) Reset() { *m = PlacementPolicy_FilterGroup{} } +func (m *PlacementPolicy_FilterGroup) String() string { return proto.CompactTextString(m) } +func (*PlacementPolicy_FilterGroup) ProtoMessage() {} +func (*PlacementPolicy_FilterGroup) Descriptor() ([]byte, []int) { return fileDescriptor_1207dc80bd67ddec, []int{0, 0} } -func (m *PlacementRule_SFGroup) XXX_Unmarshal(b []byte) error { +func (m *PlacementPolicy_FilterGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PlacementRule_SFGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *PlacementPolicy_FilterGroup) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PlacementRule_SFGroup.Marshal(b, m, deterministic) + return xxx_messageInfo_PlacementPolicy_FilterGroup.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -185,59 +202,62 @@ func (m *PlacementRule_SFGroup) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (m *PlacementRule_SFGroup) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule_SFGroup.Merge(m, src) +func (m *PlacementPolicy_FilterGroup) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy_FilterGroup.Merge(m, src) } -func (m *PlacementRule_SFGroup) XXX_Size() int { +func (m *PlacementPolicy_FilterGroup) XXX_Size() int { return m.Size() } -func (m *PlacementRule_SFGroup) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule_SFGroup.DiscardUnknown(m) +func (m *PlacementPolicy_FilterGroup) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy_FilterGroup.DiscardUnknown(m) } -var xxx_messageInfo_PlacementRule_SFGroup proto.InternalMessageInfo +var xxx_messageInfo_PlacementPolicy_FilterGroup proto.InternalMessageInfo -func (m *PlacementRule_SFGroup) GetFilters() []*PlacementRule_SFGroup_Filter { +func (m *PlacementPolicy_FilterGroup) GetFilters() []*PlacementPolicy_FilterGroup_Filter { if m != nil { return m.Filters } return nil } -func (m *PlacementRule_SFGroup) GetSelectors() []*PlacementRule_SFGroup_Selector { +func (m *PlacementPolicy_FilterGroup) GetSelectors() []*PlacementPolicy_FilterGroup_Selector { if m != nil { return m.Selectors } return nil } -func (m *PlacementRule_SFGroup) GetExclude() []uint32 { +func (m *PlacementPolicy_FilterGroup) GetExclude() []uint32 { if m != nil { return m.Exclude } return nil } -type PlacementRule_SFGroup_Filter struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - F *PlacementRule_SFGroup_Filter_SimpleFilter `protobuf:"bytes,2,opt,name=f,proto3" json:"f,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// Filter definition +type PlacementPolicy_FilterGroup_Filter struct { + // Filter identifier + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + // The rest of filter + F *PlacementPolicy_FilterGroup_Filter_SimpleFilter `protobuf:"bytes,2,opt,name=f,proto3" json:"f,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PlacementRule_SFGroup_Filter) Reset() { *m = PlacementRule_SFGroup_Filter{} } -func (m *PlacementRule_SFGroup_Filter) String() string { return proto.CompactTextString(m) } -func (*PlacementRule_SFGroup_Filter) ProtoMessage() {} -func (*PlacementRule_SFGroup_Filter) Descriptor() ([]byte, []int) { +func (m *PlacementPolicy_FilterGroup_Filter) Reset() { *m = PlacementPolicy_FilterGroup_Filter{} } +func (m *PlacementPolicy_FilterGroup_Filter) String() string { return proto.CompactTextString(m) } +func (*PlacementPolicy_FilterGroup_Filter) ProtoMessage() {} +func (*PlacementPolicy_FilterGroup_Filter) Descriptor() ([]byte, []int) { return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0} } -func (m *PlacementRule_SFGroup_Filter) XXX_Unmarshal(b []byte) error { +func (m *PlacementPolicy_FilterGroup_Filter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PlacementRule_SFGroup_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *PlacementPolicy_FilterGroup_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PlacementRule_SFGroup_Filter.Marshal(b, m, deterministic) + return xxx_messageInfo_PlacementPolicy_FilterGroup_Filter.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -247,55 +267,63 @@ func (m *PlacementRule_SFGroup_Filter) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *PlacementRule_SFGroup_Filter) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule_SFGroup_Filter.Merge(m, src) +func (m *PlacementPolicy_FilterGroup_Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter.Merge(m, src) } -func (m *PlacementRule_SFGroup_Filter) XXX_Size() int { +func (m *PlacementPolicy_FilterGroup_Filter) XXX_Size() int { return m.Size() } -func (m *PlacementRule_SFGroup_Filter) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule_SFGroup_Filter.DiscardUnknown(m) +func (m *PlacementPolicy_FilterGroup_Filter) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter.DiscardUnknown(m) } -var xxx_messageInfo_PlacementRule_SFGroup_Filter proto.InternalMessageInfo +var xxx_messageInfo_PlacementPolicy_FilterGroup_Filter proto.InternalMessageInfo -func (m *PlacementRule_SFGroup_Filter) GetKey() string { +func (m *PlacementPolicy_FilterGroup_Filter) GetKey() string { if m != nil { return m.Key } return "" } -func (m *PlacementRule_SFGroup_Filter) GetF() *PlacementRule_SFGroup_Filter_SimpleFilter { +func (m *PlacementPolicy_FilterGroup_Filter) GetF() *PlacementPolicy_FilterGroup_Filter_SimpleFilter { if m != nil { return m.F } return nil } -type PlacementRule_SFGroup_Filter_SimpleFilters struct { - Filters []*PlacementRule_SFGroup_Filter_SimpleFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// Minimal simple filter +type PlacementPolicy_FilterGroup_Filter_SimpleFilter struct { + // Filtering operation + Op PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation `protobuf:"varint,1,opt,name=op,proto3,enum=neo.fs.v2.netmap.PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation" json:"op,omitempty"` + // Filtering operation argument + // + // Types that are valid to be assigned to Args: + // *PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value + // *PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs + Args isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args `protobuf_oneof:"args"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Reset() { - *m = PlacementRule_SFGroup_Filter_SimpleFilters{} +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) Reset() { + *m = PlacementPolicy_FilterGroup_Filter_SimpleFilter{} } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) String() string { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) String() string { return proto.CompactTextString(m) } -func (*PlacementRule_SFGroup_Filter_SimpleFilters) ProtoMessage() {} -func (*PlacementRule_SFGroup_Filter_SimpleFilters) Descriptor() ([]byte, []int) { +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter) ProtoMessage() {} +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter) Descriptor() ([]byte, []int) { return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0} } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Unmarshal(b []byte) error { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilters.Marshal(b, m, deterministic) + return xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -305,147 +333,97 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Marshal(b []byte, deter return b[:n], nil } } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilters.Merge(m, src) +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter.Merge(m, src) } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Size() int { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_Size() int { return m.Size() } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilters.DiscardUnknown(m) +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter.DiscardUnknown(m) } -var xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilters proto.InternalMessageInfo +var xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter proto.InternalMessageInfo -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) GetFilters() []*PlacementRule_SFGroup_Filter_SimpleFilter { - if m != nil { - return m.Filters - } - return nil -} - -type PlacementRule_SFGroup_Filter_SimpleFilter struct { - Op PlacementRule_SFGroup_Filter_SimpleFilter_Operation `protobuf:"varint,1,opt,name=op,proto3,enum=neo.fs.v2.netmap.PlacementRule_SFGroup_Filter_SimpleFilter_Operation" json:"op,omitempty"` - // Types that are valid to be assigned to Args: - // *PlacementRule_SFGroup_Filter_SimpleFilter_Value - // *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs - Args isPlacementRule_SFGroup_Filter_SimpleFilter_Args `protobuf_oneof:"args"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) Reset() { - *m = PlacementRule_SFGroup_Filter_SimpleFilter{} -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) String() string { - return proto.CompactTextString(m) -} -func (*PlacementRule_SFGroup_Filter_SimpleFilter) ProtoMessage() {} -func (*PlacementRule_SFGroup_Filter_SimpleFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 1} -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilter.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilter.Merge(m, src) -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_Size() int { - return m.Size() -} -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilter.DiscardUnknown(m) -} - -var xxx_messageInfo_PlacementRule_SFGroup_Filter_SimpleFilter proto.InternalMessageInfo - -type isPlacementRule_SFGroup_Filter_SimpleFilter_Args interface { - isPlacementRule_SFGroup_Filter_SimpleFilter_Args() +type isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args interface { + isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args() MarshalTo([]byte) (int, error) Size() int } -type PlacementRule_SFGroup_Filter_SimpleFilter_Value struct { +type PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value struct { Value string `protobuf:"bytes,2,opt,name=value,proto3,oneof" json:"value,omitempty"` } -type PlacementRule_SFGroup_Filter_SimpleFilter_FArgs struct { - FArgs *PlacementRule_SFGroup_Filter_SimpleFilters `protobuf:"bytes,3,opt,name=f_args,json=fArgs,proto3,oneof" json:"f_args,omitempty"` +type PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs struct { + FArgs *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters `protobuf:"bytes,3,opt,name=f_args,json=fArgs,proto3,oneof" json:"f_args,omitempty"` } -func (*PlacementRule_SFGroup_Filter_SimpleFilter_Value) isPlacementRule_SFGroup_Filter_SimpleFilter_Args() { +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value) isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args() { } -func (*PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) isPlacementRule_SFGroup_Filter_SimpleFilter_Args() { +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs) isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args() { } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) GetArgs() isPlacementRule_SFGroup_Filter_SimpleFilter_Args { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) GetArgs() isPlacementPolicy_FilterGroup_Filter_SimpleFilter_Args { if m != nil { return m.Args } return nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) GetOp() PlacementRule_SFGroup_Filter_SimpleFilter_Operation { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) GetOp() PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation { if m != nil { return m.Op } - return PlacementRule_SFGroup_Filter_SimpleFilter_NP + return PlacementPolicy_FilterGroup_Filter_SimpleFilter_OPERATION_UNSPECIFIED } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) GetValue() string { - if x, ok := m.GetArgs().(*PlacementRule_SFGroup_Filter_SimpleFilter_Value); ok { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) GetValue() string { + if x, ok := m.GetArgs().(*PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value); ok { return x.Value } return "" } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) GetFArgs() *PlacementRule_SFGroup_Filter_SimpleFilters { - if x, ok := m.GetArgs().(*PlacementRule_SFGroup_Filter_SimpleFilter_FArgs); ok { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) GetFArgs() *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters { + if x, ok := m.GetArgs().(*PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs); ok { return x.FArgs } return nil } // XXX_OneofWrappers is for the internal use of the proto package. -func (*PlacementRule_SFGroup_Filter_SimpleFilter) XXX_OneofWrappers() []interface{} { +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*PlacementRule_SFGroup_Filter_SimpleFilter_Value)(nil), - (*PlacementRule_SFGroup_Filter_SimpleFilter_FArgs)(nil), + (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value)(nil), + (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs)(nil), } } -type PlacementRule_SFGroup_Selector struct { - Count uint32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` - Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// List of filters +type PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters struct { + // List of filters + Filters []*PlacementPolicy_FilterGroup_Filter_SimpleFilter `protobuf:"bytes,1,rep,name=filters,proto3" json:"filters,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PlacementRule_SFGroup_Selector) Reset() { *m = PlacementRule_SFGroup_Selector{} } -func (m *PlacementRule_SFGroup_Selector) String() string { return proto.CompactTextString(m) } -func (*PlacementRule_SFGroup_Selector) ProtoMessage() {} -func (*PlacementRule_SFGroup_Selector) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 1} +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Reset() { + *m = PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters{} } -func (m *PlacementRule_SFGroup_Selector) XXX_Unmarshal(b []byte) error { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) String() string { + return proto.CompactTextString(m) +} +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) ProtoMessage() {} +func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Descriptor() ([]byte, []int) { + return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0, 0} +} +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *PlacementRule_SFGroup_Selector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_PlacementRule_SFGroup_Selector.Marshal(b, m, deterministic) + return xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -455,37 +433,88 @@ func (m *PlacementRule_SFGroup_Selector) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } -func (m *PlacementRule_SFGroup_Selector) XXX_Merge(src proto.Message) { - xxx_messageInfo_PlacementRule_SFGroup_Selector.Merge(m, src) +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters.Merge(m, src) } -func (m *PlacementRule_SFGroup_Selector) XXX_Size() int { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_Size() int { return m.Size() } -func (m *PlacementRule_SFGroup_Selector) XXX_DiscardUnknown() { - xxx_messageInfo_PlacementRule_SFGroup_Selector.DiscardUnknown(m) +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters.DiscardUnknown(m) } -var xxx_messageInfo_PlacementRule_SFGroup_Selector proto.InternalMessageInfo +var xxx_messageInfo_PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters proto.InternalMessageInfo -func (m *PlacementRule_SFGroup_Selector) GetCount() uint32 { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) GetFilters() []*PlacementPolicy_FilterGroup_Filter_SimpleFilter { + if m != nil { + return m.Filters + } + return nil +} + +// Selector +type PlacementPolicy_FilterGroup_Selector struct { + // How many to select + Count uint32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` + // Key to select + Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PlacementPolicy_FilterGroup_Selector) Reset() { *m = PlacementPolicy_FilterGroup_Selector{} } +func (m *PlacementPolicy_FilterGroup_Selector) String() string { return proto.CompactTextString(m) } +func (*PlacementPolicy_FilterGroup_Selector) ProtoMessage() {} +func (*PlacementPolicy_FilterGroup_Selector) Descriptor() ([]byte, []int) { + return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 1} +} +func (m *PlacementPolicy_FilterGroup_Selector) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PlacementPolicy_FilterGroup_Selector) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PlacementPolicy_FilterGroup_Selector.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PlacementPolicy_FilterGroup_Selector) XXX_Merge(src proto.Message) { + xxx_messageInfo_PlacementPolicy_FilterGroup_Selector.Merge(m, src) +} +func (m *PlacementPolicy_FilterGroup_Selector) XXX_Size() int { + return m.Size() +} +func (m *PlacementPolicy_FilterGroup_Selector) XXX_DiscardUnknown() { + xxx_messageInfo_PlacementPolicy_FilterGroup_Selector.DiscardUnknown(m) +} + +var xxx_messageInfo_PlacementPolicy_FilterGroup_Selector proto.InternalMessageInfo + +func (m *PlacementPolicy_FilterGroup_Selector) GetCount() uint32 { if m != nil { return m.Count } return 0 } -func (m *PlacementRule_SFGroup_Selector) GetKey() string { +func (m *PlacementPolicy_FilterGroup_Selector) GetKey() string { if m != nil { return m.Key } return "" } -// Groups the information about the NeoFS node. +// NeoFS node description type NodeInfo struct { - // Carries network address of the NeoFS node. + // Ways to connect to a node Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - // Carries public key of the NeoFS node in a binary format. + // Public key of the NeoFS node in a binary format. PublicKey []byte `protobuf:"bytes,2,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` // Carries list of the NeoFS node attributes in a string key-value format. Attributes []*NodeInfo_Attribute `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty"` @@ -554,14 +583,14 @@ func (m *NodeInfo) GetState() NodeInfo_State { if m != nil { return m.State } - return NodeInfo_UNKNOWN + return NodeInfo_UNSPECIFIED } -// Groups attributes of the NeoFS node. +// Attributes of the NeoFS node. type NodeInfo_Attribute struct { - // Carries string key to the node attribute. + // Key of the node attribute. Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - // Carries string value of the node attribute. + // Value of the node attribute. Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -616,14 +645,14 @@ func (m *NodeInfo_Attribute) GetValue() string { } func init() { - proto.RegisterEnum("neo.fs.v2.netmap.PlacementRule_SFGroup_Filter_SimpleFilter_Operation", PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name, PlacementRule_SFGroup_Filter_SimpleFilter_Operation_value) + proto.RegisterEnum("neo.fs.v2.netmap.PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation", PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation_name, PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation_value) proto.RegisterEnum("neo.fs.v2.netmap.NodeInfo_State", NodeInfo_State_name, NodeInfo_State_value) - proto.RegisterType((*PlacementRule)(nil), "neo.fs.v2.netmap.PlacementRule") - proto.RegisterType((*PlacementRule_SFGroup)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup") - proto.RegisterType((*PlacementRule_SFGroup_Filter)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter") - proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilters)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter.SimpleFilters") - proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilter)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter.SimpleFilter") - proto.RegisterType((*PlacementRule_SFGroup_Selector)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Selector") + proto.RegisterType((*PlacementPolicy)(nil), "neo.fs.v2.netmap.PlacementPolicy") + proto.RegisterType((*PlacementPolicy_FilterGroup)(nil), "neo.fs.v2.netmap.PlacementPolicy.FilterGroup") + proto.RegisterType((*PlacementPolicy_FilterGroup_Filter)(nil), "neo.fs.v2.netmap.PlacementPolicy.FilterGroup.Filter") + proto.RegisterType((*PlacementPolicy_FilterGroup_Filter_SimpleFilter)(nil), "neo.fs.v2.netmap.PlacementPolicy.FilterGroup.Filter.SimpleFilter") + proto.RegisterType((*PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters)(nil), "neo.fs.v2.netmap.PlacementPolicy.FilterGroup.Filter.SimpleFilter.SimpleFilters") + proto.RegisterType((*PlacementPolicy_FilterGroup_Selector)(nil), "neo.fs.v2.netmap.PlacementPolicy.FilterGroup.Selector") proto.RegisterType((*NodeInfo)(nil), "neo.fs.v2.netmap.NodeInfo") proto.RegisterType((*NodeInfo_Attribute)(nil), "neo.fs.v2.netmap.NodeInfo.Attribute") } @@ -631,51 +660,52 @@ func init() { func init() { proto.RegisterFile("v2/netmap/types.proto", fileDescriptor_1207dc80bd67ddec) } var fileDescriptor_1207dc80bd67ddec = []byte{ - // 641 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0x8e, 0xed, 0xc4, 0x89, 0x27, 0xcd, 0xaf, 0xd5, 0xaa, 0x3f, 0xb2, 0x22, 0x11, 0xa2, 0x08, - 0x89, 0x48, 0x28, 0x1b, 0xe4, 0x4a, 0x5c, 0xe0, 0x92, 0xaa, 0x49, 0x1b, 0xb5, 0x72, 0x82, 0xd3, - 0x08, 0x89, 0x4b, 0xe4, 0x38, 0xeb, 0x60, 0xe1, 0x78, 0x2d, 0xef, 0x3a, 0xa2, 0x57, 0x9e, 0x82, - 0x17, 0xe0, 0xc2, 0x91, 0xa7, 0xe0, 0xc8, 0x23, 0xa0, 0xf2, 0x00, 0xdc, 0x38, 0x23, 0x6f, 0xe2, - 0xd0, 0x16, 0x84, 0x8a, 0x7a, 0x1a, 0xcf, 0xb7, 0x33, 0xdf, 0xb7, 0x3b, 0xfb, 0x79, 0xe1, 0xff, - 0xb5, 0xd5, 0x8d, 0xa8, 0x58, 0xb9, 0x71, 0x57, 0x5c, 0xc4, 0x94, 0x93, 0x38, 0x61, 0x82, 0x61, - 0x14, 0x51, 0x46, 0x7c, 0x4e, 0xd6, 0x16, 0xd9, 0xac, 0xb6, 0xbe, 0xeb, 0x50, 0x1b, 0x87, 0xae, - 0x47, 0x57, 0x34, 0x12, 0x4e, 0x1a, 0x52, 0xfc, 0x00, 0xaa, 0x09, 0x8d, 0xc3, 0x99, 0xef, 0x7a, - 0x82, 0x25, 0xa6, 0xd2, 0x54, 0xda, 0x35, 0x07, 0x32, 0x68, 0x20, 0x11, 0x7c, 0x04, 0x06, 0xf7, - 0x67, 0xcb, 0x84, 0xa5, 0x31, 0x37, 0xd5, 0xa6, 0xd6, 0xae, 0x5a, 0x8f, 0xc8, 0x4d, 0x62, 0x72, - 0x8d, 0x94, 0x4c, 0x06, 0xc7, 0x59, 0xbd, 0x53, 0xe1, 0xbe, 0xfc, 0xe0, 0xf5, 0x1f, 0x25, 0x28, - 0x6f, 0x51, 0x7c, 0x02, 0x65, 0x3f, 0x08, 0x05, 0x4d, 0xb8, 0xa9, 0x48, 0x3e, 0x72, 0x4b, 0x3e, - 0x32, 0x90, 0x6d, 0x4e, 0xde, 0x8e, 0x6d, 0x30, 0x38, 0x0d, 0x69, 0xb6, 0xcf, 0x7c, 0x6f, 0x4f, - 0x6e, 0xcb, 0x35, 0xd9, 0x36, 0x3a, 0xbf, 0x28, 0xb0, 0x09, 0x65, 0xfa, 0xd6, 0x0b, 0xd3, 0x05, - 0x35, 0xb5, 0xa6, 0xd6, 0xae, 0x39, 0x79, 0x5a, 0x7f, 0x57, 0x04, 0x7d, 0xa3, 0x8e, 0x11, 0x68, - 0x6f, 0xe8, 0x85, 0x9c, 0x94, 0xe1, 0x64, 0x9f, 0x78, 0x08, 0x8a, 0x6f, 0xaa, 0x4d, 0xa5, 0x5d, - 0xb5, 0x9e, 0xfd, 0xdb, 0x51, 0xc8, 0x24, 0x58, 0xc5, 0x21, 0xdd, 0x9e, 0x4b, 0xf1, 0xeb, 0x3e, - 0xd4, 0xae, 0x42, 0x1c, 0x4f, 0x6f, 0x0e, 0xeb, 0x4e, 0x0a, 0x39, 0x57, 0xfd, 0x93, 0x0a, 0x7b, - 0x57, 0x57, 0xf0, 0x14, 0x54, 0x16, 0xcb, 0x43, 0xfd, 0x67, 0xf5, 0xef, 0x20, 0x41, 0x46, 0x31, - 0x4d, 0x5c, 0x11, 0xb0, 0xc8, 0x51, 0x59, 0x8c, 0xef, 0x41, 0x69, 0xed, 0x86, 0x29, 0x95, 0xe3, - 0x31, 0x4e, 0x0a, 0xce, 0x26, 0xc5, 0x53, 0xd0, 0xfd, 0x99, 0x9b, 0x2c, 0xb9, 0xa9, 0xc9, 0xb9, - 0x3d, 0xbf, 0x83, 0x24, 0xcf, 0x68, 0xfd, 0x5e, 0xb2, 0xe4, 0xad, 0x73, 0x30, 0x76, 0xfa, 0x58, - 0x07, 0xd5, 0x1e, 0xa3, 0x42, 0x16, 0xfb, 0x2f, 0x90, 0x22, 0xf3, 0x3e, 0x52, 0xb3, 0x78, 0x7c, - 0x8e, 0x34, 0x19, 0xfb, 0xa8, 0x98, 0xc5, 0xb3, 0x73, 0x54, 0x92, 0xb1, 0x8f, 0xf4, 0x2c, 0x8e, - 0x1c, 0x54, 0xc6, 0x65, 0xd0, 0x7a, 0xf6, 0x11, 0xaa, 0x1c, 0xea, 0x50, 0xcc, 0xb6, 0x5a, 0xb7, - 0xa0, 0x92, 0xbb, 0x06, 0xef, 0x43, 0xc9, 0x63, 0x69, 0x24, 0xb6, 0x7f, 0xcc, 0x26, 0xc9, 0xbd, - 0xa1, 0xee, 0xbc, 0xd1, 0xfa, 0xa0, 0x42, 0xc5, 0x66, 0x0b, 0x3a, 0x8c, 0x7c, 0x96, 0xf9, 0xcb, - 0x5d, 0x2c, 0x12, 0xca, 0xf9, 0xd6, 0x3e, 0x79, 0x8a, 0xef, 0x03, 0xc4, 0xe9, 0x3c, 0x0c, 0xbc, - 0x59, 0xde, 0xbf, 0xe7, 0x18, 0x1b, 0xe4, 0x94, 0x5e, 0xe0, 0x23, 0x00, 0x57, 0x88, 0x24, 0x98, - 0xa7, 0x82, 0x72, 0xe9, 0xcd, 0xaa, 0xf5, 0xf0, 0xf7, 0x91, 0xe5, 0x42, 0xa4, 0x97, 0x17, 0x3b, - 0x57, 0xfa, 0xf0, 0x53, 0x28, 0x71, 0xe1, 0x0a, 0x6a, 0x16, 0xe5, 0x35, 0x37, 0xff, 0x42, 0x30, - 0xc9, 0xea, 0x9c, 0x4d, 0x79, 0xfd, 0x00, 0x8c, 0x1d, 0xe1, 0x1f, 0xec, 0xbf, 0x7f, 0xed, 0x8e, - 0xb7, 0x37, 0xdc, 0xea, 0x40, 0x49, 0x92, 0xe0, 0x2a, 0x94, 0xa7, 0xf6, 0xa9, 0x3d, 0x7a, 0x69, - 0xa3, 0x02, 0x06, 0xd0, 0x47, 0xf6, 0xd9, 0xd0, 0xee, 0x23, 0x25, 0x5b, 0x18, 0x0d, 0x06, 0x32, - 0x51, 0x0f, 0xc7, 0x9f, 0x2f, 0x1b, 0xca, 0x97, 0xcb, 0x86, 0xf2, 0xf5, 0xb2, 0xa1, 0xbc, 0xff, - 0xd6, 0x28, 0xbc, 0x7a, 0xbc, 0x0c, 0xc4, 0xeb, 0x74, 0x4e, 0x3c, 0xb6, 0xea, 0x46, 0x3c, 0xf6, - 0xbc, 0xce, 0x82, 0xae, 0xbb, 0x11, 0x65, 0x3e, 0xef, 0xb8, 0x71, 0xd0, 0x59, 0xb2, 0xee, 0xee, - 0xd9, 0xfb, 0xa8, 0x22, 0x9b, 0xb2, 0xc1, 0x84, 0xf4, 0xc6, 0x43, 0x62, 0x4b, 0x68, 0xae, 0xcb, - 0x47, 0xf0, 0xe0, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x8c, 0xb2, 0x91, 0x1d, 0x05, 0x00, - 0x00, + // 660 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0xae, 0xed, 0xc4, 0x69, 0x26, 0xcd, 0x5f, 0x6b, 0xff, 0x16, 0x99, 0x48, 0x84, 0x28, 0xe2, + 0x90, 0x4b, 0x1c, 0xe1, 0xa2, 0x5e, 0x38, 0xa5, 0xd4, 0x29, 0x51, 0x2b, 0x3b, 0x38, 0xe1, 0xd2, + 0x1e, 0x22, 0xc7, 0x59, 0xa7, 0x16, 0x8e, 0xd7, 0xf2, 0xae, 0x23, 0xf2, 0x26, 0xbc, 0x02, 0x3c, + 0x02, 0x07, 0xae, 0x70, 0xe0, 0xc0, 0x23, 0xa0, 0xf2, 0x22, 0xc8, 0xeb, 0x38, 0x4d, 0x0b, 0x42, + 0x2a, 0xe5, 0xf4, 0xf9, 0x9b, 0xd9, 0xf9, 0xc6, 0x33, 0xfe, 0xbc, 0xb0, 0xbf, 0xd0, 0x3b, 0x21, + 0x66, 0x73, 0x27, 0xea, 0xb0, 0x65, 0x84, 0xa9, 0x16, 0xc5, 0x84, 0x11, 0xa4, 0x84, 0x98, 0x68, + 0x1e, 0xd5, 0x16, 0xba, 0x96, 0x65, 0x9b, 0x9f, 0x4b, 0xb0, 0x3b, 0x08, 0x1c, 0x17, 0xcf, 0x71, + 0xc8, 0x06, 0x24, 0xf0, 0xdd, 0x25, 0x7a, 0x0c, 0x95, 0x18, 0x47, 0xc1, 0xd8, 0x73, 0x5c, 0x46, + 0x62, 0x55, 0x68, 0x08, 0xad, 0xaa, 0x0d, 0x69, 0xa8, 0xc7, 0x23, 0xc8, 0x86, 0xaa, 0xe7, 0x07, + 0x0c, 0xc7, 0xe3, 0x59, 0x4c, 0x92, 0x88, 0xaa, 0x62, 0x43, 0x6a, 0x55, 0xf4, 0xb6, 0x76, 0x5b, + 0x5e, 0xbb, 0x25, 0xad, 0xf5, 0x78, 0xd9, 0x49, 0x5a, 0x65, 0xef, 0x78, 0xd7, 0x84, 0xd6, 0x3e, + 0xc9, 0x50, 0xd9, 0xc8, 0x22, 0x13, 0x4a, 0x59, 0x9e, 0xaa, 0x02, 0x57, 0x7f, 0x76, 0x27, 0xf5, + 0xd5, 0xb3, 0x9d, 0x8b, 0xa0, 0x11, 0x94, 0x29, 0x0e, 0x70, 0xfa, 0xfe, 0xf9, 0xfb, 0x1e, 0xde, + 0x4d, 0x71, 0xb8, 0x2a, 0xb7, 0xaf, 0x85, 0x90, 0x0a, 0x25, 0xfc, 0xd6, 0x0d, 0x92, 0x29, 0x56, + 0xa5, 0x86, 0xd4, 0xaa, 0xda, 0x39, 0xad, 0x7d, 0x2c, 0x80, 0x9c, 0x55, 0x23, 0x05, 0xa4, 0x37, + 0x78, 0xc9, 0xf7, 0x58, 0xb6, 0xd3, 0x47, 0x64, 0x81, 0xe0, 0xa9, 0x62, 0x43, 0x68, 0x55, 0xf4, + 0xee, 0xdf, 0x8c, 0xa5, 0x0d, 0xfd, 0x79, 0x14, 0xe0, 0xd5, 0x8c, 0x82, 0x57, 0xfb, 0x2a, 0xc1, + 0xce, 0x66, 0x0c, 0x5d, 0x80, 0x48, 0x22, 0xde, 0xf2, 0x3f, 0xfd, 0xf4, 0xde, 0x2d, 0x34, 0x2b, + 0xc2, 0xb1, 0xc3, 0x7c, 0x12, 0xda, 0x22, 0x89, 0xd0, 0x03, 0x28, 0x2e, 0x9c, 0x20, 0xc1, 0x7c, + 0x84, 0xf2, 0xcb, 0x2d, 0x3b, 0xa3, 0xe8, 0x12, 0x64, 0x6f, 0xec, 0xc4, 0x33, 0xaa, 0x4a, 0x7c, + 0x36, 0xeb, 0xfe, 0x8d, 0x37, 0x09, 0x4d, 0x3b, 0x79, 0xdd, 0x78, 0x46, 0x6b, 0x01, 0x54, 0x6f, + 0x64, 0xd0, 0xc5, 0x6d, 0xbb, 0xfc, 0x83, 0xbd, 0xe6, 0x8a, 0xcd, 0x19, 0x94, 0xd7, 0x0b, 0x40, + 0x0f, 0x61, 0xdf, 0x1a, 0x18, 0x76, 0x77, 0xd4, 0xb7, 0xcc, 0xf1, 0x6b, 0x73, 0x38, 0x30, 0x5e, + 0xf4, 0x7b, 0x7d, 0xe3, 0x58, 0xd9, 0x42, 0x32, 0x88, 0xc6, 0x2b, 0x45, 0x48, 0xd1, 0x34, 0x14, + 0x31, 0xc5, 0x93, 0x91, 0x22, 0x71, 0x34, 0x94, 0x42, 0x8a, 0x67, 0x23, 0xa5, 0xc8, 0xd1, 0x50, + 0xe4, 0x14, 0x2d, 0x5b, 0x29, 0xa1, 0x12, 0x48, 0x5d, 0xf3, 0x58, 0xd9, 0x3e, 0x92, 0xa1, 0x90, + 0xae, 0xaf, 0xa6, 0xc3, 0x76, 0xee, 0x36, 0xb4, 0x07, 0x45, 0x97, 0x24, 0x21, 0x5b, 0xfd, 0x87, + 0x19, 0xc9, 0x3d, 0x25, 0xae, 0x3d, 0xd5, 0x7c, 0x2f, 0xc2, 0xb6, 0x49, 0xa6, 0xb8, 0x1f, 0x7a, + 0x24, 0xf5, 0xa5, 0x33, 0x9d, 0xc6, 0x98, 0xd2, 0x95, 0xed, 0x72, 0x8a, 0x1e, 0x01, 0x44, 0xc9, + 0x24, 0xf0, 0xdd, 0x71, 0x5e, 0xbf, 0x63, 0x97, 0xb3, 0xc8, 0x29, 0x5e, 0xa2, 0x63, 0x00, 0x87, + 0xb1, 0xd8, 0x9f, 0x24, 0x0c, 0x53, 0xee, 0xe9, 0x8a, 0xfe, 0xe4, 0xd7, 0x55, 0xe6, 0x8d, 0xb4, + 0x6e, 0x7e, 0xd8, 0xde, 0xa8, 0x43, 0x87, 0x50, 0xa4, 0xcc, 0x61, 0x58, 0x2d, 0x70, 0x03, 0x36, + 0xfe, 0x20, 0x30, 0x4c, 0xcf, 0xd9, 0xd9, 0xf1, 0xda, 0x01, 0x94, 0xd7, 0x82, 0xbf, 0xf9, 0x6d, + 0xf6, 0x6e, 0xf8, 0x6e, 0xe5, 0xba, 0xe6, 0x53, 0x28, 0x72, 0x11, 0xb4, 0x0b, 0x95, 0x9b, 0xdf, + 0x03, 0x40, 0xb6, 0xcc, 0xb3, 0xbe, 0x69, 0x28, 0x02, 0xaa, 0x40, 0xc9, 0xea, 0xf5, 0x38, 0x11, + 0x8f, 0xce, 0xbf, 0x5c, 0xd5, 0x85, 0x6f, 0x57, 0x75, 0xe1, 0xfb, 0x55, 0x5d, 0x78, 0xf7, 0xa3, + 0xbe, 0x75, 0xae, 0xcf, 0x7c, 0x76, 0x99, 0x4c, 0x34, 0x97, 0xcc, 0x3b, 0x21, 0x8d, 0x5c, 0xb7, + 0x3d, 0xc5, 0x8b, 0x4e, 0x88, 0x89, 0x47, 0xdb, 0x4e, 0xe4, 0xb7, 0x67, 0xa4, 0xb3, 0xbe, 0x52, + 0x9f, 0x67, 0xf0, 0x41, 0xfc, 0xdf, 0xc4, 0xa4, 0x37, 0xd4, 0xba, 0x83, 0x7e, 0x3a, 0x99, 0xc9, + 0xa3, 0x13, 0x99, 0x5f, 0xb5, 0x07, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xc4, 0x82, 0xde, + 0x83, 0x05, 0x00, 0x00, } -func (m *PlacementRule) Marshal() (dAtA []byte, err error) { +func (m *PlacementPolicy) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -685,12 +715,12 @@ func (m *PlacementRule) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PlacementRule) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -699,10 +729,10 @@ func (m *PlacementRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.SfGroups) > 0 { - for iNdEx := len(m.SfGroups) - 1; iNdEx >= 0; iNdEx-- { + if len(m.FilterGroups) > 0 { + for iNdEx := len(m.FilterGroups) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.SfGroups[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.FilterGroups[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -721,7 +751,7 @@ func (m *PlacementRule) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup) Marshal() (dAtA []byte, err error) { +func (m *PlacementPolicy_FilterGroup) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -731,12 +761,12 @@ func (m *PlacementRule_SFGroup) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PlacementRule_SFGroup) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -794,7 +824,7 @@ func (m *PlacementRule_SFGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup_Filter) Marshal() (dAtA []byte, err error) { +func (m *PlacementPolicy_FilterGroup_Filter) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -804,12 +834,12 @@ func (m *PlacementRule_SFGroup_Filter) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PlacementRule_SFGroup_Filter) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup_Filter) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -840,7 +870,7 @@ func (m *PlacementRule_SFGroup_Filter) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Marshal() (dAtA []byte, err error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -850,53 +880,12 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Filters) > 0 { - for iNdEx := len(m.Filters) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Filters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -922,12 +911,12 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter) MarshalToSizedBuffer(dAtA [] return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_Value) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) i -= len(m.Value) copy(dAtA[i:], m.Value) @@ -936,12 +925,12 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter_Value) MarshalToSizedBuffer(d dAtA[i] = 0x12 return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.FArgs != nil { { @@ -957,7 +946,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) MarshalToSizedBuffer(d } return len(dAtA) - i, nil } -func (m *PlacementRule_SFGroup_Selector) Marshal() (dAtA []byte, err error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -967,12 +956,53 @@ func (m *PlacementRule_SFGroup_Selector) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PlacementRule_SFGroup_Selector) MarshalTo(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PlacementRule_SFGroup_Selector) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Filters) > 0 { + for iNdEx := len(m.Filters) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Filters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *PlacementPolicy_FilterGroup_Selector) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PlacementPolicy_FilterGroup_Selector) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PlacementPolicy_FilterGroup_Selector) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1108,7 +1138,7 @@ func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *PlacementRule) Size() (n int) { +func (m *PlacementPolicy) Size() (n int) { if m == nil { return 0 } @@ -1117,8 +1147,8 @@ func (m *PlacementRule) Size() (n int) { if m.ReplFactor != 0 { n += 1 + sovTypes(uint64(m.ReplFactor)) } - if len(m.SfGroups) > 0 { - for _, e := range m.SfGroups { + if len(m.FilterGroups) > 0 { + for _, e := range m.FilterGroups { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -1129,7 +1159,7 @@ func (m *PlacementRule) Size() (n int) { return n } -func (m *PlacementRule_SFGroup) Size() (n int) { +func (m *PlacementPolicy_FilterGroup) Size() (n int) { if m == nil { return 0 } @@ -1160,7 +1190,7 @@ func (m *PlacementRule_SFGroup) Size() (n int) { return n } -func (m *PlacementRule_SFGroup_Filter) Size() (n int) { +func (m *PlacementPolicy_FilterGroup_Filter) Size() (n int) { if m == nil { return 0 } @@ -1180,25 +1210,7 @@ func (m *PlacementRule_SFGroup_Filter) Size() (n int) { return n } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Filters) > 0 { - for _, e := range m.Filters { - l = e.Size() - n += 1 + l + sovTypes(uint64(l)) - } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) Size() (n int) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) Size() (n int) { if m == nil { return 0 } @@ -1216,7 +1228,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter) Size() (n int) { return n } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_Value) Size() (n int) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value) Size() (n int) { if m == nil { return 0 } @@ -1226,7 +1238,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter_Value) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) return n } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) Size() (n int) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs) Size() (n int) { if m == nil { return 0 } @@ -1238,7 +1250,25 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter_FArgs) Size() (n int) { } return n } -func (m *PlacementRule_SFGroup_Selector) Size() (n int) { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Filters) > 0 { + for _, e := range m.Filters { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *PlacementPolicy_FilterGroup_Selector) Size() (n int) { if m == nil { return 0 } @@ -1312,7 +1342,7 @@ func sovTypes(x uint64) (n int) { func sozTypes(x uint64) (n int) { return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *PlacementRule) Unmarshal(dAtA []byte) error { +func (m *PlacementPolicy) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1335,10 +1365,10 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PlacementRule: wiretype end group for non-group") + return fmt.Errorf("proto: PlacementPolicy: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PlacementRule: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PlacementPolicy: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1362,7 +1392,7 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SfGroups", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FilterGroups", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1389,8 +1419,8 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.SfGroups = append(m.SfGroups, &PlacementRule_SFGroup{}) - if err := m.SfGroups[len(m.SfGroups)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.FilterGroups = append(m.FilterGroups, &PlacementPolicy_FilterGroup{}) + if err := m.FilterGroups[len(m.FilterGroups)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1419,7 +1449,7 @@ func (m *PlacementRule) Unmarshal(dAtA []byte) error { } return nil } -func (m *PlacementRule_SFGroup) Unmarshal(dAtA []byte) error { +func (m *PlacementPolicy_FilterGroup) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1442,10 +1472,10 @@ func (m *PlacementRule_SFGroup) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SFGroup: wiretype end group for non-group") + return fmt.Errorf("proto: FilterGroup: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SFGroup: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: FilterGroup: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1477,7 +1507,7 @@ func (m *PlacementRule_SFGroup) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, &PlacementRule_SFGroup_Filter{}) + m.Filters = append(m.Filters, &PlacementPolicy_FilterGroup_Filter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1511,7 +1541,7 @@ func (m *PlacementRule_SFGroup) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Selectors = append(m.Selectors, &PlacementRule_SFGroup_Selector{}) + m.Selectors = append(m.Selectors, &PlacementPolicy_FilterGroup_Selector{}) if err := m.Selectors[len(m.Selectors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1617,7 +1647,7 @@ func (m *PlacementRule_SFGroup) Unmarshal(dAtA []byte) error { } return nil } -func (m *PlacementRule_SFGroup_Filter) Unmarshal(dAtA []byte) error { +func (m *PlacementPolicy_FilterGroup_Filter) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1708,7 +1738,7 @@ func (m *PlacementRule_SFGroup_Filter) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.F == nil { - m.F = &PlacementRule_SFGroup_Filter_SimpleFilter{} + m.F = &PlacementPolicy_FilterGroup_Filter_SimpleFilter{} } if err := m.F.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1739,7 +1769,147 @@ func (m *PlacementRule_SFGroup_Filter) Unmarshal(dAtA []byte) error { } return nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Unmarshal(dAtA []byte) error { +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SimpleFilter: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SimpleFilter: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Op", wireType) + } + m.Op = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Op |= PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Args = &PlacementPolicy_FilterGroup_Filter_SimpleFilter_Value{string(dAtA[iNdEx:postIndex])} + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FArgs", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Args = &PlacementPolicy_FilterGroup_Filter_SimpleFilter_FArgs{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1797,7 +1967,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Unmarshal(dAtA []byte) erro if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, &PlacementRule_SFGroup_Filter_SimpleFilter{}) + m.Filters = append(m.Filters, &PlacementPolicy_FilterGroup_Filter_SimpleFilter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1827,147 +1997,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) Unmarshal(dAtA []byte) erro } return nil } -func (m *PlacementRule_SFGroup_Filter_SimpleFilter) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SimpleFilter: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SimpleFilter: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Op", wireType) - } - m.Op = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Op |= PlacementRule_SFGroup_Filter_SimpleFilter_Operation(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Args = &PlacementRule_SFGroup_Filter_SimpleFilter_Value{string(dAtA[iNdEx:postIndex])} - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FArgs", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &PlacementRule_SFGroup_Filter_SimpleFilters{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Args = &PlacementRule_SFGroup_Filter_SimpleFilter_FArgs{v} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *PlacementRule_SFGroup_Selector) Unmarshal(dAtA []byte) error { +func (m *PlacementPolicy_FilterGroup_Selector) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { diff --git a/v2/object/service.pb.go b/v2/object/service.pb.go index 18a68cef..1865e415 100644 --- a/v2/object/service.pb.go +++ b/v2/object/service.pb.go @@ -28,31 +28,35 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package -type SearchRequest_Body_Query_Filter_MatchType int32 +// Type of match expression +type SearchRequest_Body_Filter_MatchType int32 const ( - SearchRequest_Body_Query_Filter_MATCH_UNKNOWN SearchRequest_Body_Query_Filter_MatchType = 0 - SearchRequest_Body_Query_Filter_STRING_EQUAL SearchRequest_Body_Query_Filter_MatchType = 1 + // Unknown. Not used + SearchRequest_Body_Filter_MATCH_TYPE_UNSPECIFIED SearchRequest_Body_Filter_MatchType = 0 + // Full string match + SearchRequest_Body_Filter_STRING_EQUAL SearchRequest_Body_Filter_MatchType = 1 ) -var SearchRequest_Body_Query_Filter_MatchType_name = map[int32]string{ - 0: "MATCH_UNKNOWN", +var SearchRequest_Body_Filter_MatchType_name = map[int32]string{ + 0: "MATCH_TYPE_UNSPECIFIED", 1: "STRING_EQUAL", } -var SearchRequest_Body_Query_Filter_MatchType_value = map[string]int32{ - "MATCH_UNKNOWN": 0, - "STRING_EQUAL": 1, +var SearchRequest_Body_Filter_MatchType_value = map[string]int32{ + "MATCH_TYPE_UNSPECIFIED": 0, + "STRING_EQUAL": 1, } -func (x SearchRequest_Body_Query_Filter_MatchType) String() string { - return proto.EnumName(SearchRequest_Body_Query_Filter_MatchType_name, int32(x)) +func (x SearchRequest_Body_Filter_MatchType) String() string { + return proto.EnumName(SearchRequest_Body_Filter_MatchType_name, int32(x)) } -func (SearchRequest_Body_Query_Filter_MatchType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0, 0, 0, 0} +func (SearchRequest_Body_Filter_MatchType) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_6233c87a2945599e, []int{8, 0, 0, 0} } +// Get object request type GetRequest struct { // Body of get object request message. Body *GetRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -121,6 +125,7 @@ func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type GetRequest_Body struct { // Address of the requested object. Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -180,6 +185,7 @@ func (m *GetRequest_Body) GetRaw() bool { return false } +// get object response type GetResponse struct { // Body of get object response message. Body *GetResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -249,6 +255,7 @@ func (m *GetResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type GetResponse_Body struct { // Carries the single message of the response stream. // @@ -406,6 +413,7 @@ func (m *GetResponse_Body_Init) GetHeader() *Header { return nil } +// Put object request type PutRequest struct { // Body of put object request message. Body *PutRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -474,6 +482,7 @@ func (m *PutRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type PutRequest_Body struct { // Carries the single part of the query stream. // @@ -642,6 +651,7 @@ func (m *PutRequest_Body_Init) GetCopiesNumber() uint32 { return 0 } +// Put object response type PutResponse struct { // Body of put object response message. Body *PutResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -711,6 +721,7 @@ func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type PutResponse_Body struct { // Carries identifier of the saved object. // It is used to access an object in the container. @@ -760,6 +771,7 @@ func (m *PutResponse_Body) GetObjectId() *refs.ObjectID { return nil } +// Object Delete request type DeleteRequest struct { // Body of delete object request message. Body *DeleteRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -828,6 +840,7 @@ func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type DeleteRequest_Body struct { // Carries the address of the object to be deleted. Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -956,6 +969,7 @@ func (m *DeleteResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type DeleteResponse_Body struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -995,6 +1009,7 @@ func (m *DeleteResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteResponse_Body proto.InternalMessageInfo +// Object head request type HeadRequest struct { // Body of head object request message. Body *HeadRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1063,6 +1078,7 @@ func (m *HeadRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type HeadRequest_Body struct { // Address of the object with the requested header. Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -1131,6 +1147,7 @@ func (m *HeadRequest_Body) GetRaw() bool { return false } +// Head response type HeadResponse struct { // Body of head object response message. Body *HeadResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1200,6 +1217,7 @@ func (m *HeadResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type HeadResponse_Body struct { // Carries the requested object header or it's part // @@ -1290,6 +1308,7 @@ func (*HeadResponse_Body) XXX_OneofWrappers() []interface{} { } } +// Short header fields type HeadResponse_Body_ShortHeader struct { // Object format version. Version *service.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` @@ -1375,6 +1394,7 @@ func (m *HeadResponse_Body_ShortHeader) GetPayloadLength() uint64 { return 0 } +// Search objects request type SearchRequest struct { // Body of search object request message. Body *SearchRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1443,13 +1463,17 @@ func (m *SearchRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type SearchRequest_Body struct { // Carries search container identifier. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - Query *SearchRequest_Body_Query `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + // Version of the Query Language used + Version uint32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` + // List of search expressions + Filters []*SearchRequest_Body_Filter `protobuf:"bytes,3,rep,name=filters,proto3" json:"filters,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SearchRequest_Body) Reset() { *m = SearchRequest_Body{} } @@ -1492,89 +1516,45 @@ func (m *SearchRequest_Body) GetContainerId() *refs.ContainerID { return nil } -func (m *SearchRequest_Body) GetQuery() *SearchRequest_Body_Query { - if m != nil { - return m.Query - } - return nil -} - -type SearchRequest_Body_Query struct { - Version uint32 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"` - Filters []*SearchRequest_Body_Query_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SearchRequest_Body_Query) Reset() { *m = SearchRequest_Body_Query{} } -func (m *SearchRequest_Body_Query) String() string { return proto.CompactTextString(m) } -func (*SearchRequest_Body_Query) ProtoMessage() {} -func (*SearchRequest_Body_Query) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0, 0} -} -func (m *SearchRequest_Body_Query) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SearchRequest_Body_Query) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SearchRequest_Body_Query.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *SearchRequest_Body_Query) XXX_Merge(src proto.Message) { - xxx_messageInfo_SearchRequest_Body_Query.Merge(m, src) -} -func (m *SearchRequest_Body_Query) XXX_Size() int { - return m.Size() -} -func (m *SearchRequest_Body_Query) XXX_DiscardUnknown() { - xxx_messageInfo_SearchRequest_Body_Query.DiscardUnknown(m) -} - -var xxx_messageInfo_SearchRequest_Body_Query proto.InternalMessageInfo - -func (m *SearchRequest_Body_Query) GetVersion() uint32 { +func (m *SearchRequest_Body) GetVersion() uint32 { if m != nil { return m.Version } return 0 } -func (m *SearchRequest_Body_Query) GetFilters() []*SearchRequest_Body_Query_Filter { +func (m *SearchRequest_Body) GetFilters() []*SearchRequest_Body_Filter { if m != nil { return m.Filters } return nil } -type SearchRequest_Body_Query_Filter struct { - MatchType SearchRequest_Body_Query_Filter_MatchType `protobuf:"varint,1,opt,name=match_type,json=matchType,proto3,enum=neo.fs.v2.object.SearchRequest_Body_Query_Filter_MatchType" json:"match_type,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +// Filter structure +type SearchRequest_Body_Filter struct { + // Match type to use + MatchType SearchRequest_Body_Filter_MatchType `protobuf:"varint,1,opt,name=match_type,json=matchType,proto3,enum=neo.fs.v2.object.SearchRequest_Body_Filter_MatchType" json:"match_type,omitempty"` + // Header name to match + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + // Header value to match + Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *SearchRequest_Body_Query_Filter) Reset() { *m = SearchRequest_Body_Query_Filter{} } -func (m *SearchRequest_Body_Query_Filter) String() string { return proto.CompactTextString(m) } -func (*SearchRequest_Body_Query_Filter) ProtoMessage() {} -func (*SearchRequest_Body_Query_Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0, 0, 0} +func (m *SearchRequest_Body_Filter) Reset() { *m = SearchRequest_Body_Filter{} } +func (m *SearchRequest_Body_Filter) String() string { return proto.CompactTextString(m) } +func (*SearchRequest_Body_Filter) ProtoMessage() {} +func (*SearchRequest_Body_Filter) Descriptor() ([]byte, []int) { + return fileDescriptor_6233c87a2945599e, []int{8, 0, 0} } -func (m *SearchRequest_Body_Query_Filter) XXX_Unmarshal(b []byte) error { +func (m *SearchRequest_Body_Filter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *SearchRequest_Body_Query_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *SearchRequest_Body_Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_SearchRequest_Body_Query_Filter.Marshal(b, m, deterministic) + return xxx_messageInfo_SearchRequest_Body_Filter.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1584,39 +1564,40 @@ func (m *SearchRequest_Body_Query_Filter) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *SearchRequest_Body_Query_Filter) XXX_Merge(src proto.Message) { - xxx_messageInfo_SearchRequest_Body_Query_Filter.Merge(m, src) +func (m *SearchRequest_Body_Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_SearchRequest_Body_Filter.Merge(m, src) } -func (m *SearchRequest_Body_Query_Filter) XXX_Size() int { +func (m *SearchRequest_Body_Filter) XXX_Size() int { return m.Size() } -func (m *SearchRequest_Body_Query_Filter) XXX_DiscardUnknown() { - xxx_messageInfo_SearchRequest_Body_Query_Filter.DiscardUnknown(m) +func (m *SearchRequest_Body_Filter) XXX_DiscardUnknown() { + xxx_messageInfo_SearchRequest_Body_Filter.DiscardUnknown(m) } -var xxx_messageInfo_SearchRequest_Body_Query_Filter proto.InternalMessageInfo +var xxx_messageInfo_SearchRequest_Body_Filter proto.InternalMessageInfo -func (m *SearchRequest_Body_Query_Filter) GetMatchType() SearchRequest_Body_Query_Filter_MatchType { +func (m *SearchRequest_Body_Filter) GetMatchType() SearchRequest_Body_Filter_MatchType { if m != nil { return m.MatchType } - return SearchRequest_Body_Query_Filter_MATCH_UNKNOWN + return SearchRequest_Body_Filter_MATCH_TYPE_UNSPECIFIED } -func (m *SearchRequest_Body_Query_Filter) GetName() string { +func (m *SearchRequest_Body_Filter) GetName() string { if m != nil { return m.Name } return "" } -func (m *SearchRequest_Body_Query_Filter) GetValue() string { +func (m *SearchRequest_Body_Filter) GetValue() string { if m != nil { return m.Value } return "" } +// Search response type SearchResponse struct { // Body of search object response message. Body *SearchResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1686,8 +1667,9 @@ func (m *SearchResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type SearchResponse_Body struct { - // Carries list of object identifiers that match the search query. + // Carries list of object identifiers that match the search query IdList []*refs.ObjectID `protobuf:"bytes,1,rep,name=id_list,json=idList,proto3" json:"id_list,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1792,6 +1774,7 @@ func (m *Range) GetLength() uint64 { return 0 } +// Request to get part of object's payload type GetRangeRequest struct { // Body of get range object request message. Body *GetRangeRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1860,6 +1843,7 @@ func (m *GetRangeRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request Body type GetRangeRequest_Body struct { // Address carries address of the object that contains the requested payload range. Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -1917,6 +1901,7 @@ func (m *GetRangeRequest_Body) GetRange() *Range { return nil } +// Get part of object's payload type GetRangeResponse struct { // Body of get range object response message. Body *GetRangeResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -1986,6 +1971,7 @@ func (m *GetRangeResponse) GetVerifyHeader() *service.ResponseVerificationHeader return nil } +// Response body type GetRangeResponse_Body struct { // Carries part of the object payload. Chunk []byte `protobuf:"bytes,1,opt,name=chunk,proto3" json:"chunk,omitempty"` @@ -2034,6 +2020,7 @@ func (m *GetRangeResponse_Body) GetChunk() []byte { return nil } +// Get hash of object's payload part type GetRangeHashRequest struct { // Body of get range hash object request message. Body *GetRangeHashRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -2102,6 +2089,7 @@ func (m *GetRangeHashRequest) GetVerifyHeader() *service.RequestVerificationHead return nil } +// Request body type GetRangeHashRequest_Body struct { // Carries address of the object that contains the requested payload range. Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -2168,6 +2156,7 @@ func (m *GetRangeHashRequest_Body) GetSalt() []byte { return nil } +// Get hash of object's payload part type GetRangeHashResponse struct { // Body of get range hash object response message. Body *GetRangeHashResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` @@ -2237,6 +2226,7 @@ func (m *GetRangeHashResponse) GetVerifyHeader() *service.ResponseVerificationHe return nil } +// Response body type GetRangeHashResponse_Body struct { // Carries list of homomorphic hashes in a binary format. HashList [][]byte `protobuf:"bytes,1,rep,name=hash_list,json=hashList,proto3" json:"hash_list,omitempty"` @@ -2286,7 +2276,7 @@ func (m *GetRangeHashResponse_Body) GetHashList() [][]byte { } func init() { - proto.RegisterEnum("neo.fs.v2.object.SearchRequest_Body_Query_Filter_MatchType", SearchRequest_Body_Query_Filter_MatchType_name, SearchRequest_Body_Query_Filter_MatchType_value) + proto.RegisterEnum("neo.fs.v2.object.SearchRequest_Body_Filter_MatchType", SearchRequest_Body_Filter_MatchType_name, SearchRequest_Body_Filter_MatchType_value) proto.RegisterType((*GetRequest)(nil), "neo.fs.v2.object.GetRequest") proto.RegisterType((*GetRequest_Body)(nil), "neo.fs.v2.object.GetRequest.Body") proto.RegisterType((*GetResponse)(nil), "neo.fs.v2.object.GetResponse") @@ -2308,8 +2298,7 @@ func init() { proto.RegisterType((*HeadResponse_Body_ShortHeader)(nil), "neo.fs.v2.object.HeadResponse.Body.ShortHeader") proto.RegisterType((*SearchRequest)(nil), "neo.fs.v2.object.SearchRequest") proto.RegisterType((*SearchRequest_Body)(nil), "neo.fs.v2.object.SearchRequest.Body") - proto.RegisterType((*SearchRequest_Body_Query)(nil), "neo.fs.v2.object.SearchRequest.Body.Query") - proto.RegisterType((*SearchRequest_Body_Query_Filter)(nil), "neo.fs.v2.object.SearchRequest.Body.Query.Filter") + proto.RegisterType((*SearchRequest_Body_Filter)(nil), "neo.fs.v2.object.SearchRequest.Body.Filter") proto.RegisterType((*SearchResponse)(nil), "neo.fs.v2.object.SearchResponse") proto.RegisterType((*SearchResponse_Body)(nil), "neo.fs.v2.object.SearchResponse.Body") proto.RegisterType((*Range)(nil), "neo.fs.v2.object.Range") @@ -2326,95 +2315,95 @@ func init() { func init() { proto.RegisterFile("v2/object/service.proto", fileDescriptor_6233c87a2945599e) } var fileDescriptor_6233c87a2945599e = []byte{ - // 1401 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x72, 0xdb, 0x54, - 0x14, 0x8e, 0xe4, 0x9f, 0xc4, 0xc7, 0x76, 0x30, 0xb7, 0xa5, 0xf5, 0xa8, 0x6d, 0x48, 0xd5, 0xa6, - 0xcd, 0xb4, 0x44, 0x4e, 0x0d, 0xa5, 0xb4, 0xa5, 0x85, 0xa4, 0x49, 0x1b, 0x4f, 0x1a, 0x27, 0xbd, - 0x4e, 0xcb, 0x4c, 0x67, 0x18, 0x8f, 0x22, 0x5d, 0xc7, 0x02, 0x5b, 0x72, 0x25, 0xd9, 0x1d, 0x6f, - 0x58, 0xc1, 0x82, 0x37, 0xe8, 0xb0, 0x00, 0xa6, 0xcb, 0xc2, 0x86, 0x3d, 0xc3, 0xb0, 0x84, 0x5d, - 0xe1, 0x09, 0x98, 0xf0, 0x00, 0x7d, 0x03, 0x86, 0xb9, 0x3f, 0xb2, 0xad, 0xd4, 0x7f, 0x64, 0x67, - 0x76, 0xd2, 0xd1, 0x77, 0x8e, 0xcf, 0xf9, 0xee, 0xa7, 0x73, 0xee, 0x95, 0xe1, 0x64, 0x2b, 0x9f, - 0x73, 0xf6, 0x3e, 0x23, 0x86, 0x9f, 0xf3, 0x88, 0xdb, 0xb2, 0x0c, 0xa2, 0x35, 0x5c, 0xc7, 0x77, - 0x50, 0xc6, 0x26, 0x8e, 0x56, 0xf1, 0xb4, 0x56, 0x5e, 0xe3, 0xcf, 0x95, 0xb7, 0xba, 0x50, 0xbf, - 0xdd, 0x20, 0x1e, 0x07, 0x2a, 0xc7, 0x5a, 0xf9, 0x9c, 0x4b, 0x2a, 0x5e, 0xc8, 0x48, 0xb1, 0x22, - 0x5e, 0xae, 0x4e, 0x7c, 0x5d, 0x98, 0x4f, 0xf6, 0x98, 0x5b, 0xc4, 0xb5, 0x2a, 0x6d, 0xfe, 0x40, - 0x7d, 0x21, 0x03, 0xdc, 0x23, 0x3e, 0x26, 0x4f, 0x9a, 0xc4, 0xf3, 0xd1, 0x55, 0x88, 0xee, 0x39, - 0x66, 0x3b, 0x2b, 0xcd, 0x4b, 0x8b, 0xc9, 0xfc, 0x59, 0xed, 0x70, 0x2e, 0x5a, 0x17, 0xab, 0xad, - 0x3a, 0x66, 0x1b, 0x33, 0x38, 0x5a, 0x87, 0x24, 0xfd, 0xb1, 0x72, 0x95, 0xe8, 0x26, 0x71, 0xb3, - 0x32, 0xf3, 0x3e, 0xdf, 0xe3, 0x1d, 0x94, 0x28, 0x7c, 0xb7, 0x88, 0xaf, 0x6f, 0x30, 0x2c, 0x86, - 0x7a, 0xe7, 0x1a, 0x3d, 0x80, 0x34, 0x4f, 0x2e, 0x08, 0x14, 0x61, 0x81, 0xde, 0x19, 0x1c, 0xe8, - 0x11, 0x85, 0x5b, 0x86, 0xee, 0x5b, 0x8e, 0x2d, 0x02, 0xa6, 0x78, 0x08, 0x7e, 0xa7, 0x6c, 0x42, - 0x94, 0xe6, 0x89, 0xae, 0xc0, 0xb4, 0x6e, 0x9a, 0x2e, 0xf1, 0x3c, 0x51, 0xdb, 0xc9, 0x9e, 0xa0, - 0x94, 0x45, 0x6d, 0x85, 0x3f, 0xc6, 0x01, 0x0e, 0x65, 0x20, 0xe2, 0xea, 0x4f, 0x59, 0x31, 0x33, - 0x98, 0x5e, 0xaa, 0xff, 0x44, 0x20, 0xc9, 0x08, 0xf0, 0x1a, 0x8e, 0xed, 0x11, 0xf4, 0x7e, 0x88, - 0x2d, 0x75, 0x00, 0x5b, 0x1c, 0xdc, 0x4b, 0xd7, 0xdd, 0x7e, 0x74, 0x2d, 0xf4, 0xad, 0x92, 0x3b, - 0x0f, 0xe0, 0x0b, 0xf7, 0xe7, 0x6b, 0x69, 0x48, 0xa4, 0x91, 0x84, 0x7d, 0x23, 0x0b, 0xc6, 0x6e, - 0x41, 0xd4, 0xb2, 0x2d, 0x5f, 0x14, 0x77, 0x71, 0x74, 0x71, 0x5a, 0xc1, 0xb6, 0xfc, 0x8d, 0x29, - 0xcc, 0xdc, 0xd0, 0x09, 0x88, 0x19, 0xd5, 0xa6, 0xfd, 0x39, 0xab, 0x2e, 0xb5, 0x31, 0x85, 0xf9, - 0xad, 0xf2, 0x83, 0x04, 0x51, 0x0a, 0x44, 0x57, 0x21, 0xc1, 0x03, 0x95, 0x2d, 0x53, 0xfc, 0x48, - 0xf6, 0xf0, 0x9a, 0x6c, 0x33, 0x40, 0x61, 0x0d, 0xcf, 0x70, 0x68, 0xc1, 0x44, 0x37, 0x20, 0xe1, - 0x59, 0xfb, 0xb6, 0xee, 0x37, 0x5d, 0x22, 0x98, 0x3b, 0xdd, 0xa7, 0xde, 0x52, 0x80, 0xc1, 0x5d, - 0x38, 0x5a, 0x86, 0x78, 0x88, 0xa8, 0xec, 0xeb, 0x45, 0x09, 0x4e, 0x04, 0x6e, 0x35, 0x0d, 0x49, - 0x91, 0x64, 0x43, 0x77, 0x7d, 0xf5, 0xdb, 0x28, 0xc0, 0x4e, 0x73, 0xfc, 0xb7, 0xa5, 0x8b, 0x9d, - 0x8c, 0xb7, 0xe5, 0x97, 0x60, 0xf1, 0x3f, 0x0c, 0x2d, 0xfe, 0x85, 0x91, 0x95, 0x8d, 0xb7, 0xf6, - 0x2f, 0x27, 0x69, 0xed, 0xd1, 0x39, 0x48, 0x1b, 0x4e, 0xc3, 0x22, 0x5e, 0xd9, 0x6e, 0xd6, 0xf7, - 0x88, 0x9b, 0x8d, 0xce, 0x4b, 0x8b, 0x69, 0x9c, 0xe2, 0xc6, 0x22, 0xb3, 0x1d, 0x16, 0xc8, 0xf7, - 0x32, 0x24, 0x19, 0x35, 0xe3, 0x76, 0x88, 0x1e, 0xf0, 0xa4, 0x74, 0x88, 0x5b, 0x42, 0x23, 0x47, - 0x5b, 0x44, 0xf5, 0x4f, 0x19, 0xd2, 0x6b, 0xa4, 0x46, 0x7c, 0x12, 0xbc, 0x46, 0x1f, 0x84, 0x48, - 0x3a, 0xff, 0x3a, 0x49, 0x21, 0xf8, 0x64, 0xbc, 0x49, 0xf5, 0xa3, 0xcf, 0x9d, 0x3c, 0xcc, 0x38, - 0x4f, 0x6d, 0xe2, 0x52, 0x5a, 0xe5, 0xfe, 0x3e, 0xdb, 0xf4, 0x79, 0x61, 0x0d, 0x4f, 0x33, 0x60, - 0xc1, 0x54, 0x5f, 0x49, 0x30, 0x1b, 0xb0, 0x24, 0xa4, 0x77, 0x3d, 0xc4, 0xea, 0xc2, 0x60, 0x56, - 0x27, 0x4b, 0x7d, 0x71, 0x4e, 0xac, 0xfa, 0xbb, 0x0c, 0x49, 0x6a, 0x0a, 0x44, 0x34, 0xf2, 0x4d, - 0xeb, 0x01, 0x4f, 0x86, 0x84, 0xaa, 0x47, 0x97, 0xd0, 0x29, 0x48, 0xd4, 0x75, 0xcb, 0x2e, 0x3b, - 0x76, 0xad, 0x2d, 0x36, 0x30, 0x33, 0xd4, 0xb0, 0x6d, 0xd7, 0xda, 0xc1, 0xbe, 0x26, 0xd2, 0xdd, - 0xd7, 0x7c, 0x15, 0x83, 0x14, 0xa7, 0x47, 0x68, 0xe7, 0x5a, 0x88, 0xcc, 0x73, 0x83, 0xc8, 0x9c, - 0x2c, 0xe5, 0x7c, 0x17, 0x11, 0x84, 0xe6, 0x3b, 0xa3, 0x40, 0x1a, 0x3e, 0x0a, 0x36, 0xa6, 0x3a, - 0xc3, 0x60, 0x17, 0x52, 0x5e, 0xd5, 0x71, 0xfd, 0x70, 0x65, 0xb9, 0x31, 0x98, 0xd1, 0x4a, 0xd4, - 0xaf, 0x13, 0x30, 0xe9, 0x75, 0x6f, 0x95, 0x2f, 0x65, 0x48, 0xf6, 0x3c, 0x46, 0xef, 0xc1, 0x74, - 0x8b, 0xb8, 0x9e, 0xe5, 0xd8, 0x22, 0x35, 0xa5, 0x4f, 0xc1, 0x8f, 0x38, 0x02, 0x07, 0x50, 0xb4, - 0x00, 0xb3, 0x86, 0x4b, 0x58, 0xe1, 0x65, 0xd2, 0x70, 0x8c, 0x2a, 0xcb, 0x2e, 0x8a, 0xd3, 0x81, - 0x75, 0x9d, 0x1a, 0x43, 0x7d, 0x25, 0x32, 0x5e, 0x5f, 0x41, 0xb7, 0x3a, 0xe3, 0x8d, 0x1e, 0x32, - 0xd8, 0x04, 0x9c, 0x0d, 0xcd, 0x5c, 0x51, 0x35, 0xef, 0xf3, 0xbb, 0xed, 0x06, 0xc1, 0xe0, 0x74, - 0xae, 0x69, 0x66, 0x0d, 0xbd, 0x5d, 0x73, 0x74, 0xb3, 0x5c, 0x23, 0xf6, 0xbe, 0x5f, 0xcd, 0xc6, - 0x78, 0x66, 0xc2, 0x7a, 0x9f, 0x19, 0x57, 0xe3, 0x10, 0xa5, 0xb4, 0xaa, 0xcf, 0x63, 0x90, 0x2e, - 0x11, 0xdd, 0x35, 0xaa, 0x63, 0x8f, 0x86, 0x10, 0x7c, 0x32, 0xde, 0xeb, 0x9f, 0x03, 0x1d, 0xde, - 0x86, 0x94, 0xe1, 0xd8, 0xbe, 0x6e, 0x89, 0x45, 0xe1, 0x45, 0x9e, 0x3a, 0xbc, 0x28, 0x77, 0x02, - 0x4c, 0x61, 0x0d, 0x27, 0x3b, 0x0e, 0x05, 0x13, 0x7d, 0x0c, 0xb1, 0x27, 0x4d, 0xe2, 0xb6, 0x45, - 0x71, 0x97, 0xc6, 0x61, 0x47, 0x7b, 0x40, 0x3d, 0x30, 0x77, 0x54, 0x7e, 0x92, 0x21, 0xc6, 0x0c, - 0x28, 0x1b, 0x56, 0x5e, 0xba, 0xab, 0xae, 0x4d, 0x98, 0xae, 0x58, 0x35, 0x9f, 0xb8, 0x5e, 0x56, - 0x9e, 0x8f, 0x2c, 0x26, 0xf3, 0x57, 0xc6, 0xff, 0x1d, 0xed, 0x2e, 0xf3, 0xc4, 0x41, 0x04, 0xe5, - 0x57, 0x09, 0xe2, 0xdc, 0x86, 0x1e, 0x03, 0xd4, 0x75, 0xdf, 0xa8, 0x72, 0x65, 0x49, 0x4c, 0x59, - 0x37, 0xff, 0x73, 0x68, 0x6d, 0x8b, 0xc6, 0x60, 0xc2, 0x4b, 0xd4, 0x83, 0x4b, 0x84, 0x20, 0x6a, - 0xeb, 0x75, 0xbe, 0x47, 0x4c, 0x60, 0x76, 0x8d, 0x8e, 0x43, 0xac, 0xa5, 0xd7, 0x9a, 0x84, 0xad, - 0x60, 0x02, 0xf3, 0x1b, 0x75, 0x19, 0x12, 0x9d, 0x08, 0xe8, 0x4d, 0x48, 0x6f, 0xad, 0xec, 0xde, - 0xd9, 0x28, 0x3f, 0x2c, 0x6e, 0x16, 0xb7, 0x3f, 0x29, 0x66, 0xa6, 0x50, 0x06, 0x52, 0xa5, 0x5d, - 0x5c, 0x28, 0xde, 0x2b, 0xaf, 0x3f, 0x78, 0xb8, 0x72, 0x3f, 0x23, 0xa9, 0xcf, 0x65, 0x98, 0x0d, - 0x92, 0x1a, 0x77, 0xd4, 0x86, 0xf1, 0x93, 0xd2, 0x30, 0xaf, 0x77, 0x07, 0x90, 0x65, 0x96, 0x6b, - 0x96, 0x47, 0xcf, 0x03, 0x91, 0xa1, 0xdb, 0xbc, 0xb8, 0x65, 0xde, 0xb7, 0x3c, 0x5f, 0xbd, 0x06, - 0x31, 0xac, 0xdb, 0xfb, 0x04, 0x9d, 0x80, 0xb8, 0x53, 0xa9, 0x78, 0x84, 0x1f, 0x25, 0xa2, 0x58, - 0xdc, 0x51, 0xbb, 0xe8, 0x08, 0xbc, 0x57, 0x89, 0x3b, 0xf5, 0x0f, 0x19, 0xde, 0xa0, 0x07, 0x4b, - 0xea, 0x1c, 0x34, 0x81, 0x1b, 0x21, 0x7a, 0x2f, 0xf4, 0x3f, 0x89, 0xf6, 0x38, 0xfc, 0xef, 0xc7, - 0xfb, 0x12, 0xc4, 0x5c, 0x5a, 0x6f, 0x9f, 0xed, 0xa1, 0x60, 0x84, 0xd3, 0xc1, 0x51, 0xea, 0xd7, - 0x32, 0x64, 0xba, 0x14, 0x09, 0xcd, 0xde, 0x0c, 0x91, 0x7a, 0x71, 0x18, 0xa9, 0x93, 0xa5, 0xda, - 0xd3, 0x82, 0xd7, 0xe3, 0xc1, 0x21, 0x94, 0x56, 0x98, 0x12, 0x47, 0x50, 0xf5, 0x95, 0x0c, 0xc7, - 0x82, 0xca, 0x36, 0x74, 0xaf, 0x33, 0x68, 0x6e, 0x87, 0xe8, 0xb8, 0x34, 0x98, 0x8e, 0x1e, 0xa7, - 0xc9, 0xd0, 0xd9, 0x17, 0x47, 0xd7, 0x59, 0x0e, 0xe2, 0x4c, 0x41, 0x41, 0xe7, 0x1f, 0x28, 0x34, - 0x01, 0xa3, 0x7d, 0xd7, 0xd3, 0x6b, 0x3e, 0xcb, 0x3a, 0x85, 0xd9, 0xb5, 0xfa, 0x4c, 0x86, 0xe3, - 0x61, 0xf2, 0x84, 0x02, 0x3f, 0x0a, 0x51, 0x7e, 0x79, 0x14, 0xe5, 0x93, 0xa5, 0xc2, 0x73, 0x82, - 0xf5, 0x53, 0x90, 0xa8, 0xea, 0x5e, 0xb5, 0xdb, 0x3d, 0x53, 0x78, 0x86, 0x1a, 0x68, 0x97, 0xcc, - 0xff, 0x18, 0x85, 0xe9, 0x12, 0x8f, 0x8c, 0xd6, 0x20, 0x72, 0x8f, 0xf8, 0xe8, 0xf4, 0xb0, 0x4f, - 0xae, 0xca, 0x99, 0xa1, 0x5f, 0xe1, 0x96, 0x25, 0x1a, 0x65, 0xa7, 0xd9, 0x37, 0x4a, 0xf7, 0x83, - 0x4d, 0xbf, 0x28, 0x3d, 0x9f, 0x21, 0x16, 0x25, 0xb4, 0x09, 0x71, 0x7e, 0x38, 0x44, 0x6f, 0x8f, - 0x38, 0x8c, 0x2b, 0xf3, 0xa3, 0xce, 0x95, 0x68, 0x1d, 0xa2, 0x94, 0x13, 0x74, 0x66, 0xe8, 0x91, - 0x4c, 0x99, 0x1b, 0xbe, 0x95, 0x46, 0x5b, 0x10, 0xe7, 0x53, 0xb4, 0x5f, 0x4e, 0xa1, 0x4d, 0x42, - 0xbf, 0x9c, 0xc2, 0x03, 0x78, 0x59, 0x42, 0x25, 0x98, 0x09, 0xe4, 0x85, 0xce, 0x8e, 0x9c, 0x28, - 0x8a, 0x3a, 0xba, 0x3f, 0x2e, 0x4b, 0xe8, 0x53, 0x48, 0xf5, 0x6a, 0x16, 0x2d, 0x8c, 0xd5, 0x46, - 0x94, 0x0b, 0xe3, 0x49, 0x7f, 0x75, 0xe7, 0xb7, 0x83, 0x39, 0xe9, 0xe5, 0xc1, 0x9c, 0xf4, 0xd7, - 0xc1, 0x9c, 0xf4, 0xec, 0xef, 0xb9, 0xa9, 0xc7, 0x97, 0xf7, 0x2d, 0xbf, 0xda, 0xdc, 0xd3, 0x0c, - 0xa7, 0x9e, 0xb3, 0xbd, 0x86, 0x61, 0x2c, 0x99, 0xa4, 0x95, 0xb3, 0x89, 0x53, 0xf1, 0x96, 0xf4, - 0x86, 0xb5, 0xb4, 0xef, 0xe4, 0x3a, 0xff, 0x1d, 0xbc, 0x90, 0x33, 0x45, 0xe2, 0xdc, 0x2d, 0x69, - 0x2b, 0x3b, 0x05, 0x31, 0xb0, 0xf7, 0xe2, 0xec, 0x4f, 0x80, 0x77, 0xff, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0xbb, 0xcd, 0x0d, 0x36, 0x8d, 0x18, 0x00, 0x00, + // 1396 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4f, 0x73, 0xdb, 0x44, + 0x14, 0x8f, 0x64, 0xc5, 0x89, 0x9f, 0xed, 0x90, 0xd9, 0x96, 0xd6, 0xa3, 0xb6, 0x21, 0x55, 0x9b, + 0x36, 0x43, 0x89, 0x1c, 0x0c, 0xa5, 0xb4, 0xa5, 0x65, 0x92, 0xc6, 0x69, 0x3c, 0x6d, 0xd2, 0x54, + 0x4e, 0x3b, 0x43, 0x67, 0x18, 0x8f, 0x22, 0xad, 0x63, 0x81, 0x2d, 0x19, 0xad, 0xec, 0x8e, 0x2f, + 0x9c, 0xe0, 0xc0, 0x37, 0xe8, 0x70, 0x00, 0x86, 0x63, 0xb9, 0xf1, 0x01, 0xb8, 0x70, 0x81, 0x5b, + 0x81, 0x2f, 0xc0, 0x84, 0x33, 0xd3, 0x6f, 0xc0, 0x30, 0xfb, 0x47, 0xb6, 0x95, 0xfa, 0x1f, 0xb9, + 0x89, 0x93, 0xa5, 0xa7, 0xdf, 0x7b, 0xde, 0xf7, 0xdb, 0xdf, 0xbe, 0xb7, 0xbb, 0x70, 0xba, 0x5d, + 0xc8, 0x7b, 0xfb, 0x9f, 0x60, 0x2b, 0xc8, 0x13, 0xec, 0xb7, 0x1d, 0x0b, 0xeb, 0x4d, 0xdf, 0x0b, + 0x3c, 0x34, 0xef, 0x62, 0x4f, 0xaf, 0x12, 0xbd, 0x5d, 0xd0, 0xf9, 0x77, 0xf5, 0xf5, 0x1e, 0x34, + 0xe8, 0x34, 0x31, 0xe1, 0x40, 0xf5, 0x44, 0xbb, 0x90, 0xf7, 0x71, 0x95, 0x44, 0x8c, 0x14, 0x2b, + 0xe2, 0xe5, 0x1b, 0x38, 0x30, 0x85, 0xf9, 0x74, 0x9f, 0xb9, 0x8d, 0x7d, 0xa7, 0xda, 0xe1, 0x1f, + 0xb4, 0xe7, 0x32, 0xc0, 0x5d, 0x1c, 0x18, 0xf8, 0xb3, 0x16, 0x26, 0x01, 0xba, 0x0a, 0xca, 0xbe, + 0x67, 0x77, 0x72, 0xd2, 0xa2, 0xb4, 0x9c, 0x2e, 0x9c, 0xd7, 0x8f, 0x8e, 0x45, 0xef, 0x61, 0xf5, + 0x75, 0xcf, 0xee, 0x18, 0x0c, 0x8e, 0x8a, 0x90, 0xa6, 0x7f, 0x56, 0xa9, 0x61, 0xd3, 0xc6, 0x7e, + 0x4e, 0x66, 0xde, 0x17, 0xfb, 0xbc, 0xc3, 0x14, 0x85, 0xef, 0x36, 0x0e, 0xcc, 0x2d, 0x86, 0x35, + 0xa0, 0xd1, 0x7d, 0x46, 0x0f, 0x21, 0xcb, 0x07, 0x17, 0x06, 0x4a, 0xb0, 0x40, 0x6f, 0x0d, 0x0f, + 0xf4, 0x98, 0xc2, 0x1d, 0xcb, 0x0c, 0x1c, 0xcf, 0x15, 0x01, 0x33, 0x3c, 0x04, 0x7f, 0x53, 0xef, + 0x81, 0x42, 0xc7, 0x89, 0xde, 0x86, 0x19, 0xd3, 0xb6, 0x7d, 0x4c, 0x88, 0xc8, 0xed, 0x74, 0x5f, + 0x50, 0xca, 0xa2, 0xbe, 0xc6, 0x3f, 0x1b, 0x21, 0x0e, 0xcd, 0x43, 0xc2, 0x37, 0x9f, 0xb2, 0x64, + 0x66, 0x0d, 0xfa, 0xa8, 0xfd, 0x93, 0x80, 0x34, 0x23, 0x80, 0x34, 0x3d, 0x97, 0x60, 0xf4, 0x5e, + 0x84, 0x2d, 0x6d, 0x08, 0x5b, 0x1c, 0xdc, 0x4f, 0xd7, 0xe6, 0x20, 0xba, 0x96, 0x06, 0x66, 0xc9, + 0x9d, 0x87, 0xf0, 0x65, 0x0c, 0xe6, 0x6b, 0x65, 0x44, 0xa4, 0xb1, 0x84, 0x7d, 0x2d, 0x0b, 0xc6, + 0x6e, 0x81, 0xe2, 0xb8, 0x4e, 0x20, 0x92, 0xbb, 0x3c, 0x3e, 0x39, 0xbd, 0xe4, 0x3a, 0xc1, 0xd6, + 0x94, 0xc1, 0xdc, 0xd0, 0x29, 0x98, 0xb6, 0x6a, 0x2d, 0xf7, 0x53, 0x96, 0x5d, 0x66, 0x6b, 0xca, + 0xe0, 0xaf, 0xea, 0x0f, 0x12, 0x28, 0x14, 0x88, 0xae, 0x42, 0x8a, 0x07, 0xaa, 0x38, 0xb6, 0xf8, + 0x93, 0xdc, 0xd1, 0x39, 0x79, 0xc0, 0x00, 0xa5, 0x0d, 0x63, 0x96, 0x43, 0x4b, 0x36, 0xba, 0x01, + 0x29, 0xe2, 0x1c, 0xb8, 0x66, 0xd0, 0xf2, 0xb1, 0x60, 0xee, 0xec, 0x80, 0x7c, 0xcb, 0x21, 0xc6, + 0xe8, 0xc1, 0xd1, 0x2a, 0x24, 0x23, 0x44, 0xe5, 0x5e, 0x4d, 0x4a, 0x70, 0x22, 0x70, 0xeb, 0x59, + 0x48, 0x8b, 0x41, 0x36, 0x4d, 0x3f, 0xd0, 0xbe, 0x51, 0x00, 0x76, 0x5b, 0x93, 0xaf, 0x96, 0x1e, + 0x36, 0x1e, 0xab, 0xe5, 0xa7, 0x70, 0xf2, 0x3f, 0x88, 0x4c, 0xfe, 0xa5, 0xb1, 0x99, 0x4d, 0x36, + 0xf7, 0x2f, 0xe2, 0x34, 0xf7, 0xe8, 0x02, 0x64, 0x2d, 0xaf, 0xe9, 0x60, 0x52, 0x71, 0x5b, 0x8d, + 0x7d, 0xec, 0xe7, 0x94, 0x45, 0x69, 0x39, 0x6b, 0x64, 0xb8, 0x71, 0x87, 0xd9, 0x8e, 0x0a, 0xe4, + 0x3b, 0x19, 0xd2, 0x8c, 0x9a, 0x49, 0x2b, 0x44, 0x1f, 0x38, 0x2e, 0x15, 0xe2, 0x96, 0xd0, 0xc8, + 0xf1, 0x26, 0x51, 0xfb, 0x5d, 0x86, 0xec, 0x06, 0xae, 0xe3, 0x00, 0x87, 0xcb, 0xe8, 0xfd, 0x08, + 0x49, 0x17, 0x5f, 0x25, 0x29, 0x02, 0x8f, 0xc7, 0x4a, 0x6a, 0x1c, 0xbf, 0xef, 0x14, 0x60, 0xd6, + 0x7b, 0xea, 0x62, 0x9f, 0xd2, 0x2a, 0x0f, 0xf6, 0x79, 0x40, 0xbf, 0x97, 0x36, 0x8c, 0x19, 0x06, + 0x2c, 0xd9, 0xda, 0x4b, 0x09, 0xe6, 0x42, 0x96, 0x84, 0xf4, 0xae, 0x47, 0x58, 0x5d, 0x1a, 0xce, + 0x6a, 0xbc, 0xd4, 0x97, 0xe4, 0xc4, 0x6a, 0xbf, 0xca, 0x90, 0xa6, 0xa6, 0x50, 0x44, 0x63, 0x57, + 0x5a, 0x1f, 0x38, 0x1e, 0x12, 0xaa, 0x1d, 0x5f, 0x42, 0x67, 0x20, 0xd5, 0x30, 0x1d, 0xb7, 0xe2, + 0xb9, 0xf5, 0x8e, 0xd8, 0xc0, 0xcc, 0x52, 0xc3, 0x03, 0xb7, 0xde, 0x09, 0xf7, 0x35, 0x89, 0xde, + 0xbe, 0xe6, 0xcb, 0x69, 0xc8, 0x70, 0x7a, 0x84, 0x76, 0xae, 0x45, 0xc8, 0xbc, 0x30, 0x8c, 0xcc, + 0x78, 0x29, 0xe7, 0xdb, 0x84, 0x20, 0xb4, 0xd0, 0x6d, 0x05, 0xd2, 0xe8, 0x56, 0xb0, 0x35, 0xd5, + 0x6d, 0x06, 0x7b, 0x90, 0x21, 0x35, 0xcf, 0x0f, 0xa2, 0x99, 0xe5, 0x27, 0x60, 0x46, 0x2f, 0x53, + 0xbf, 0x6e, 0xc0, 0x34, 0xe9, 0xbd, 0xaa, 0x5f, 0xc8, 0x90, 0xee, 0xfb, 0x8c, 0xde, 0x85, 0x99, + 0x36, 0xf6, 0x89, 0xe3, 0xb9, 0x62, 0x68, 0xea, 0x80, 0x84, 0x1f, 0x73, 0x84, 0x11, 0x42, 0xd1, + 0x12, 0xcc, 0x59, 0x3e, 0x66, 0x89, 0x57, 0x70, 0xd3, 0xb3, 0x6a, 0x6c, 0x74, 0x8a, 0x91, 0x0d, + 0xad, 0x45, 0x6a, 0x8c, 0xd4, 0x95, 0xc4, 0x64, 0x75, 0x05, 0xdd, 0xea, 0xb6, 0x37, 0x7a, 0xc8, + 0x60, 0x1d, 0x70, 0x2e, 0xd2, 0x73, 0x45, 0xd6, 0xbc, 0xce, 0xef, 0x75, 0x9a, 0xd8, 0x00, 0xaf, + 0xfb, 0x4c, 0x47, 0xd6, 0x34, 0x3b, 0x75, 0xcf, 0xb4, 0x2b, 0x75, 0xec, 0x1e, 0x04, 0xb5, 0xdc, + 0x34, 0x1f, 0x99, 0xb0, 0xde, 0x67, 0xc6, 0xf5, 0x24, 0x28, 0x94, 0x56, 0xed, 0x0f, 0x05, 0xb2, + 0x65, 0x6c, 0xfa, 0x56, 0x6d, 0xe2, 0xd6, 0x10, 0x81, 0xc7, 0x63, 0x5d, 0xff, 0x1d, 0x6e, 0xb2, + 0x6e, 0x43, 0xc6, 0xf2, 0xdc, 0xc0, 0x74, 0xc4, 0xa4, 0xf0, 0x24, 0xcf, 0x1c, 0x9d, 0x94, 0x3b, + 0x21, 0xa6, 0xb4, 0x61, 0xa4, 0xbb, 0x0e, 0x25, 0x1b, 0xe5, 0x7a, 0x6a, 0x91, 0xd9, 0xd6, 0xa4, + 0xab, 0x88, 0x22, 0xcc, 0x54, 0x9d, 0x7a, 0x80, 0x7d, 0x92, 0x4b, 0x2c, 0x26, 0x96, 0xd3, 0x85, + 0x2b, 0x93, 0x30, 0xa7, 0x6f, 0x32, 0x1f, 0x23, 0xf4, 0x55, 0x7f, 0x96, 0x20, 0xc9, 0x6d, 0x68, + 0x0f, 0xa0, 0x61, 0x06, 0x56, 0x8d, 0xeb, 0x40, 0x62, 0x3a, 0xb8, 0xfa, 0x1f, 0x82, 0xea, 0xdb, + 0xd4, 0x9b, 0x09, 0x24, 0xd5, 0x08, 0x1f, 0x11, 0x02, 0xc5, 0x35, 0x1b, 0x7c, 0x2f, 0x97, 0x32, + 0xd8, 0x33, 0x3a, 0x09, 0xd3, 0x6d, 0xb3, 0xde, 0xc2, 0x8c, 0xe9, 0x94, 0xc1, 0x5f, 0xb4, 0xeb, + 0x90, 0xea, 0x46, 0x40, 0x2a, 0x9c, 0xda, 0x5e, 0xdb, 0xbb, 0xb3, 0x55, 0xd9, 0xfb, 0x68, 0xb7, + 0x58, 0x79, 0xb4, 0x53, 0xde, 0x2d, 0xde, 0x29, 0x6d, 0x96, 0x8a, 0x1b, 0xf3, 0x53, 0x68, 0x1e, + 0x32, 0xe5, 0x3d, 0xa3, 0xb4, 0x73, 0xb7, 0x52, 0x7c, 0xf8, 0x68, 0xed, 0xfe, 0xbc, 0xa4, 0x7d, + 0x2f, 0xc3, 0x5c, 0x38, 0xae, 0x49, 0x7b, 0x63, 0x14, 0x1f, 0x97, 0x0a, 0x77, 0xbd, 0xd7, 0x31, + 0x1c, 0xbb, 0x52, 0x77, 0x08, 0xdd, 0xc0, 0x27, 0x46, 0xee, 0xcb, 0x92, 0x8e, 0x7d, 0xdf, 0x21, + 0x81, 0x76, 0x0d, 0xa6, 0x0d, 0xd3, 0x3d, 0xc0, 0xe8, 0x14, 0x24, 0xbd, 0x6a, 0x95, 0x60, 0xbe, + 0xf7, 0x57, 0x0c, 0xf1, 0x46, 0xed, 0x62, 0x09, 0xf3, 0xe2, 0x22, 0xde, 0xb4, 0xdf, 0x64, 0x78, + 0x8d, 0x9e, 0x04, 0xa9, 0x73, 0xb8, 0x6a, 0x6f, 0x44, 0xe8, 0xbd, 0x34, 0xf8, 0xe8, 0xd8, 0xe7, + 0xf0, 0xbf, 0xef, 0xc7, 0x2b, 0x30, 0xed, 0xd3, 0x7c, 0x07, 0xec, 0xe7, 0x04, 0x23, 0x9c, 0x0e, + 0x8e, 0xd2, 0xbe, 0x92, 0x61, 0xbe, 0x47, 0x91, 0xd0, 0xec, 0xcd, 0x08, 0xa9, 0x97, 0x47, 0x91, + 0x1a, 0x2f, 0xd5, 0x9e, 0x15, 0xbc, 0x9e, 0x0c, 0x4f, 0x8d, 0x34, 0xc3, 0x8c, 0x38, 0x33, 0x6a, + 0x2f, 0x65, 0x38, 0x11, 0x66, 0xb6, 0x65, 0x92, 0x6e, 0x67, 0xb8, 0x1d, 0xa1, 0xe3, 0xcd, 0xe1, + 0x74, 0xf4, 0x39, 0xc5, 0x43, 0x67, 0x9f, 0x1f, 0x5f, 0x67, 0x79, 0x48, 0x32, 0x05, 0x91, 0x9c, + 0xcc, 0xd6, 0xfd, 0x50, 0xa1, 0x09, 0x18, 0x2d, 0xc0, 0xc4, 0xac, 0x07, 0x6c, 0xd4, 0x19, 0x83, + 0x3d, 0x6b, 0xcf, 0x64, 0x38, 0x19, 0x25, 0x4f, 0x28, 0xf0, 0xc3, 0x08, 0xe5, 0x57, 0xc6, 0x51, + 0x1e, 0x2f, 0x15, 0x5e, 0x10, 0xac, 0x9f, 0x81, 0x54, 0xcd, 0x24, 0xb5, 0x5e, 0xf5, 0xcc, 0x18, + 0xb3, 0xd4, 0x40, 0xab, 0x64, 0xe1, 0x47, 0x05, 0xb2, 0xbc, 0x74, 0x96, 0x79, 0x7c, 0xb4, 0x01, + 0x89, 0xbb, 0x38, 0x40, 0x67, 0x47, 0xdd, 0x94, 0xaa, 0xe7, 0x46, 0x5e, 0x9e, 0xad, 0x4a, 0x34, + 0xca, 0x6e, 0x6b, 0x60, 0x94, 0xde, 0x3d, 0xcb, 0xa0, 0x28, 0x7d, 0xb7, 0x07, 0xcb, 0x12, 0xba, + 0x07, 0x49, 0x7e, 0xa6, 0x43, 0x6f, 0x8c, 0x39, 0x43, 0xab, 0x8b, 0xe3, 0x8e, 0x83, 0xa8, 0x08, + 0x0a, 0x65, 0x06, 0x9d, 0x1b, 0x79, 0x92, 0x52, 0x17, 0x46, 0xef, 0x80, 0xd1, 0x36, 0x24, 0x79, + 0x2f, 0x1d, 0x34, 0xa6, 0xc8, 0x6e, 0x61, 0xd0, 0x98, 0xa2, 0x6d, 0x78, 0x55, 0x42, 0x65, 0x98, + 0x0d, 0x45, 0x86, 0xce, 0x8f, 0xed, 0x2b, 0xaa, 0x36, 0xbe, 0x4a, 0xae, 0x4a, 0xe8, 0x63, 0xc8, + 0xf4, 0x2b, 0x17, 0x2d, 0x4d, 0x54, 0x4c, 0xd4, 0x4b, 0x93, 0x2d, 0x80, 0xf5, 0x27, 0xbf, 0x1c, + 0x2e, 0x48, 0x2f, 0x0e, 0x17, 0xa4, 0x3f, 0x0f, 0x17, 0xa4, 0x67, 0x7f, 0x2d, 0x4c, 0x3d, 0x29, + 0x1c, 0x38, 0x41, 0xad, 0xb5, 0xaf, 0x5b, 0x5e, 0x23, 0xef, 0x92, 0xa6, 0x65, 0xad, 0xd8, 0xb8, + 0x9d, 0x77, 0xb1, 0x57, 0x25, 0x2b, 0x66, 0xd3, 0x59, 0x39, 0xf0, 0xf2, 0xdd, 0x2b, 0xff, 0x9b, + 0xfc, 0xe7, 0xb9, 0x7c, 0x62, 0x07, 0x7b, 0x9b, 0x65, 0x7d, 0x6d, 0xb7, 0x44, 0xff, 0x90, 0xab, + 0x70, 0x3f, 0xc9, 0x6e, 0xf1, 0xdf, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xca, 0xeb, 0x7d, + 0x4e, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2425,23 +2414,23 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// ServiceClient is the client API for Service service. +// ObjectServiceClient is the client API for ObjectService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type ServiceClient interface { +type ObjectServiceClient interface { // Get the object from container. Response uses gRPC stream. First response // message carry object of requested address. Chunk messages are parts of // the object's payload if it is needed. All messages except first carry // chunks. Requested object can be restored by concatenation of object // message payload and all chunks keeping receiving order. - Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (Service_GetClient, error) + Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (ObjectService_GetClient, error) // Put the object into container. Request uses gRPC stream. First message // SHOULD BE type of PutHeader. Container id and Owner id of object SHOULD // BE set. Session token SHOULD BE obtained before put operation (see // session package). Chunk messages considered by server as part of object // payload. All messages except first SHOULD BE chunks. Chunk messages // SHOULD BE sent in direct order of fragmentation. - Put(ctx context.Context, opts ...grpc.CallOption) (Service_PutClient, error) + Put(ctx context.Context, opts ...grpc.CallOption) (ObjectService_PutClient, error) // Delete the object from a container Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) // Head returns the object without data payload. Object in the @@ -2451,11 +2440,11 @@ type ServiceClient interface { // Search objects in container. Version of query language format SHOULD BE // set to 1. Search query represented in serialized format (see query // package). - Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (Service_SearchClient, error) + Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (ObjectService_SearchClient, error) // GetRange of data payload. Range is a pair (offset, length). // Requested range can be restored by concatenation of all chunks // keeping receiving order. - GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (Service_GetRangeClient, error) + GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (ObjectService_GetRangeClient, error) // GetRangeHash returns homomorphic hash of object payload range after XOR // operation. Ranges are set of pairs (offset, length). Hashes order in // response corresponds to ranges order in request. Homomorphic hash is @@ -2463,20 +2452,20 @@ type ServiceClient interface { GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc.CallOption) (*GetRangeHashResponse, error) } -type serviceClient struct { +type objectServiceClient struct { cc *grpc.ClientConn } -func NewServiceClient(cc *grpc.ClientConn) ServiceClient { - return &serviceClient{cc} +func NewObjectServiceClient(cc *grpc.ClientConn) ObjectServiceClient { + return &objectServiceClient{cc} } -func (c *serviceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (Service_GetClient, error) { - stream, err := c.cc.NewStream(ctx, &_Service_serviceDesc.Streams[0], "/neo.fs.v2.object.Service/Get", opts...) +func (c *objectServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (ObjectService_GetClient, error) { + stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[0], "/neo.fs.v2.object.ObjectService/Get", opts...) if err != nil { return nil, err } - x := &serviceGetClient{stream} + x := &objectServiceGetClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -2486,16 +2475,16 @@ func (c *serviceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.Ca return x, nil } -type Service_GetClient interface { +type ObjectService_GetClient interface { Recv() (*GetResponse, error) grpc.ClientStream } -type serviceGetClient struct { +type objectServiceGetClient struct { grpc.ClientStream } -func (x *serviceGetClient) Recv() (*GetResponse, error) { +func (x *objectServiceGetClient) Recv() (*GetResponse, error) { m := new(GetResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err @@ -2503,30 +2492,30 @@ func (x *serviceGetClient) Recv() (*GetResponse, error) { return m, nil } -func (c *serviceClient) Put(ctx context.Context, opts ...grpc.CallOption) (Service_PutClient, error) { - stream, err := c.cc.NewStream(ctx, &_Service_serviceDesc.Streams[1], "/neo.fs.v2.object.Service/Put", opts...) +func (c *objectServiceClient) Put(ctx context.Context, opts ...grpc.CallOption) (ObjectService_PutClient, error) { + stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[1], "/neo.fs.v2.object.ObjectService/Put", opts...) if err != nil { return nil, err } - x := &servicePutClient{stream} + x := &objectServicePutClient{stream} return x, nil } -type Service_PutClient interface { +type ObjectService_PutClient interface { Send(*PutRequest) error CloseAndRecv() (*PutResponse, error) grpc.ClientStream } -type servicePutClient struct { +type objectServicePutClient struct { grpc.ClientStream } -func (x *servicePutClient) Send(m *PutRequest) error { +func (x *objectServicePutClient) Send(m *PutRequest) error { return x.ClientStream.SendMsg(m) } -func (x *servicePutClient) CloseAndRecv() (*PutResponse, error) { +func (x *objectServicePutClient) CloseAndRecv() (*PutResponse, error) { if err := x.ClientStream.CloseSend(); err != nil { return nil, err } @@ -2537,30 +2526,30 @@ func (x *servicePutClient) CloseAndRecv() (*PutResponse, error) { return m, nil } -func (c *serviceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { +func (c *objectServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { out := new(DeleteResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.object.Service/Delete", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/Delete", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) Head(ctx context.Context, in *HeadRequest, opts ...grpc.CallOption) (*HeadResponse, error) { +func (c *objectServiceClient) Head(ctx context.Context, in *HeadRequest, opts ...grpc.CallOption) (*HeadResponse, error) { out := new(HeadResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.object.Service/Head", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/Head", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *serviceClient) Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (Service_SearchClient, error) { - stream, err := c.cc.NewStream(ctx, &_Service_serviceDesc.Streams[2], "/neo.fs.v2.object.Service/Search", opts...) +func (c *objectServiceClient) Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (ObjectService_SearchClient, error) { + stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[2], "/neo.fs.v2.object.ObjectService/Search", opts...) if err != nil { return nil, err } - x := &serviceSearchClient{stream} + x := &objectServiceSearchClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -2570,16 +2559,16 @@ func (c *serviceClient) Search(ctx context.Context, in *SearchRequest, opts ...g return x, nil } -type Service_SearchClient interface { +type ObjectService_SearchClient interface { Recv() (*SearchResponse, error) grpc.ClientStream } -type serviceSearchClient struct { +type objectServiceSearchClient struct { grpc.ClientStream } -func (x *serviceSearchClient) Recv() (*SearchResponse, error) { +func (x *objectServiceSearchClient) Recv() (*SearchResponse, error) { m := new(SearchResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err @@ -2587,12 +2576,12 @@ func (x *serviceSearchClient) Recv() (*SearchResponse, error) { return m, nil } -func (c *serviceClient) GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (Service_GetRangeClient, error) { - stream, err := c.cc.NewStream(ctx, &_Service_serviceDesc.Streams[3], "/neo.fs.v2.object.Service/GetRange", opts...) +func (c *objectServiceClient) GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (ObjectService_GetRangeClient, error) { + stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[3], "/neo.fs.v2.object.ObjectService/GetRange", opts...) if err != nil { return nil, err } - x := &serviceGetRangeClient{stream} + x := &objectServiceGetRangeClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -2602,16 +2591,16 @@ func (c *serviceClient) GetRange(ctx context.Context, in *GetRangeRequest, opts return x, nil } -type Service_GetRangeClient interface { +type ObjectService_GetRangeClient interface { Recv() (*GetRangeResponse, error) grpc.ClientStream } -type serviceGetRangeClient struct { +type objectServiceGetRangeClient struct { grpc.ClientStream } -func (x *serviceGetRangeClient) Recv() (*GetRangeResponse, error) { +func (x *objectServiceGetRangeClient) Recv() (*GetRangeResponse, error) { m := new(GetRangeResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err @@ -2619,30 +2608,30 @@ func (x *serviceGetRangeClient) Recv() (*GetRangeResponse, error) { return m, nil } -func (c *serviceClient) GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc.CallOption) (*GetRangeHashResponse, error) { +func (c *objectServiceClient) GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc.CallOption) (*GetRangeHashResponse, error) { out := new(GetRangeHashResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.object.Service/GetRangeHash", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/GetRangeHash", in, out, opts...) if err != nil { return nil, err } return out, nil } -// ServiceServer is the server API for Service service. -type ServiceServer interface { +// ObjectServiceServer is the server API for ObjectService service. +type ObjectServiceServer interface { // Get the object from container. Response uses gRPC stream. First response // message carry object of requested address. Chunk messages are parts of // the object's payload if it is needed. All messages except first carry // chunks. Requested object can be restored by concatenation of object // message payload and all chunks keeping receiving order. - Get(*GetRequest, Service_GetServer) error + Get(*GetRequest, ObjectService_GetServer) error // Put the object into container. Request uses gRPC stream. First message // SHOULD BE type of PutHeader. Container id and Owner id of object SHOULD // BE set. Session token SHOULD BE obtained before put operation (see // session package). Chunk messages considered by server as part of object // payload. All messages except first SHOULD BE chunks. Chunk messages // SHOULD BE sent in direct order of fragmentation. - Put(Service_PutServer) error + Put(ObjectService_PutServer) error // Delete the object from a container Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) // Head returns the object without data payload. Object in the @@ -2652,11 +2641,11 @@ type ServiceServer interface { // Search objects in container. Version of query language format SHOULD BE // set to 1. Search query represented in serialized format (see query // package). - Search(*SearchRequest, Service_SearchServer) error + Search(*SearchRequest, ObjectService_SearchServer) error // GetRange of data payload. Range is a pair (offset, length). // Requested range can be restored by concatenation of all chunks // keeping receiving order. - GetRange(*GetRangeRequest, Service_GetRangeServer) error + GetRange(*GetRangeRequest, ObjectService_GetRangeServer) error // GetRangeHash returns homomorphic hash of object payload range after XOR // operation. Ranges are set of pairs (offset, length). Hashes order in // response corresponds to ranges order in request. Homomorphic hash is @@ -2664,76 +2653,76 @@ type ServiceServer interface { GetRangeHash(context.Context, *GetRangeHashRequest) (*GetRangeHashResponse, error) } -// UnimplementedServiceServer can be embedded to have forward compatible implementations. -type UnimplementedServiceServer struct { +// UnimplementedObjectServiceServer can be embedded to have forward compatible implementations. +type UnimplementedObjectServiceServer struct { } -func (*UnimplementedServiceServer) Get(req *GetRequest, srv Service_GetServer) error { +func (*UnimplementedObjectServiceServer) Get(req *GetRequest, srv ObjectService_GetServer) error { return status.Errorf(codes.Unimplemented, "method Get not implemented") } -func (*UnimplementedServiceServer) Put(srv Service_PutServer) error { +func (*UnimplementedObjectServiceServer) Put(srv ObjectService_PutServer) error { return status.Errorf(codes.Unimplemented, "method Put not implemented") } -func (*UnimplementedServiceServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { +func (*UnimplementedObjectServiceServer) Delete(ctx context.Context, req *DeleteRequest) (*DeleteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") } -func (*UnimplementedServiceServer) Head(ctx context.Context, req *HeadRequest) (*HeadResponse, error) { +func (*UnimplementedObjectServiceServer) Head(ctx context.Context, req *HeadRequest) (*HeadResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Head not implemented") } -func (*UnimplementedServiceServer) Search(req *SearchRequest, srv Service_SearchServer) error { +func (*UnimplementedObjectServiceServer) Search(req *SearchRequest, srv ObjectService_SearchServer) error { return status.Errorf(codes.Unimplemented, "method Search not implemented") } -func (*UnimplementedServiceServer) GetRange(req *GetRangeRequest, srv Service_GetRangeServer) error { +func (*UnimplementedObjectServiceServer) GetRange(req *GetRangeRequest, srv ObjectService_GetRangeServer) error { return status.Errorf(codes.Unimplemented, "method GetRange not implemented") } -func (*UnimplementedServiceServer) GetRangeHash(ctx context.Context, req *GetRangeHashRequest) (*GetRangeHashResponse, error) { +func (*UnimplementedObjectServiceServer) GetRangeHash(ctx context.Context, req *GetRangeHashRequest) (*GetRangeHashResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetRangeHash not implemented") } -func RegisterServiceServer(s *grpc.Server, srv ServiceServer) { - s.RegisterService(&_Service_serviceDesc, srv) +func RegisterObjectServiceServer(s *grpc.Server, srv ObjectServiceServer) { + s.RegisterService(&_ObjectService_serviceDesc, srv) } -func _Service_Get_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_Get_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(GetRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ServiceServer).Get(m, &serviceGetServer{stream}) + return srv.(ObjectServiceServer).Get(m, &objectServiceGetServer{stream}) } -type Service_GetServer interface { +type ObjectService_GetServer interface { Send(*GetResponse) error grpc.ServerStream } -type serviceGetServer struct { +type objectServiceGetServer struct { grpc.ServerStream } -func (x *serviceGetServer) Send(m *GetResponse) error { +func (x *objectServiceGetServer) Send(m *GetResponse) error { return x.ServerStream.SendMsg(m) } -func _Service_Put_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(ServiceServer).Put(&servicePutServer{stream}) +func _ObjectService_Put_Handler(srv interface{}, stream grpc.ServerStream) error { + return srv.(ObjectServiceServer).Put(&objectServicePutServer{stream}) } -type Service_PutServer interface { +type ObjectService_PutServer interface { SendAndClose(*PutResponse) error Recv() (*PutRequest, error) grpc.ServerStream } -type servicePutServer struct { +type objectServicePutServer struct { grpc.ServerStream } -func (x *servicePutServer) SendAndClose(m *PutResponse) error { +func (x *objectServicePutServer) SendAndClose(m *PutResponse) error { return x.ServerStream.SendMsg(m) } -func (x *servicePutServer) Recv() (*PutRequest, error) { +func (x *objectServicePutServer) Recv() (*PutRequest, error) { m := new(PutRequest) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err @@ -2741,138 +2730,138 @@ func (x *servicePutServer) Recv() (*PutRequest, error) { return m, nil } -func _Service_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).Delete(ctx, in) + return srv.(ObjectServiceServer).Delete(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.object.Service/Delete", + FullMethod: "/neo.fs.v2.object.ObjectService/Delete", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).Delete(ctx, req.(*DeleteRequest)) + return srv.(ObjectServiceServer).Delete(ctx, req.(*DeleteRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_Head_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_Head_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(HeadRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).Head(ctx, in) + return srv.(ObjectServiceServer).Head(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.object.Service/Head", + FullMethod: "/neo.fs.v2.object.ObjectService/Head", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).Head(ctx, req.(*HeadRequest)) + return srv.(ObjectServiceServer).Head(ctx, req.(*HeadRequest)) } return interceptor(ctx, in, info, handler) } -func _Service_Search_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_Search_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(SearchRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ServiceServer).Search(m, &serviceSearchServer{stream}) + return srv.(ObjectServiceServer).Search(m, &objectServiceSearchServer{stream}) } -type Service_SearchServer interface { +type ObjectService_SearchServer interface { Send(*SearchResponse) error grpc.ServerStream } -type serviceSearchServer struct { +type objectServiceSearchServer struct { grpc.ServerStream } -func (x *serviceSearchServer) Send(m *SearchResponse) error { +func (x *objectServiceSearchServer) Send(m *SearchResponse) error { return x.ServerStream.SendMsg(m) } -func _Service_GetRange_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_GetRange_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(GetRangeRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ServiceServer).GetRange(m, &serviceGetRangeServer{stream}) + return srv.(ObjectServiceServer).GetRange(m, &objectServiceGetRangeServer{stream}) } -type Service_GetRangeServer interface { +type ObjectService_GetRangeServer interface { Send(*GetRangeResponse) error grpc.ServerStream } -type serviceGetRangeServer struct { +type objectServiceGetRangeServer struct { grpc.ServerStream } -func (x *serviceGetRangeServer) Send(m *GetRangeResponse) error { +func (x *objectServiceGetRangeServer) Send(m *GetRangeResponse) error { return x.ServerStream.SendMsg(m) } -func _Service_GetRangeHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_GetRangeHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetRangeHashRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(ServiceServer).GetRangeHash(ctx, in) + return srv.(ObjectServiceServer).GetRangeHash(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.object.Service/GetRangeHash", + FullMethod: "/neo.fs.v2.object.ObjectService/GetRangeHash", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ServiceServer).GetRangeHash(ctx, req.(*GetRangeHashRequest)) + return srv.(ObjectServiceServer).GetRangeHash(ctx, req.(*GetRangeHashRequest)) } return interceptor(ctx, in, info, handler) } -var _Service_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neo.fs.v2.object.Service", - HandlerType: (*ServiceServer)(nil), +var _ObjectService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neo.fs.v2.object.ObjectService", + HandlerType: (*ObjectServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Delete", - Handler: _Service_Delete_Handler, + Handler: _ObjectService_Delete_Handler, }, { MethodName: "Head", - Handler: _Service_Head_Handler, + Handler: _ObjectService_Head_Handler, }, { MethodName: "GetRangeHash", - Handler: _Service_GetRangeHash_Handler, + Handler: _ObjectService_GetRangeHash_Handler, }, }, Streams: []grpc.StreamDesc{ { StreamName: "Get", - Handler: _Service_Get_Handler, + Handler: _ObjectService_Get_Handler, ServerStreams: true, }, { StreamName: "Put", - Handler: _Service_Put_Handler, + Handler: _ObjectService_Put_Handler, ClientStreams: true, }, { StreamName: "Search", - Handler: _Service_Search_Handler, + Handler: _ObjectService_Search_Handler, ServerStreams: true, }, { StreamName: "GetRange", - Handler: _Service_GetRange_Handler, + Handler: _ObjectService_GetRange_Handler, ServerStreams: true, }, }, @@ -4116,17 +4105,24 @@ func (m *SearchRequest_Body) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Query != nil { - { - size, err := m.Query.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.Filters) > 0 { + for iNdEx := len(m.Filters) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Filters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintService(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintService(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x1a } + } + if m.Version != 0 { + i = encodeVarintService(dAtA, i, uint64(m.Version)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } if m.ContainerId != nil { { @@ -4143,7 +4139,7 @@ func (m *SearchRequest_Body) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SearchRequest_Body_Query) Marshal() (dAtA []byte, err error) { +func (m *SearchRequest_Body_Filter) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4153,58 +4149,12 @@ func (m *SearchRequest_Body_Query) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SearchRequest_Body_Query) MarshalTo(dAtA []byte) (int, error) { +func (m *SearchRequest_Body_Filter) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SearchRequest_Body_Query) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Filters) > 0 { - for iNdEx := len(m.Filters) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Filters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintService(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Version != 0 { - i = encodeVarintService(dAtA, i, uint64(m.Version)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *SearchRequest_Body_Query_Filter) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *SearchRequest_Body_Query_Filter) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SearchRequest_Body_Query_Filter) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SearchRequest_Body_Filter) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -5332,22 +5282,6 @@ func (m *SearchRequest_Body) Size() (n int) { l = m.ContainerId.Size() n += 1 + l + sovService(uint64(l)) } - if m.Query != nil { - l = m.Query.Size() - n += 1 + l + sovService(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *SearchRequest_Body_Query) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l if m.Version != 0 { n += 1 + sovService(uint64(m.Version)) } @@ -5363,7 +5297,7 @@ func (m *SearchRequest_Body_Query) Size() (n int) { return n } -func (m *SearchRequest_Body_Query_Filter) Size() (n int) { +func (m *SearchRequest_Body_Filter) Size() (n int) { if m == nil { return 0 } @@ -8556,96 +8490,6 @@ func (m *SearchRequest_Body) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowService - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthService - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthService - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Query == nil { - m.Query = &SearchRequest_Body_Query{} - } - if err := m.Query.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipService(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthService - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthService - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *SearchRequest_Body_Query) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowService - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Query: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Query: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Version", wireType) } @@ -8664,7 +8508,7 @@ func (m *SearchRequest_Body_Query) Unmarshal(dAtA []byte) error { break } } - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Filters", wireType) } @@ -8693,7 +8537,7 @@ func (m *SearchRequest_Body_Query) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, &SearchRequest_Body_Query_Filter{}) + m.Filters = append(m.Filters, &SearchRequest_Body_Filter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8723,7 +8567,7 @@ func (m *SearchRequest_Body_Query) Unmarshal(dAtA []byte) error { } return nil } -func (m *SearchRequest_Body_Query_Filter) Unmarshal(dAtA []byte) error { +func (m *SearchRequest_Body_Filter) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8766,7 +8610,7 @@ func (m *SearchRequest_Body_Query_Filter) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.MatchType |= SearchRequest_Body_Query_Filter_MatchType(b&0x7F) << shift + m.MatchType |= SearchRequest_Body_Filter_MatchType(b&0x7F) << shift if b < 0x80 { break } diff --git a/v2/object/types.pb.go b/v2/object/types.pb.go index 0f083d33..a3712b5d 100644 --- a/v2/object/types.pb.go +++ b/v2/object/types.pb.go @@ -56,6 +56,7 @@ func (ObjectType) EnumDescriptor() ([]byte, []int) { return fileDescriptor_fcb9e8df342f43c6, []int{0} } +// Object Headers type Header struct { // Object's container ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -70,14 +71,16 @@ type Header struct { // 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown PayloadLength uint64 `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"` // Hash of payload bytes - PayloadHash []byte `protobuf:"bytes,6,opt,name=payload_hash,json=payloadHash,proto3" json:"payload_hash,omitempty"` - ObjectType ObjectType `protobuf:"varint,7,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"` + PayloadHash []byte `protobuf:"bytes,6,opt,name=payload_hash,json=payloadHash,proto3" json:"payload_hash,omitempty"` + // Special object type + ObjectType ObjectType `protobuf:"varint,7,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"` // Homomorphic hash of the object payload. HomomorphicHash []byte `protobuf:"bytes,8,opt,name=homomorphic_hash,json=homomorphicHash,proto3" json:"homomorphic_hash,omitempty"` // Session token, if it was used during Object creation. // Need it to verify integrity and authenticity out of Request scope. SessionToken *service.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` - Attributes []*Header_Attribute `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"` + // User-defined object attributes + Attributes []*Header_Attribute `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"` // Position of the object in the split hierarchy. Split *Header_Split `protobuf:"bytes,11,opt,name=split,proto3" json:"split,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -430,52 +433,52 @@ func init() { func init() { proto.RegisterFile("v2/object/types.proto", fileDescriptor_fcb9e8df342f43c6) } var fileDescriptor_fcb9e8df342f43c6 = []byte{ - // 718 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6e, 0xda, 0x48, - 0x14, 0xc6, 0x63, 0x08, 0xff, 0x8e, 0x21, 0xf1, 0xce, 0xee, 0x2a, 0x16, 0xbb, 0x62, 0xd9, 0x48, - 0x2b, 0xb1, 0xbb, 0x8a, 0x59, 0x11, 0xf6, 0xa6, 0x55, 0x2a, 0x91, 0x86, 0x12, 0xa4, 0x34, 0x44, - 0x03, 0xe9, 0x45, 0x6f, 0x90, 0xb1, 0x07, 0xec, 0x06, 0x3c, 0x96, 0xc7, 0x38, 0xe2, 0x4d, 0xfa, - 0x0c, 0x95, 0x7a, 0xd3, 0x97, 0x68, 0x2f, 0xfb, 0x08, 0x55, 0xfa, 0x22, 0x95, 0x67, 0xc6, 0x86, - 0x26, 0x4d, 0xda, 0x2b, 0x7b, 0x3e, 0xff, 0xbe, 0x73, 0xe6, 0x9c, 0x39, 0x63, 0xf8, 0x35, 0x6a, - 0x35, 0xe9, 0xe4, 0x15, 0xb1, 0xc2, 0x66, 0xb8, 0xf2, 0x09, 0x33, 0xfc, 0x80, 0x86, 0x14, 0x69, - 0x1e, 0xa1, 0xc6, 0x94, 0x19, 0x51, 0xcb, 0x10, 0x5f, 0xab, 0x3f, 0x47, 0xad, 0x66, 0x40, 0xa6, - 0x6c, 0x13, 0xab, 0xc6, 0x6e, 0x46, 0x82, 0xc8, 0xb5, 0x48, 0x73, 0x41, 0x42, 0x53, 0xca, 0x7b, - 0x1b, 0x72, 0x44, 0x02, 0x77, 0xba, 0x12, 0x1f, 0xf6, 0xdf, 0x15, 0x20, 0x7f, 0x4a, 0x4c, 0x9b, - 0x04, 0xe8, 0x09, 0x94, 0x2d, 0xea, 0x85, 0xa6, 0xeb, 0x91, 0x60, 0xec, 0xda, 0xba, 0x52, 0x57, - 0x1a, 0x6a, 0xeb, 0x37, 0x63, 0x9d, 0x38, 0xce, 0x66, 0x3c, 0x4d, 0x98, 0xfe, 0x09, 0x56, 0x53, - 0x43, 0xdf, 0x46, 0x2d, 0x28, 0xd2, 0x6b, 0xe9, 0xcd, 0x70, 0xef, 0xde, 0x6d, 0xef, 0xe0, 0x5a, - 0xf8, 0x0a, 0x1c, 0xec, 0xdb, 0xe8, 0x2f, 0xd8, 0xb1, 0x02, 0x62, 0x86, 0x2e, 0xf5, 0xc6, 0xc4, - 0xa7, 0x96, 0xa3, 0x67, 0xeb, 0x4a, 0x63, 0x1b, 0x57, 0x12, 0xb5, 0x1b, 0x8b, 0xa8, 0x0d, 0x85, - 0x88, 0x04, 0xcc, 0xa5, 0x9e, 0xbe, 0xcd, 0x23, 0x57, 0x37, 0x22, 0xcb, 0xba, 0x8c, 0x17, 0x82, - 0xc0, 0x09, 0x1a, 0x07, 0xf7, 0xcd, 0xd5, 0x9c, 0x9a, 0xf6, 0x78, 0x4e, 0xbc, 0x59, 0xe8, 0xe8, - 0x39, 0x11, 0x5c, 0xaa, 0x67, 0x5c, 0x44, 0x7f, 0x42, 0x39, 0xc1, 0x1c, 0x93, 0x39, 0x7a, 0xbe, - 0xae, 0x34, 0xca, 0x58, 0x95, 0xda, 0xa9, 0xc9, 0x1c, 0x74, 0x04, 0xaa, 0x68, 0xfa, 0x38, 0xee, - 0xb5, 0x5e, 0xa8, 0x2b, 0x8d, 0x9d, 0xd6, 0xef, 0xc6, 0xed, 0x23, 0x31, 0x06, 0xfc, 0x31, 0x5a, - 0xf9, 0x04, 0x03, 0x4d, 0xdf, 0xd1, 0xdf, 0xa0, 0x39, 0x74, 0x41, 0x17, 0x34, 0xf0, 0x1d, 0xd7, - 0x12, 0x59, 0x8a, 0x3c, 0xcb, 0xee, 0x86, 0xce, 0x33, 0x9d, 0x40, 0x85, 0x11, 0x16, 0x6f, 0x7f, - 0x1c, 0xd2, 0x2b, 0xe2, 0xe9, 0x25, 0x5e, 0xef, 0x1f, 0xdf, 0xa8, 0x77, 0x28, 0xb8, 0x51, 0x8c, - 0xe1, 0x32, 0xdb, 0x58, 0xa1, 0x63, 0x00, 0x33, 0x0c, 0x03, 0x77, 0xb2, 0x0c, 0x09, 0xd3, 0xa1, - 0x9e, 0x6d, 0xa8, 0xad, 0xfd, 0xbb, 0xdb, 0x15, 0x07, 0x6f, 0x74, 0x12, 0x14, 0x6f, 0xb8, 0x50, - 0x1b, 0x72, 0xcc, 0x9f, 0xbb, 0xa1, 0xae, 0xf2, 0x1d, 0xd4, 0xee, 0xb5, 0x0f, 0x63, 0x0a, 0x0b, - 0xb8, 0x7a, 0x08, 0xa5, 0x34, 0x1c, 0xd2, 0x20, 0x7b, 0x45, 0x56, 0x7c, 0x90, 0x4a, 0x38, 0x7e, - 0x45, 0xbf, 0x40, 0x2e, 0x32, 0xe7, 0x4b, 0xc2, 0x07, 0xa4, 0x84, 0xc5, 0xa2, 0xfa, 0x36, 0x03, - 0x39, 0x1e, 0x05, 0xfd, 0x07, 0x79, 0xdf, 0x0c, 0x88, 0x17, 0xca, 0xe9, 0xd3, 0xef, 0x4c, 0x10, - 0x4f, 0xdd, 0x3f, 0xc1, 0x92, 0x43, 0x6d, 0x28, 0xfa, 0x01, 0x89, 0x5c, 0xba, 0x64, 0x72, 0xea, - 0xee, 0xf7, 0xa4, 0x24, 0xea, 0x81, 0x26, 0xfc, 0x63, 0xe6, 0xce, 0x3c, 0x33, 0x5c, 0x06, 0x84, - 0x4f, 0x9e, 0xfa, 0xd5, 0xa9, 0xa6, 0x9d, 0x4e, 0x18, 0xbc, 0x2b, 0x5c, 0xa9, 0x80, 0x8e, 0xa0, - 0x22, 0x03, 0x39, 0xbc, 0x1b, 0x72, 0x3e, 0xf5, 0xfb, 0xba, 0x85, 0xcb, 0x02, 0x97, 0x77, 0xae, - 0x0d, 0x45, 0xcb, 0x71, 0xe7, 0x76, 0x40, 0x3c, 0x3d, 0xc7, 0x8f, 0xe9, 0x81, 0xdd, 0x27, 0xe4, - 0xfe, 0x7b, 0x05, 0xf2, 0x42, 0x46, 0xff, 0x43, 0x49, 0x4e, 0x66, 0x7a, 0x63, 0x1f, 0x88, 0x20, - 0xd0, 0xbe, 0x8d, 0x1e, 0x41, 0x69, 0x5d, 0x78, 0xe6, 0x07, 0x0a, 0x5f, 0xe3, 0xf1, 0x19, 0xc9, - 0x5a, 0xb3, 0xdf, 0xa9, 0x55, 0x72, 0x48, 0x87, 0x82, 0xbc, 0x4d, 0xbc, 0x3d, 0x65, 0x9c, 0x2c, - 0xff, 0x79, 0x0c, 0xb0, 0xbe, 0x33, 0x48, 0x85, 0x02, 0xee, 0xf6, 0x2e, 0xcf, 0x3a, 0x58, 0xdb, - 0x42, 0x15, 0x28, 0x8d, 0x06, 0xcf, 0x8f, 0x87, 0xa3, 0xc1, 0x79, 0x57, 0x53, 0xd0, 0x4f, 0x50, - 0x19, 0x8e, 0x06, 0xb8, 0xd3, 0xeb, 0x8e, 0x7b, 0x78, 0x70, 0x79, 0xa1, 0x65, 0x8e, 0x2f, 0x3e, - 0xdc, 0xd4, 0x94, 0x8f, 0x37, 0x35, 0xe5, 0xd3, 0x4d, 0x4d, 0x79, 0xfd, 0xb9, 0xb6, 0xf5, 0xf2, - 0xdf, 0x99, 0x1b, 0x3a, 0xcb, 0x89, 0x61, 0xd1, 0x45, 0xd3, 0x63, 0xbe, 0x65, 0x1d, 0xd8, 0x24, - 0x6a, 0x7a, 0x84, 0x4e, 0xd9, 0x81, 0xe9, 0xbb, 0x07, 0x33, 0xda, 0x4c, 0xff, 0xae, 0x6f, 0x32, - 0xda, 0x39, 0xa1, 0xcf, 0x86, 0x46, 0xe7, 0xa2, 0x2f, 0x5b, 0x34, 0xc9, 0xf3, 0x9f, 0xe2, 0xe1, - 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xd0, 0xe4, 0x6c, 0x84, 0x05, 0x00, 0x00, + // 720 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xc7, 0xeb, 0xa4, 0xf9, 0x37, 0x4e, 0xda, 0xfc, 0xb6, 0x3f, 0x54, 0x2b, 0xa0, 0x10, 0x2a, + 0x21, 0x05, 0xa4, 0x3a, 0xc8, 0x0d, 0x17, 0xaa, 0x22, 0xa5, 0x34, 0xa4, 0x91, 0x4a, 0x53, 0x6d, + 0x52, 0x0e, 0xbd, 0x44, 0x8e, 0xbd, 0x89, 0x4d, 0x13, 0xaf, 0xe5, 0x75, 0x5c, 0xe5, 0x4d, 0x78, + 0x06, 0x24, 0x2e, 0xbc, 0x04, 0x1c, 0x79, 0x04, 0x54, 0x5e, 0x04, 0x79, 0xd7, 0x76, 0x42, 0x4b, + 0x0b, 0x27, 0x7b, 0xbf, 0xfe, 0x7c, 0x67, 0x76, 0x66, 0x67, 0x0d, 0x0f, 0x02, 0xad, 0x41, 0x47, + 0x1f, 0x88, 0xe1, 0x37, 0xfc, 0x85, 0x4b, 0x98, 0xea, 0x7a, 0xd4, 0xa7, 0xa8, 0xec, 0x10, 0xaa, + 0x8e, 0x99, 0x1a, 0x68, 0xaa, 0xf8, 0x5a, 0xd9, 0x0a, 0xb4, 0x86, 0x47, 0xc6, 0x6c, 0x15, 0xab, + 0x84, 0x6e, 0x46, 0xbc, 0xc0, 0x36, 0x48, 0x63, 0x46, 0x7c, 0x3d, 0x92, 0xb7, 0x57, 0xe4, 0x80, + 0x78, 0xf6, 0x78, 0x21, 0x3e, 0xec, 0x7c, 0xc9, 0x41, 0xf6, 0x98, 0xe8, 0x26, 0xf1, 0xd0, 0x6b, + 0x28, 0x1a, 0xd4, 0xf1, 0x75, 0xdb, 0x21, 0xde, 0xd0, 0x36, 0x15, 0xa9, 0x26, 0xd5, 0x65, 0xed, + 0xa1, 0xba, 0x4c, 0x1c, 0x66, 0x53, 0xdf, 0xc4, 0x4c, 0xf7, 0x08, 0xcb, 0x89, 0xa1, 0x6b, 0x22, + 0x0d, 0xf2, 0xf4, 0x2a, 0xf2, 0xa6, 0xb8, 0x77, 0xfb, 0xa6, 0xb7, 0x77, 0x25, 0x7c, 0x39, 0x0e, + 0x76, 0x4d, 0xf4, 0x14, 0x36, 0x0c, 0x8f, 0xe8, 0xbe, 0x4d, 0x9d, 0x21, 0x71, 0xa9, 0x61, 0x29, + 0xe9, 0x9a, 0x54, 0x5f, 0xc7, 0xa5, 0x58, 0x6d, 0x87, 0x22, 0x6a, 0x42, 0x2e, 0x20, 0x1e, 0xb3, + 0xa9, 0xa3, 0xac, 0xf3, 0xc8, 0x95, 0x95, 0xc8, 0x51, 0x5d, 0xea, 0x7b, 0x41, 0xe0, 0x18, 0x0d, + 0x83, 0xbb, 0xfa, 0x62, 0x4a, 0x75, 0x73, 0x38, 0x25, 0xce, 0xc4, 0xb7, 0x94, 0x8c, 0x08, 0x1e, + 0xa9, 0x27, 0x5c, 0x44, 0x4f, 0xa0, 0x18, 0x63, 0x96, 0xce, 0x2c, 0x25, 0x5b, 0x93, 0xea, 0x45, + 0x2c, 0x47, 0xda, 0xb1, 0xce, 0x2c, 0x74, 0x00, 0xb2, 0x68, 0xfa, 0x30, 0xec, 0xb5, 0x92, 0xab, + 0x49, 0xf5, 0x0d, 0xed, 0x91, 0x7a, 0xf3, 0x48, 0xd4, 0x1e, 0x7f, 0x0c, 0x16, 0x2e, 0xc1, 0x40, + 0x93, 0x77, 0xf4, 0x0c, 0xca, 0x16, 0x9d, 0xd1, 0x19, 0xf5, 0x5c, 0xcb, 0x36, 0x44, 0x96, 0x3c, + 0xcf, 0xb2, 0xb9, 0xa2, 0xf3, 0x4c, 0x47, 0x50, 0x62, 0x84, 0x85, 0xdb, 0x1f, 0xfa, 0xf4, 0x92, + 0x38, 0x4a, 0x81, 0xd7, 0xfb, 0xf8, 0x0f, 0xf5, 0xf6, 0x05, 0x37, 0x08, 0x31, 0x5c, 0x64, 0x2b, + 0x2b, 0x74, 0x08, 0xa0, 0xfb, 0xbe, 0x67, 0x8f, 0xe6, 0x3e, 0x61, 0x0a, 0xd4, 0xd2, 0x75, 0x59, + 0xdb, 0xb9, 0xbd, 0x5d, 0x71, 0xf0, 0x6a, 0x2b, 0x46, 0xf1, 0x8a, 0x0b, 0x35, 0x21, 0xc3, 0xdc, + 0xa9, 0xed, 0x2b, 0x32, 0xdf, 0x41, 0xf5, 0x4e, 0x7b, 0x3f, 0xa4, 0xb0, 0x80, 0x2b, 0x7b, 0x50, + 0x48, 0xc2, 0xa1, 0x32, 0xa4, 0x2f, 0xc9, 0x82, 0x0f, 0x52, 0x01, 0x87, 0xaf, 0xe8, 0x7f, 0xc8, + 0x04, 0xfa, 0x74, 0x4e, 0xf8, 0x80, 0x14, 0xb0, 0x58, 0x54, 0x3e, 0xa7, 0x20, 0xc3, 0xa3, 0xa0, + 0x17, 0x90, 0x75, 0x75, 0x8f, 0x38, 0x7e, 0x34, 0x7d, 0xca, 0xad, 0x09, 0xe2, 0xa9, 0xbb, 0x47, + 0x38, 0xe2, 0x50, 0x13, 0xf2, 0xae, 0x47, 0x02, 0x9b, 0xce, 0x59, 0x34, 0x75, 0x77, 0x7b, 0x12, + 0x12, 0x75, 0xa0, 0x2c, 0xfc, 0x43, 0x66, 0x4f, 0x1c, 0xdd, 0x9f, 0x7b, 0x84, 0x4f, 0x9e, 0xfc, + 0xdb, 0xa9, 0x26, 0x9d, 0x8e, 0x19, 0xbc, 0x29, 0x5c, 0x89, 0x80, 0x0e, 0xa0, 0x14, 0x05, 0xb2, + 0x78, 0x37, 0xa2, 0xf9, 0x54, 0xee, 0xea, 0x16, 0x2e, 0x0a, 0x3c, 0xba, 0x73, 0x4d, 0xc8, 0x1b, + 0x96, 0x3d, 0x35, 0x3d, 0xe2, 0x28, 0x19, 0x7e, 0x4c, 0xf7, 0xec, 0x3e, 0x26, 0x77, 0xbe, 0x4a, + 0x90, 0x15, 0x32, 0x7a, 0x09, 0x85, 0x68, 0x32, 0x93, 0x1b, 0x7b, 0x4f, 0x04, 0x81, 0x76, 0x4d, + 0xf4, 0x0a, 0x0a, 0xcb, 0xc2, 0x53, 0xff, 0x50, 0xf8, 0x12, 0x0f, 0xcf, 0x28, 0xaa, 0x35, 0xfd, + 0x97, 0x5a, 0x23, 0x0e, 0x29, 0x90, 0x8b, 0x6e, 0x13, 0x6f, 0x4f, 0x11, 0xc7, 0xcb, 0xe7, 0xfb, + 0x00, 0xcb, 0x3b, 0x83, 0x64, 0xc8, 0xe1, 0x76, 0xe7, 0xfc, 0xa4, 0x85, 0xcb, 0x6b, 0xa8, 0x04, + 0x85, 0x41, 0xef, 0xdd, 0x61, 0x7f, 0xd0, 0x3b, 0x6d, 0x97, 0x25, 0xf4, 0x1f, 0x94, 0xfa, 0x83, + 0x1e, 0x6e, 0x75, 0xda, 0xc3, 0x0e, 0xee, 0x9d, 0x9f, 0x95, 0x53, 0x87, 0x17, 0xdf, 0xae, 0xab, + 0xd2, 0xf7, 0xeb, 0xaa, 0xf4, 0xe3, 0xba, 0x2a, 0x7d, 0xfc, 0x59, 0x5d, 0xbb, 0xd0, 0x26, 0xb6, + 0x6f, 0xcd, 0x47, 0xaa, 0x41, 0x67, 0x0d, 0x87, 0xb9, 0x86, 0xb1, 0x6b, 0x92, 0xa0, 0xe1, 0x10, + 0x3a, 0x66, 0xbb, 0xba, 0x6b, 0xef, 0x4e, 0x68, 0x23, 0xf9, 0xbb, 0xee, 0x8b, 0xc7, 0xa7, 0xd4, + 0xd6, 0x29, 0xa1, 0x6f, 0xfb, 0x6a, 0xeb, 0xac, 0x1b, 0x56, 0x20, 0xb6, 0x33, 0xca, 0xf2, 0xdf, + 0xe3, 0xde, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x66, 0x06, 0xbc, 0x8e, 0x05, 0x00, 0x00, } func (m *Header) Marshal() (dAtA []byte, err error) { diff --git a/v2/refs/types.pb.go b/v2/refs/types.pb.go index d5ecec60..5e57a4bf 100644 --- a/v2/refs/types.pb.go +++ b/v2/refs/types.pb.go @@ -237,7 +237,7 @@ func init() { func init() { proto.RegisterFile("v2/refs/types.proto", fileDescriptor_8ea16029b13f1cfa) } var fileDescriptor_8ea16029b13f1cfa = []byte{ - // 256 bytes of a gzipped FileDescriptorProto + // 259 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x33, 0xd2, 0x2f, 0x4a, 0x4d, 0x2b, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcb, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, 0x03, 0xc9, 0x29, 0x35, 0x30, @@ -248,12 +248,13 @@ var fileDescriptor_8ea16029b13f1cfa = []byte{ 0x40, 0xd7, 0xec, 0x0f, 0x56, 0xe0, 0xe9, 0x12, 0xc4, 0x01, 0x51, 0xea, 0x99, 0xa2, 0xa4, 0xc0, 0xc5, 0x01, 0x13, 0x15, 0x12, 0xe1, 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x05, 0xdb, 0xcd, 0x13, 0x04, 0xe1, 0x28, 0x29, 0x73, 0x71, 0x23, 0x59, 0x8a, 0x43, 0x91, 0x3c, 0x17, 0xbb, 0x7f, 0x39, - 0x1e, 0x05, 0x4e, 0x3e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, - 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x9a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, + 0x1e, 0x05, 0x4e, 0x21, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, + 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x7a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x79, 0xc5, 0x05, 0xc9, 0xc9, 0xba, 0x29, 0xa9, 0x65, 0xfa, 0x79, 0xa9, 0xf9, 0x69, - 0xc5, 0xba, 0x89, 0x05, 0x99, 0xba, 0xe9, 0xf9, 0xfa, 0xd0, 0x30, 0x5c, 0xc5, 0xc4, 0xe7, 0x97, - 0x9a, 0xef, 0x16, 0xac, 0xe7, 0x18, 0xe0, 0xa9, 0x17, 0x94, 0x9a, 0x56, 0x9c, 0xc4, 0x06, 0x0e, - 0x4f, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4f, 0x72, 0xf0, 0x66, 0x01, 0x00, 0x00, + 0xc5, 0xba, 0x89, 0x05, 0x99, 0xba, 0xe9, 0xf9, 0xfa, 0xd0, 0x30, 0xb4, 0x06, 0x11, 0xab, 0x98, + 0x04, 0xfd, 0x52, 0xf3, 0xdd, 0x82, 0xf5, 0x1c, 0x03, 0x3c, 0x41, 0x1e, 0x0a, 0x4a, 0x4d, 0x2b, + 0x4e, 0x62, 0x03, 0x87, 0xab, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xa5, 0x8b, 0x04, 0x6e, + 0x01, 0x00, 0x00, } func (m *Address) Marshal() (dAtA []byte, err error) { diff --git a/v2/service/meta.pb.go b/v2/service/meta.pb.go index 88d56b36..648f7f0a 100644 --- a/v2/service/meta.pb.go +++ b/v2/service/meta.pb.go @@ -28,40 +28,44 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SessionToken_Body_Verb int32 const ( + // Unknown verb + SessionToken_Body_VERB_UNSPECIFIED SessionToken_Body_Verb = 0 // Refers to object.Put RPC call - SessionToken_Body_OBJECT_PUT SessionToken_Body_Verb = 0 + SessionToken_Body_OBJECT_PUT SessionToken_Body_Verb = 1 // Refers to object.Get RPC call - SessionToken_Body_OBJECT_GET SessionToken_Body_Verb = 1 + SessionToken_Body_OBJECT_GET SessionToken_Body_Verb = 2 // Refers to object.Head RPC call - SessionToken_Body_OBJECT_HEAD SessionToken_Body_Verb = 2 + SessionToken_Body_OBJECT_HEAD SessionToken_Body_Verb = 3 // Refers to object.Search RPC call - SessionToken_Body_OBJECT_SEARCH SessionToken_Body_Verb = 3 + SessionToken_Body_OBJECT_SEARCH SessionToken_Body_Verb = 4 // Refers to object.Delete RPC call - SessionToken_Body_OBJECT_DELETE SessionToken_Body_Verb = 4 + SessionToken_Body_OBJECT_DELETE SessionToken_Body_Verb = 5 // Refers to object.GetRange RPC call - SessionToken_Body_OBJECT_RANGE SessionToken_Body_Verb = 5 + SessionToken_Body_OBJECT_RANGE SessionToken_Body_Verb = 6 // Refers to object.GetRangeHash RPC call - SessionToken_Body_OBJECT_RANGEHASH SessionToken_Body_Verb = 6 + SessionToken_Body_OBJECT_RANGEHASH SessionToken_Body_Verb = 7 ) var SessionToken_Body_Verb_name = map[int32]string{ - 0: "OBJECT_PUT", - 1: "OBJECT_GET", - 2: "OBJECT_HEAD", - 3: "OBJECT_SEARCH", - 4: "OBJECT_DELETE", - 5: "OBJECT_RANGE", - 6: "OBJECT_RANGEHASH", + 0: "VERB_UNSPECIFIED", + 1: "OBJECT_PUT", + 2: "OBJECT_GET", + 3: "OBJECT_HEAD", + 4: "OBJECT_SEARCH", + 5: "OBJECT_DELETE", + 6: "OBJECT_RANGE", + 7: "OBJECT_RANGEHASH", } var SessionToken_Body_Verb_value = map[string]int32{ - "OBJECT_PUT": 0, - "OBJECT_GET": 1, - "OBJECT_HEAD": 2, - "OBJECT_SEARCH": 3, - "OBJECT_DELETE": 4, - "OBJECT_RANGE": 5, - "OBJECT_RANGEHASH": 6, + "VERB_UNSPECIFIED": 0, + "OBJECT_PUT": 1, + "OBJECT_GET": 2, + "OBJECT_HEAD": 3, + "OBJECT_SEARCH": 4, + "OBJECT_DELETE": 5, + "OBJECT_RANGE": 6, + "OBJECT_RANGEHASH": 7, } func (x SessionToken_Body_Verb) String() string { @@ -72,6 +76,7 @@ func (SessionToken_Body_Verb) EnumDescriptor() ([]byte, []int) { return fileDescriptor_932e020d69aee3f0, []int{3, 0, 0} } +// Extended headers for Request/Response type XHeader struct { // Key of the X-Header. Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` @@ -257,7 +262,7 @@ func (m *TokenLifetime) GetIat() uint64 { // NeoFS session token. type SessionToken struct { // Session Token body - Token *SessionToken_Body `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` + Body *SessionToken_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Signature is a signature of session token information Signature *Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -298,9 +303,9 @@ func (m *SessionToken) XXX_DiscardUnknown() { var xxx_messageInfo_SessionToken proto.InternalMessageInfo -func (m *SessionToken) GetToken() *SessionToken_Body { +func (m *SessionToken) GetBody() *SessionToken_Body { if m != nil { - return m.Token + return m.Body } return nil } @@ -312,6 +317,7 @@ func (m *SessionToken) GetSignature() *Signature { return nil } +// Session token body type SessionToken_Body struct { // ID is a token identifier. valid UUIDv4 represented in bytes Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -403,7 +409,7 @@ func (m *SessionToken_Body) GetVerb() SessionToken_Body_Verb { if m != nil { return m.Verb } - return SessionToken_Body_OBJECT_PUT + return SessionToken_Body_VERB_UNSPECIFIED } func (m *SessionToken_Body) GetLifetime() *TokenLifetime { @@ -437,7 +443,7 @@ func (*SessionToken_Body) XXX_OneofWrappers() []interface{} { // BearerToken has information about request ACL rules with limited lifetime type BearerToken struct { // Bearer Token body - Token *BearerToken_Body `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` + Body *BearerToken_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Signature of BearerToken body Signature *Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -478,9 +484,9 @@ func (m *BearerToken) XXX_DiscardUnknown() { var xxx_messageInfo_BearerToken proto.InternalMessageInfo -func (m *BearerToken) GetToken() *BearerToken_Body { +func (m *BearerToken) GetBody() *BearerToken_Body { if m != nil { - return m.Token + return m.Body } return nil } @@ -492,6 +498,7 @@ func (m *BearerToken) GetSignature() *Signature { return nil } +// Bearer Token body type BearerToken_Body struct { // EACLTable carries table of extended ACL rules EaclTable *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl_table,json=eaclTable,proto3" json:"eacl_table,omitempty"` @@ -569,9 +576,9 @@ type RequestMetaHeader struct { // Request X-Headers. XHeaders []*XHeader `protobuf:"bytes,4,rep,name=x_headers,json=xHeaders,proto3" json:"x_headers,omitempty"` // Token is a token of the session within which the request is sent - Token *SessionToken `protobuf:"bytes,5,opt,name=token,proto3" json:"token,omitempty"` + SessionToken *SessionToken `protobuf:"bytes,5,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` // Bearer is a Bearer token of the request - Bearer *BearerToken `protobuf:"bytes,6,opt,name=bearer,proto3" json:"bearer,omitempty"` + BearerToken *BearerToken `protobuf:"bytes,6,opt,name=bearer_token,json=bearerToken,proto3" json:"bearer_token,omitempty"` // RequestMetaHeader of the origin request. Origin *RequestMetaHeader `protobuf:"bytes,7,opt,name=origin,proto3" json:"origin,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -640,16 +647,16 @@ func (m *RequestMetaHeader) GetXHeaders() []*XHeader { return nil } -func (m *RequestMetaHeader) GetToken() *SessionToken { +func (m *RequestMetaHeader) GetSessionToken() *SessionToken { if m != nil { - return m.Token + return m.SessionToken } return nil } -func (m *RequestMetaHeader) GetBearer() *BearerToken { +func (m *RequestMetaHeader) GetBearerToken() *BearerToken { if m != nil { - return m.Bearer + return m.BearerToken } return nil } @@ -762,58 +769,60 @@ func init() { func init() { proto.RegisterFile("v2/service/meta.proto", fileDescriptor_932e020d69aee3f0) } var fileDescriptor_932e020d69aee3f0 = []byte{ - // 801 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x8e, 0x1b, 0x45, - 0x10, 0xde, 0xb1, 0xc7, 0xf6, 0xba, 0xbc, 0x5e, 0x66, 0x9b, 0xa0, 0x58, 0x2b, 0xe4, 0xac, 0x0c, - 0x48, 0x20, 0xb1, 0x63, 0x61, 0x08, 0x11, 0x51, 0x22, 0x61, 0xef, 0x0e, 0xf1, 0xc2, 0x92, 0x44, - 0x6d, 0x13, 0x21, 0x2e, 0xd6, 0xfc, 0x94, 0x77, 0x27, 0xf1, 0x4e, 0x9b, 0xee, 0xde, 0xc1, 0x7e, - 0x00, 0xde, 0x81, 0x67, 0xe0, 0xc6, 0x8d, 0x0b, 0x57, 0xc4, 0x91, 0x1b, 0x57, 0xb4, 0xdc, 0x78, - 0x0a, 0xd4, 0x3f, 0x4e, 0x66, 0x89, 0x97, 0x3f, 0x71, 0xc8, 0xad, 0xea, 0xeb, 0xaa, 0xaf, 0xab, - 0xaa, 0xbf, 0xa9, 0x81, 0x57, 0xf2, 0x5e, 0x57, 0x20, 0xcf, 0xd3, 0x18, 0xbb, 0x67, 0x28, 0x43, - 0x7f, 0xce, 0x99, 0x64, 0x64, 0x27, 0x43, 0xe6, 0x4f, 0x85, 0x9f, 0xf7, 0x7c, 0x7b, 0xba, 0x4b, - 0xf2, 0x5e, 0x37, 0x8c, 0x67, 0x5d, 0xb9, 0x9c, 0xa3, 0x30, 0x61, 0xbb, 0x2f, 0xe7, 0xbd, 0x2e, - 0xc7, 0xa9, 0xb8, 0x04, 0x5e, 0x2f, 0x50, 0xe6, 0xc8, 0xd3, 0xe9, 0xd2, 0x1c, 0x74, 0xde, 0x81, - 0xda, 0xe7, 0x43, 0x0c, 0x13, 0xe4, 0xc4, 0x83, 0xf2, 0x13, 0x5c, 0xb6, 0x9c, 0x3d, 0xe7, 0xcd, - 0x3a, 0x55, 0x26, 0xb9, 0x06, 0x95, 0x3c, 0x9c, 0x9d, 0x63, 0xab, 0xa4, 0x31, 0xe3, 0x74, 0x6e, - 0x42, 0xed, 0x11, 0x72, 0x91, 0xb2, 0x4c, 0x05, 0x9c, 0x85, 0x8f, 0x19, 0xd7, 0x49, 0x4d, 0x6a, - 0x1c, 0x8d, 0xa6, 0x19, 0xe3, 0x3a, 0x4d, 0xa1, 0xca, 0xe9, 0x04, 0xd0, 0x1c, 0xb3, 0x27, 0x98, - 0x1d, 0xa7, 0x53, 0x94, 0xe9, 0x19, 0xaa, 0xfb, 0x70, 0x31, 0xd7, 0xa9, 0x2e, 0x55, 0xa6, 0x42, - 0xb2, 0x68, 0xaa, 0xd3, 0x5c, 0xaa, 0x4c, 0x85, 0xa4, 0xa1, 0x6c, 0x95, 0x0d, 0x92, 0x86, 0xb2, - 0xf3, 0xa3, 0x0b, 0x5b, 0x23, 0x14, 0xea, 0x7a, 0x4d, 0x47, 0x6e, 0x43, 0x45, 0x2a, 0x43, 0x13, - 0x35, 0x7a, 0xaf, 0xfb, 0xcf, 0x8d, 0xc9, 0x2f, 0xc6, 0xfb, 0x03, 0x96, 0x2c, 0xa9, 0x49, 0x21, - 0xb7, 0xa1, 0x2e, 0xd2, 0x93, 0x2c, 0x94, 0xe7, 0xdc, 0x34, 0xd9, 0xe8, 0xbd, 0xba, 0x2e, 0x7f, - 0x15, 0x43, 0x9f, 0x85, 0xef, 0xfe, 0x50, 0x06, 0x57, 0x71, 0x91, 0x6d, 0x28, 0xa5, 0x89, 0xbe, - 0x7d, 0x8b, 0x96, 0xd2, 0x84, 0xf4, 0x60, 0x93, 0x7d, 0x95, 0x21, 0x9f, 0xa4, 0x89, 0xe5, 0xbc, - 0x5e, 0xe0, 0x54, 0x4f, 0xe3, 0x3f, 0x50, 0xe7, 0x47, 0x87, 0xb4, 0xa6, 0x03, 0x8f, 0x12, 0x72, - 0x17, 0xdc, 0x1c, 0x79, 0xa4, 0x1b, 0xdd, 0xee, 0xbd, 0xf5, 0x4f, 0x7a, 0xf0, 0x1f, 0x21, 0x8f, - 0xa8, 0x4e, 0x23, 0x77, 0x60, 0x73, 0x66, 0xc7, 0xda, 0x72, 0xf5, 0x95, 0x7b, 0x6b, 0x28, 0x2e, - 0x8d, 0x9f, 0x3e, 0xcd, 0x20, 0x37, 0xa0, 0x21, 0x0c, 0xfb, 0x44, 0x09, 0xa0, 0xa2, 0x3b, 0x01, - 0x0b, 0x7d, 0x82, 0x4b, 0xf2, 0x21, 0x6c, 0xb3, 0xe8, 0x31, 0xc6, 0x72, 0x12, 0x26, 0x09, 0x47, - 0x21, 0x5a, 0xd5, 0xf5, 0x7d, 0xf5, 0xcd, 0xf1, 0x70, 0x83, 0x36, 0x4d, 0x82, 0x05, 0x3a, 0x5f, - 0x3b, 0xe0, 0xaa, 0x7a, 0xc9, 0x36, 0xc0, 0x83, 0xc1, 0xc7, 0xc1, 0xc1, 0x78, 0xf2, 0xf0, 0xb3, - 0xb1, 0xb7, 0x51, 0xf0, 0xef, 0x05, 0x63, 0xcf, 0x21, 0x2f, 0x41, 0xc3, 0xfa, 0xc3, 0xa0, 0x7f, - 0xe8, 0x95, 0xc8, 0x0e, 0x34, 0x2d, 0x30, 0x0a, 0xfa, 0xf4, 0x60, 0xe8, 0x95, 0x0b, 0xd0, 0x61, - 0x70, 0x1c, 0x8c, 0x03, 0xcf, 0x25, 0x1e, 0x6c, 0x59, 0x88, 0xf6, 0xef, 0xdf, 0x0b, 0xbc, 0x0a, - 0xb9, 0x06, 0x5e, 0x11, 0x19, 0xf6, 0x47, 0x43, 0xaf, 0x3a, 0xa8, 0x43, 0x2d, 0x66, 0x99, 0xc4, - 0x85, 0xec, 0x7c, 0x5f, 0x82, 0xc6, 0x00, 0x43, 0x8e, 0xdc, 0xe8, 0xe8, 0x83, 0xcb, 0x3a, 0x7a, - 0x6d, 0xcd, 0x00, 0x0b, 0xe1, 0xff, 0x9b, 0x8c, 0xbe, 0x73, 0xac, 0x8c, 0x6e, 0x01, 0x60, 0x18, - 0xcf, 0x26, 0x32, 0x8c, 0x66, 0x68, 0x8b, 0x68, 0x15, 0x58, 0xc2, 0x78, 0xe6, 0x07, 0xfd, 0x83, - 0xe3, 0xb1, 0x3a, 0xa7, 0x75, 0x15, 0xab, 0xcd, 0xff, 0xa4, 0xb7, 0xa2, 0x60, 0xca, 0xff, 0x56, - 0x30, 0x9d, 0x5f, 0x4a, 0xb0, 0x43, 0xf1, 0xcb, 0x73, 0x14, 0xf2, 0x53, 0x94, 0xa1, 0xdd, 0x1f, - 0xef, 0x41, 0x2d, 0x37, 0x7b, 0xc1, 0x56, 0xbf, 0xbb, 0x86, 0xd2, 0x6e, 0x0e, 0xba, 0x0a, 0x55, - 0xcb, 0x02, 0xe7, 0x2c, 0x3e, 0xb5, 0x5f, 0xbd, 0x71, 0xd4, 0x77, 0x2f, 0xe5, 0x4c, 0x97, 0xd6, - 0xa4, 0xca, 0x24, 0xb7, 0xa0, 0xbe, 0x98, 0x9c, 0xea, 0x9b, 0x44, 0xcb, 0xdd, 0x2b, 0x5f, 0xc1, - 0x6f, 0x97, 0x19, 0xdd, 0x5c, 0x18, 0x43, 0x90, 0x9b, 0xab, 0x77, 0xad, 0xe8, 0xa2, 0x6e, 0xfc, - 0xcd, 0xb7, 0xb5, 0x7a, 0xd3, 0xf7, 0xa1, 0x1a, 0xe9, 0xe7, 0xb6, 0x5a, 0x6f, 0xff, 0xb5, 0x1e, - 0xa8, 0x8d, 0x26, 0x77, 0xa0, 0xca, 0x78, 0x7a, 0x92, 0x66, 0xad, 0xda, 0x95, 0xfb, 0xe8, 0xb9, - 0xd9, 0x51, 0x9b, 0xd3, 0xf9, 0xdd, 0x01, 0x42, 0x51, 0xcc, 0x59, 0x26, 0xf0, 0xc5, 0x1f, 0xed, - 0xdd, 0xa7, 0xbd, 0x9a, 0xd9, 0xbe, 0xb1, 0xb6, 0xd7, 0x3f, 0x77, 0xb3, 0x6a, 0x76, 0x40, 0x7f, - 0xba, 0x68, 0x3b, 0x3f, 0x5f, 0xb4, 0x9d, 0x5f, 0x2f, 0xda, 0xce, 0x37, 0xbf, 0xb5, 0x37, 0xbe, - 0x78, 0xfb, 0x24, 0x95, 0xa7, 0xe7, 0x91, 0x1f, 0xb3, 0xb3, 0x6e, 0x26, 0xe6, 0x71, 0xbc, 0x9f, - 0x60, 0xde, 0xcd, 0x90, 0x4d, 0xc5, 0x7e, 0x38, 0x4f, 0xf7, 0x4f, 0x58, 0xf7, 0xd9, 0x8f, 0xec, - 0xdb, 0xd2, 0xce, 0x7d, 0x64, 0x1f, 0x8d, 0xfc, 0xfe, 0xc3, 0x23, 0x7f, 0x64, 0xb0, 0xa8, 0xaa, - 0x7f, 0x6b, 0xef, 0xfe, 0x11, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xf8, 0x0e, 0x53, 0x44, 0x07, 0x00, - 0x00, + // 834 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x6e, 0x23, 0x45, + 0x10, 0xce, 0xd8, 0x93, 0x38, 0x2e, 0xdb, 0x61, 0xd2, 0x04, 0xad, 0x15, 0x21, 0x6f, 0x64, 0x40, + 0x82, 0x43, 0xc6, 0x62, 0x58, 0x14, 0x04, 0xbb, 0x12, 0x76, 0x3c, 0xbb, 0x36, 0x84, 0x6c, 0xd4, + 0xf6, 0x46, 0x08, 0x09, 0x59, 0xf3, 0x53, 0x4e, 0x66, 0xd7, 0x99, 0x36, 0xd3, 0x9d, 0x21, 0x7e, + 0x13, 0x24, 0xde, 0x80, 0x1b, 0x17, 0x9e, 0x81, 0x23, 0x12, 0x37, 0x4e, 0x28, 0xdc, 0xb8, 0xf1, + 0x06, 0xa8, 0x7f, 0xbc, 0x3b, 0x61, 0xbd, 0xfc, 0x89, 0x03, 0x27, 0x57, 0x7d, 0x5d, 0xf5, 0x55, + 0x57, 0xf5, 0xe7, 0x1a, 0x78, 0x25, 0xf7, 0x3a, 0x1c, 0xb3, 0x3c, 0x89, 0xb0, 0x73, 0x81, 0x22, + 0x70, 0xe7, 0x19, 0x13, 0x8c, 0x6c, 0xa7, 0xc8, 0xdc, 0x29, 0x77, 0x73, 0xcf, 0x35, 0xa7, 0xbb, + 0x24, 0xf7, 0x3a, 0x41, 0x34, 0xeb, 0x88, 0xc5, 0x1c, 0xb9, 0x0e, 0xdb, 0x7d, 0x39, 0xf7, 0x3a, + 0x19, 0x4e, 0xf9, 0x0d, 0xf0, 0x56, 0x81, 0x32, 0xc7, 0x2c, 0x99, 0x2e, 0xf4, 0x41, 0xfb, 0x6d, + 0xa8, 0x7c, 0x3a, 0xc0, 0x20, 0xc6, 0x8c, 0x38, 0x50, 0x7e, 0x82, 0x8b, 0xa6, 0xb5, 0x67, 0xbd, + 0x59, 0xa5, 0xd2, 0x24, 0x3b, 0xb0, 0x9e, 0x07, 0xb3, 0x4b, 0x6c, 0x96, 0x14, 0xa6, 0x9d, 0xf6, + 0xbb, 0x50, 0x39, 0xc5, 0x8c, 0x27, 0x2c, 0x95, 0x01, 0x17, 0xc1, 0x63, 0x96, 0xa9, 0xa4, 0x06, + 0xd5, 0x8e, 0x42, 0x93, 0x94, 0x65, 0x2a, 0x4d, 0xa2, 0xd2, 0x69, 0xfb, 0xd0, 0x18, 0xb3, 0x27, + 0x98, 0x1e, 0x25, 0x53, 0x14, 0xc9, 0x05, 0xca, 0x7a, 0x78, 0x35, 0x57, 0xa9, 0x36, 0x95, 0xa6, + 0x44, 0xd2, 0x70, 0xaa, 0xd2, 0x6c, 0x2a, 0x4d, 0x89, 0x24, 0x81, 0x68, 0x96, 0x35, 0x92, 0x04, + 0xa2, 0xfd, 0x93, 0x0d, 0xf5, 0x11, 0x72, 0x59, 0x5e, 0xd1, 0x91, 0xf7, 0xc0, 0x0e, 0x59, 0xac, + 0xef, 0x5d, 0xf3, 0x5e, 0x77, 0x9f, 0x9b, 0x92, 0x5b, 0x0c, 0x77, 0x7b, 0x2c, 0x5e, 0x50, 0x95, + 0x41, 0xde, 0x87, 0x2a, 0x4f, 0xce, 0xd2, 0x40, 0x5c, 0x66, 0xba, 0xc5, 0x9a, 0xf7, 0xea, 0xaa, + 0xf4, 0x65, 0x0c, 0x7d, 0x16, 0xbe, 0xfb, 0x63, 0x19, 0x6c, 0x49, 0x45, 0xb6, 0xa0, 0x94, 0xc4, + 0xaa, 0x78, 0x9d, 0x96, 0x92, 0x98, 0x78, 0xb0, 0xc9, 0xbe, 0x4c, 0x31, 0x9b, 0x24, 0xb1, 0xe1, + 0xbc, 0x55, 0xe0, 0x94, 0x0f, 0xe3, 0x3e, 0x94, 0xe7, 0xc3, 0x3e, 0xad, 0xa8, 0xc0, 0x61, 0x4c, + 0xee, 0x81, 0x9d, 0x63, 0x16, 0xaa, 0x36, 0xb7, 0xbc, 0xb7, 0xfe, 0x4e, 0x0b, 0xee, 0x29, 0x66, + 0x21, 0x55, 0x69, 0xe4, 0x2e, 0x6c, 0xce, 0xcc, 0x50, 0x9b, 0xb6, 0x2a, 0xb9, 0xb7, 0x82, 0xe2, + 0xc6, 0xf0, 0xe9, 0xd3, 0x0c, 0x72, 0x1b, 0x6a, 0x5c, 0xb3, 0x4f, 0xe4, 0xf3, 0xaf, 0xab, 0x4e, + 0xc0, 0x40, 0x1f, 0xe3, 0x82, 0x7c, 0x08, 0x5b, 0x2c, 0x7c, 0x8c, 0x91, 0x98, 0x04, 0x71, 0x9c, + 0x21, 0xe7, 0xcd, 0x8d, 0xd5, 0x7d, 0x75, 0xf5, 0xf1, 0x60, 0x8d, 0x36, 0x74, 0x82, 0x01, 0xda, + 0x5f, 0x5b, 0x60, 0xcb, 0xfb, 0x92, 0x1d, 0x70, 0x4e, 0x7d, 0xda, 0x9b, 0x3c, 0x3a, 0x1e, 0x9d, + 0xf8, 0x87, 0xc3, 0xfb, 0x43, 0xbf, 0xef, 0xac, 0x91, 0x2d, 0x80, 0x87, 0xbd, 0x8f, 0xfc, 0xc3, + 0xf1, 0xe4, 0xe4, 0xd1, 0xd8, 0xb1, 0x0a, 0xfe, 0x03, 0x7f, 0xec, 0x94, 0xc8, 0x4b, 0x50, 0x33, + 0xfe, 0xc0, 0xef, 0xf6, 0x9d, 0x32, 0xd9, 0x86, 0x86, 0x01, 0x46, 0x7e, 0x97, 0x1e, 0x0e, 0x1c, + 0xbb, 0x00, 0xf5, 0xfd, 0x23, 0x7f, 0xec, 0x3b, 0xeb, 0xc4, 0x81, 0xba, 0x81, 0x68, 0xf7, 0xf8, + 0x81, 0xef, 0x6c, 0xc8, 0xf2, 0x45, 0x64, 0xd0, 0x1d, 0x0d, 0x9c, 0x4a, 0xaf, 0x0a, 0x95, 0x88, + 0xa5, 0x02, 0xaf, 0x44, 0xfb, 0xbb, 0x12, 0xd4, 0x7a, 0x18, 0x64, 0x98, 0x69, 0x6d, 0x1d, 0xdc, + 0xd0, 0xd6, 0x6b, 0x2b, 0xa6, 0x5a, 0x88, 0xfe, 0xaf, 0xa4, 0xf5, 0xad, 0x65, 0xa4, 0x75, 0x00, + 0x80, 0x41, 0x34, 0x9b, 0x88, 0x20, 0x9c, 0xa1, 0xb9, 0x43, 0xb3, 0xc0, 0x12, 0x44, 0x33, 0xd7, + 0xef, 0x1e, 0x1e, 0x8d, 0xe5, 0x39, 0xad, 0xca, 0x58, 0x65, 0xfe, 0x2b, 0x0d, 0x16, 0x45, 0x54, + 0xfe, 0xa7, 0x22, 0x6a, 0xff, 0x56, 0x82, 0x6d, 0x8a, 0x5f, 0x5c, 0x22, 0x17, 0x9f, 0xa0, 0x08, + 0xcc, 0x46, 0xb9, 0x03, 0x95, 0x5c, 0x6f, 0x0a, 0x73, 0xfb, 0xdd, 0x15, 0x94, 0x66, 0x97, 0xd0, + 0x65, 0xa8, 0x5c, 0x1f, 0x38, 0x67, 0xd1, 0xb9, 0xd9, 0x03, 0xda, 0x91, 0x9b, 0x40, 0x88, 0x99, + 0xba, 0x5a, 0x83, 0x4a, 0x93, 0x1c, 0x40, 0xf5, 0x6a, 0x72, 0xae, 0x2a, 0xf1, 0xa6, 0xbd, 0x57, + 0x7e, 0x01, 0xbf, 0x59, 0x6f, 0x74, 0xf3, 0x4a, 0x1b, 0x9c, 0xf4, 0xa1, 0xb1, 0x54, 0xbc, 0x90, + 0xfd, 0x28, 0xcd, 0xd7, 0xbc, 0xdb, 0x7f, 0xf1, 0xbf, 0xa3, 0x75, 0x5e, 0xdc, 0x3b, 0x5d, 0xa8, + 0x87, 0xea, 0xf1, 0x0d, 0x89, 0xfe, 0x53, 0xb4, 0xfe, 0x5c, 0x23, 0xb4, 0x16, 0x16, 0xe4, 0x75, + 0x17, 0x36, 0x58, 0x96, 0x9c, 0x25, 0x69, 0xb3, 0xf2, 0xc2, 0xe5, 0xf5, 0xdc, 0x54, 0xa9, 0xc9, + 0x69, 0xff, 0x6a, 0x01, 0xa1, 0xc8, 0xe7, 0x2c, 0xe5, 0xf8, 0xff, 0x1f, 0xfa, 0xbd, 0xa7, 0xbd, + 0xea, 0x69, 0xbf, 0xb1, 0xb2, 0xd7, 0x3f, 0x76, 0xb3, 0x6c, 0xb6, 0xf7, 0xf9, 0xf7, 0xd7, 0x2d, + 0xeb, 0x87, 0xeb, 0x96, 0xf5, 0xf3, 0x75, 0xcb, 0xfa, 0xea, 0x97, 0xd6, 0xda, 0x67, 0x77, 0xce, + 0x12, 0x71, 0x7e, 0x19, 0xba, 0x11, 0xbb, 0xe8, 0xa4, 0x7c, 0x1e, 0x45, 0xfb, 0x31, 0xe6, 0x9d, + 0x14, 0xd9, 0x94, 0xef, 0x07, 0xf3, 0x64, 0xff, 0x8c, 0x75, 0x9e, 0x7d, 0xf4, 0x3e, 0x30, 0xbf, + 0xdf, 0x94, 0x76, 0x8e, 0x91, 0xdd, 0x1f, 0xb9, 0xdd, 0x93, 0xa1, 0xac, 0x3c, 0xd2, 0x70, 0xb8, + 0xa1, 0xbe, 0x86, 0xef, 0xfc, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xba, 0x8b, 0x7f, 0x7b, 0x07, + 0x00, 0x00, } func (m *XHeader) Marshal() (dAtA []byte, err error) { @@ -972,9 +981,9 @@ func (m *SessionToken) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.Token != nil { + if m.Body != nil { { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Body.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1123,9 +1132,9 @@ func (m *BearerToken) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.Token != nil { + if m.Body != nil { { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Body.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1237,9 +1246,9 @@ func (m *RequestMetaHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - if m.Bearer != nil { + if m.BearerToken != nil { { - size, err := m.Bearer.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.BearerToken.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1249,9 +1258,9 @@ func (m *RequestMetaHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - if m.Token != nil { + if m.SessionToken != nil { { - size, err := m.Token.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.SessionToken.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1451,8 +1460,8 @@ func (m *SessionToken) Size() (n int) { } var l int _ = l - if m.Token != nil { - l = m.Token.Size() + if m.Body != nil { + l = m.Body.Size() n += 1 + l + sovMeta(uint64(l)) } if m.Signature != nil { @@ -1517,8 +1526,8 @@ func (m *BearerToken) Size() (n int) { } var l int _ = l - if m.Token != nil { - l = m.Token.Size() + if m.Body != nil { + l = m.Body.Size() n += 1 + l + sovMeta(uint64(l)) } if m.Signature != nil { @@ -1577,12 +1586,12 @@ func (m *RequestMetaHeader) Size() (n int) { n += 1 + l + sovMeta(uint64(l)) } } - if m.Token != nil { - l = m.Token.Size() + if m.SessionToken != nil { + l = m.SessionToken.Size() n += 1 + l + sovMeta(uint64(l)) } - if m.Bearer != nil { - l = m.Bearer.Size() + if m.BearerToken != nil { + l = m.BearerToken.Size() n += 1 + l + sovMeta(uint64(l)) } if m.Origin != nil { @@ -1985,7 +1994,7 @@ func (m *SessionToken) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2012,10 +2021,10 @@ func (m *SessionToken) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Token == nil { - m.Token = &SessionToken_Body{} + if m.Body == nil { + m.Body = &SessionToken_Body{} } - if err := m.Token.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Body.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2359,7 +2368,7 @@ func (m *BearerToken) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2386,10 +2395,10 @@ func (m *BearerToken) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Token == nil { - m.Token = &BearerToken_Body{} + if m.Body == nil { + m.Body = &BearerToken_Body{} } - if err := m.Token.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Body.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2755,7 +2764,7 @@ func (m *RequestMetaHeader) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Token", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SessionToken", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2782,16 +2791,16 @@ func (m *RequestMetaHeader) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Token == nil { - m.Token = &SessionToken{} + if m.SessionToken == nil { + m.SessionToken = &SessionToken{} } - if err := m.Token.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.SessionToken.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Bearer", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BearerToken", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2818,10 +2827,10 @@ func (m *RequestMetaHeader) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Bearer == nil { - m.Bearer = &BearerToken{} + if m.BearerToken == nil { + m.BearerToken = &BearerToken{} } - if err := m.Bearer.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.BearerToken.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/v2/service/verify.pb.go b/v2/service/verify.pb.go index 34913d78..39a512be 100644 --- a/v2/service/verify.pb.go +++ b/v2/service/verify.pb.go @@ -6,6 +6,8 @@ package service import ( fmt "fmt" proto "github.com/golang/protobuf/proto" + _ "github.com/nspcc-dev/neofs-api-go/v2/acl" + _ "github.com/nspcc-dev/neofs-api-go/v2/refs" io "io" math "math" math_bits "math/bits" @@ -241,28 +243,30 @@ func init() { func init() { proto.RegisterFile("v2/service/verify.proto", fileDescriptor_848d62e0ecc8b6b6) } var fileDescriptor_848d62e0ecc8b6b6 = []byte{ - // 325 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x33, 0xd2, 0x2f, - 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x4b, 0x2d, 0xca, 0x4c, 0xab, 0xd4, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, 0x83, - 0xca, 0x2b, 0x19, 0x72, 0x71, 0x06, 0x67, 0xa6, 0xe7, 0x25, 0x96, 0x94, 0x16, 0xa5, 0x0a, 0x09, - 0x70, 0x31, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x81, 0x98, 0x42, 0x42, - 0x5c, 0x2c, 0xc5, 0x99, 0xe9, 0x79, 0x12, 0x4c, 0x60, 0x21, 0x30, 0x5b, 0x69, 0x0b, 0x13, 0x97, - 0x64, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x49, 0x18, 0xc8, 0xf4, 0xcc, 0xe4, 0xc4, 0x92, 0xcc, - 0xfc, 0x3c, 0x8f, 0xd4, 0xc4, 0x94, 0xd4, 0x22, 0x21, 0x67, 0x2e, 0xbe, 0xa4, 0xfc, 0x94, 0xca, - 0xf8, 0x62, 0x98, 0xa9, 0x60, 0xe3, 0xb8, 0x8d, 0x64, 0xf4, 0x30, 0x2c, 0xd7, 0x83, 0xdb, 0x1c, - 0xc4, 0x0b, 0xd2, 0x83, 0x70, 0x88, 0x33, 0x17, 0x5f, 0x6e, 0x6a, 0x49, 0x22, 0x92, 0x21, 0x4c, - 0xc4, 0x18, 0x02, 0xd2, 0x83, 0x30, 0xc4, 0x9d, 0x4b, 0x20, 0xbf, 0x28, 0x33, 0x3d, 0x33, 0x0f, - 0xc9, 0x18, 0x66, 0x22, 0x8c, 0xe1, 0x87, 0xe8, 0x42, 0x18, 0xe4, 0xc2, 0xc5, 0x06, 0x11, 0x92, - 0x60, 0x01, 0x6b, 0xd7, 0xc1, 0xa2, 0x1d, 0x67, 0x80, 0x04, 0x41, 0xf5, 0x2a, 0x6d, 0x63, 0xe2, - 0x92, 0x0a, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x1d, 0x19, 0xe1, 0xe6, 0x8a, 0x16, 0x6e, - 0xba, 0x58, 0xc3, 0x0d, 0x57, 0x88, 0xc0, 0x02, 0xce, 0x29, 0xe8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, - 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x27, 0x3d, 0xb3, - 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0xaf, 0xb8, 0x20, 0x39, 0x59, 0x37, 0x25, - 0xb5, 0x4c, 0x3f, 0x2f, 0x35, 0x3f, 0xad, 0x58, 0x37, 0xb1, 0x20, 0x53, 0x37, 0x3d, 0x5f, 0x1f, - 0x91, 0x05, 0x56, 0x31, 0x09, 0xfa, 0xa5, 0xe6, 0xbb, 0x05, 0xeb, 0x39, 0x06, 0x78, 0xea, 0x05, - 0x43, 0xc4, 0x92, 0xd8, 0xc0, 0x19, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x93, 0x01, 0xa7, - 0xcb, 0x2b, 0x03, 0x00, 0x00, + // 353 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0x4f, 0x4b, 0xc3, 0x30, + 0x18, 0xc6, 0x6d, 0x37, 0x06, 0x46, 0x9d, 0xb3, 0x0a, 0xce, 0x21, 0x45, 0x76, 0xf2, 0x60, 0x13, + 0xac, 0xde, 0x3c, 0xe9, 0xfc, 0x7b, 0x11, 0xe9, 0xc0, 0x83, 0x20, 0xd2, 0x75, 0x6f, 0x6b, 0xd0, + 0x25, 0x35, 0xc9, 0x02, 0xfd, 0x26, 0x7e, 0x06, 0xcf, 0xe2, 0x67, 0xf0, 0xe8, 0x47, 0x90, 0xf9, + 0x45, 0xa4, 0xed, 0x66, 0x87, 0x6e, 0xb0, 0xbb, 0xa7, 0xbc, 0x3c, 0xc9, 0xf3, 0xcb, 0xc3, 0x03, + 0x2f, 0x5a, 0xd7, 0x2e, 0x91, 0x20, 0x34, 0x0d, 0x80, 0x68, 0x10, 0x34, 0x4c, 0x70, 0x2c, 0xb8, + 0xe2, 0xd6, 0x0a, 0x03, 0x8e, 0x43, 0x89, 0xb5, 0x8b, 0x87, 0xf7, 0x0d, 0x4b, 0xbb, 0xc4, 0x0f, + 0x1e, 0x89, 0x4a, 0x62, 0x90, 0xf9, 0xb3, 0xc6, 0xaa, 0x76, 0x89, 0x80, 0x50, 0x8e, 0x8b, 0xcd, + 0x5d, 0x34, 0xdf, 0xa6, 0x11, 0xf3, 0x55, 0x5f, 0x80, 0x55, 0x43, 0xa5, 0x07, 0x48, 0xea, 0xc6, + 0x96, 0xb1, 0xbd, 0xe8, 0xa5, 0xa3, 0x65, 0xa1, 0xb2, 0xa4, 0x11, 0xab, 0x9b, 0x99, 0x94, 0xcd, + 0xcd, 0x57, 0x13, 0x6d, 0x78, 0xf0, 0xd4, 0x07, 0xa9, 0xae, 0xd3, 0x18, 0x34, 0xf0, 0x15, 0xe5, + 0xec, 0x1c, 0xfc, 0x2e, 0x08, 0xab, 0x85, 0xaa, 0x1d, 0xde, 0x4d, 0xee, 0xe4, 0x88, 0x9a, 0xe1, + 0x16, 0xdc, 0x4d, 0xfc, 0x27, 0x25, 0xfe, 0xf9, 0xd9, 0x5b, 0x4a, 0x3d, 0x45, 0x90, 0x16, 0xaa, + 0xf6, 0x40, 0xf9, 0x63, 0x10, 0x73, 0x16, 0x48, 0xea, 0x29, 0x20, 0x67, 0xa8, 0xc6, 0x05, 0x8d, + 0x28, 0x1b, 0xc3, 0x94, 0x66, 0xc0, 0x2c, 0xe7, 0xae, 0x02, 0x74, 0x8c, 0x2a, 0xb9, 0x54, 0x2f, + 0x67, 0xf6, 0x9d, 0x09, 0xf6, 0xa9, 0x85, 0x78, 0x43, 0x6f, 0xf3, 0xcd, 0x44, 0x0d, 0x0f, 0x64, + 0xcc, 0x99, 0x84, 0xff, 0xd1, 0xdb, 0xc9, 0xaf, 0xde, 0x9c, 0x89, 0xbd, 0x4d, 0x6b, 0x64, 0x54, + 0xdc, 0xd1, 0xed, 0xfb, 0xc0, 0x36, 0x3e, 0x06, 0xb6, 0xf1, 0x39, 0xb0, 0x8d, 0xe7, 0x2f, 0x7b, + 0xee, 0x66, 0x3f, 0xa2, 0xea, 0xbe, 0xdf, 0xc1, 0x01, 0xef, 0x11, 0x26, 0xe3, 0x20, 0x70, 0xba, + 0xa0, 0x09, 0x03, 0x1e, 0x4a, 0xc7, 0x8f, 0xa9, 0x13, 0x71, 0x52, 0xec, 0xca, 0xc1, 0xf0, 0x7c, + 0x31, 0xd7, 0x2e, 0x81, 0x9f, 0xb6, 0xf1, 0xe1, 0xd5, 0x45, 0x9a, 0xa0, 0x9d, 0xcb, 0x9d, 0x4a, + 0xb6, 0x08, 0x7b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x87, 0x6a, 0x4d, 0x5f, 0x03, 0x00, + 0x00, } func (m *Signature) Marshal() (dAtA []byte, err error) { diff --git a/v2/session/service.pb.go b/v2/session/service.pb.go index 7759f67c..13b8ad53 100644 --- a/v2/session/service.pb.go +++ b/v2/session/service.pb.go @@ -97,6 +97,7 @@ func (m *CreateRequest) GetVerifyHeader() *service.RequestVerificationHeader { return nil } +// Request body type CreateRequest_Body struct { // Carries an identifier of a session initiator. OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` @@ -224,6 +225,7 @@ func (m *CreateResponse) GetVerifyHeader() *service.ResponseVerificationHeader { return nil } +// Response body type CreateResponse_Body struct { // id carries an identifier of session token. Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -291,36 +293,36 @@ func init() { func init() { proto.RegisterFile("v2/session/service.proto", fileDescriptor_ab0074a16885b32c) } var fileDescriptor_ab0074a16885b32c = []byte{ - // 454 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4f, 0x6f, 0xd3, 0x30, - 0x18, 0xc6, 0x49, 0x98, 0xb6, 0xc9, 0xed, 0x26, 0xcd, 0x08, 0xad, 0xca, 0x21, 0x94, 0x89, 0x21, - 0x0e, 0x8b, 0x2d, 0x85, 0x03, 0x02, 0x71, 0x61, 0xc0, 0x44, 0x05, 0xe3, 0x8f, 0x87, 0x10, 0xe2, - 0x52, 0xa5, 0xc9, 0x9b, 0xcd, 0x1a, 0xb1, 0x43, 0xec, 0x05, 0xf2, 0x4d, 0xb8, 0x72, 0xe5, 0x93, - 0x70, 0xe4, 0x13, 0x20, 0x54, 0xbe, 0x08, 0x8a, 0xed, 0x8d, 0x56, 0x64, 0xed, 0x2d, 0xb6, 0x9f, - 0xe7, 0xf1, 0xfb, 0xfc, 0x14, 0xa3, 0x41, 0x1d, 0x53, 0x05, 0x4a, 0x71, 0x29, 0xa8, 0x82, 0xaa, - 0xe6, 0x29, 0x90, 0xb2, 0x92, 0x5a, 0xe2, 0x2d, 0x01, 0x92, 0xe4, 0x8a, 0xd4, 0x31, 0x71, 0x82, - 0xe0, 0x5a, 0x1d, 0xd3, 0x0a, 0x72, 0x45, 0x75, 0x53, 0x82, 0xb2, 0xba, 0xe0, 0xba, 0x49, 0x30, - 0x4e, 0x5a, 0x80, 0x4e, 0xdc, 0xf6, 0xf6, 0xcc, 0x76, 0x0d, 0x15, 0xcf, 0x1b, 0x7b, 0xb0, 0xf3, - 0xcb, 0x47, 0x1b, 0x8f, 0x2b, 0x48, 0x34, 0x30, 0xf8, 0x74, 0x06, 0x4a, 0xe3, 0xfb, 0x68, 0x65, - 0x22, 0xb3, 0x66, 0xe0, 0x0d, 0xbd, 0x3b, 0xbd, 0x78, 0x97, 0xfc, 0x77, 0x31, 0x99, 0xd3, 0x93, - 0x7d, 0x99, 0x35, 0xcc, 0x58, 0xf0, 0x53, 0xd4, 0x6b, 0xef, 0x1c, 0x9f, 0x40, 0x92, 0x41, 0x35, - 0xf0, 0x4d, 0xc2, 0xad, 0xb9, 0x04, 0xdb, 0xc9, 0x79, 0x0f, 0x41, 0x27, 0xcf, 0x8c, 0x96, 0xa1, - 0xe2, 0xe2, 0x1b, 0xbf, 0x41, 0x1b, 0x76, 0xc6, 0xf3, 0xa0, 0xab, 0x26, 0x68, 0xef, 0xf2, 0xa0, - 0x77, 0xad, 0x9c, 0xa7, 0x89, 0xe6, 0x52, 0xb8, 0xc0, 0xbe, 0x8d, 0xb0, 0xab, 0xe0, 0x0b, 0x5a, - 0x69, 0xe7, 0xc4, 0x31, 0x5a, 0x97, 0x9f, 0x05, 0x54, 0x63, 0x9e, 0xb9, 0x82, 0xdb, 0x33, 0xa9, - 0x2d, 0x4d, 0xf2, 0xaa, 0x3d, 0x1f, 0x3d, 0x61, 0x6b, 0x46, 0x38, 0xca, 0xf0, 0x43, 0xb4, 0xfe, - 0x91, 0xe7, 0xa0, 0x79, 0x01, 0xae, 0xd2, 0xb0, 0x63, 0x92, 0xb7, 0xf2, 0x14, 0xc4, 0x0b, 0xa7, - 0x63, 0x17, 0x8e, 0x9d, 0x6f, 0x3e, 0xda, 0x3c, 0x07, 0xa6, 0x4a, 0x29, 0x14, 0xe0, 0x07, 0x73, - 0x84, 0x6f, 0x2f, 0x20, 0x6c, 0x0d, 0xb3, 0x88, 0x0f, 0xba, 0x10, 0xef, 0x76, 0x92, 0xb1, 0xe6, - 0x4b, 0x18, 0xb3, 0x6e, 0xc6, 0xd1, 0x82, 0xa4, 0xa5, 0x90, 0xef, 0x39, 0xc8, 0x9b, 0xc8, 0x77, - 0x78, 0xfb, 0xcc, 0xe7, 0x19, 0xbe, 0x81, 0x7a, 0xae, 0xd8, 0xf8, 0x14, 0x1a, 0x33, 0x73, 0x9f, - 0x21, 0xb7, 0xf5, 0x1c, 0x9a, 0xf8, 0x3d, 0x5a, 0x3b, 0xb2, 0x2b, 0x7c, 0x88, 0x56, 0x6d, 0x79, - 0x3c, 0x5c, 0xf6, 0xe7, 0x05, 0x37, 0x97, 0x92, 0xdb, 0x67, 0x3f, 0xa6, 0xa1, 0xf7, 0x73, 0x1a, - 0x7a, 0xbf, 0xa7, 0xa1, 0xf7, 0xf5, 0x4f, 0x78, 0xe5, 0xc3, 0xde, 0x31, 0xd7, 0x27, 0x67, 0x13, - 0x92, 0xca, 0x82, 0x0a, 0x55, 0xa6, 0x69, 0x94, 0x41, 0x4d, 0x05, 0xc8, 0x5c, 0x45, 0x49, 0xc9, - 0xa3, 0x63, 0x49, 0xff, 0x3d, 0xc2, 0xef, 0xfe, 0xd6, 0x4b, 0x90, 0x07, 0x47, 0xe4, 0xd1, 0xeb, - 0x11, 0x71, 0x23, 0x4e, 0x56, 0xcd, 0xcb, 0xb9, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xbe, - 0x3b, 0xbe, 0xad, 0x03, 0x00, 0x00, + // 463 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x6e, 0xd3, 0x30, + 0x14, 0xc6, 0x49, 0x98, 0xc6, 0xe4, 0x76, 0x95, 0x30, 0xa0, 0x55, 0xbd, 0x28, 0x65, 0x62, 0x88, + 0x0b, 0x62, 0x4b, 0x01, 0x09, 0xf1, 0xe7, 0x86, 0x01, 0x13, 0x15, 0x8c, 0x3f, 0x2e, 0xe2, 0x02, + 0x09, 0x45, 0x69, 0x72, 0xb2, 0x59, 0x23, 0x76, 0x88, 0xbd, 0x40, 0xde, 0x84, 0x5b, 0x6e, 0x79, + 0x12, 0x2e, 0x79, 0x02, 0x84, 0xca, 0x8b, 0xa0, 0xd8, 0xde, 0x68, 0x45, 0xd6, 0x5e, 0xb5, 0x3e, + 0xfe, 0xbe, 0xef, 0x9c, 0xf3, 0x53, 0x8c, 0xfa, 0x55, 0x48, 0x15, 0x28, 0xc5, 0xa5, 0xa0, 0x0a, + 0xca, 0x8a, 0x27, 0x40, 0x8a, 0x52, 0x6a, 0x89, 0x2f, 0x0a, 0x90, 0x24, 0x53, 0xa4, 0x0a, 0x89, + 0x13, 0x0c, 0x2e, 0x55, 0x21, 0x2d, 0x21, 0x53, 0x54, 0xd7, 0x05, 0x28, 0xab, 0x1b, 0x5c, 0x31, + 0x09, 0xc6, 0x49, 0x73, 0xd0, 0xb1, 0x2b, 0x6f, 0xcd, 0x95, 0x2b, 0x28, 0x79, 0x56, 0xdb, 0x8b, + 0xed, 0x5f, 0x3e, 0xda, 0x7c, 0x5c, 0x42, 0xac, 0x81, 0xc1, 0xa7, 0x63, 0x50, 0x1a, 0xdf, 0x43, + 0x6b, 0x53, 0x99, 0xd6, 0x7d, 0x6f, 0xe4, 0xdd, 0xec, 0x84, 0x3b, 0xe4, 0xbf, 0xc6, 0x64, 0x41, + 0x4f, 0x76, 0x65, 0x5a, 0x33, 0x63, 0xc1, 0x4f, 0x51, 0xa7, 0xe9, 0x19, 0x1d, 0x42, 0x9c, 0x42, + 0xd9, 0xf7, 0x4d, 0xc2, 0xf5, 0x85, 0x04, 0xbb, 0x93, 0xf3, 0xee, 0x83, 0x8e, 0x9f, 0x19, 0x2d, + 0x43, 0xf9, 0xe9, 0x7f, 0xfc, 0x06, 0x6d, 0xda, 0x19, 0x4f, 0x82, 0xce, 0x9b, 0xa0, 0x5b, 0x67, + 0x07, 0xbd, 0x6b, 0xe4, 0x3c, 0x89, 0x35, 0x97, 0xc2, 0x05, 0x76, 0x6d, 0x84, 0x3d, 0x0d, 0xbe, + 0xa0, 0xb5, 0x66, 0x4e, 0x1c, 0xa2, 0x0d, 0xf9, 0x59, 0x40, 0x19, 0xf1, 0xd4, 0x2d, 0xb8, 0x35, + 0x97, 0xda, 0xd0, 0x24, 0xaf, 0x9a, 0xfb, 0xf1, 0x13, 0x76, 0xc1, 0x08, 0xc7, 0x29, 0x7e, 0x88, + 0x36, 0x3e, 0xf2, 0x0c, 0x34, 0xcf, 0xc1, 0xad, 0x34, 0x6a, 0x99, 0xe4, 0xad, 0x3c, 0x02, 0xf1, + 0xc2, 0xe9, 0xd8, 0xa9, 0x63, 0xfb, 0x9b, 0x8f, 0x7a, 0x27, 0xc0, 0x54, 0x21, 0x85, 0x02, 0x7c, + 0x7f, 0x81, 0xf0, 0x8d, 0x25, 0x84, 0xad, 0x61, 0x1e, 0xf1, 0x5e, 0x1b, 0xe2, 0x9d, 0x56, 0x32, + 0xd6, 0x7c, 0x06, 0x63, 0xd6, 0xce, 0x38, 0x58, 0x92, 0xb4, 0x12, 0xf2, 0x5d, 0x07, 0xb9, 0x87, + 0x7c, 0x87, 0xb7, 0xcb, 0x7c, 0x9e, 0xe2, 0xab, 0xa8, 0xe3, 0x16, 0x8b, 0x8e, 0xa0, 0x36, 0x33, + 0x77, 0x19, 0x72, 0xa5, 0xe7, 0x50, 0x87, 0x11, 0xea, 0x4d, 0xec, 0x69, 0x62, 0x7b, 0xe2, 0x7d, + 0xb4, 0x6e, 0x19, 0xe0, 0xd1, 0xaa, 0x0f, 0x70, 0x70, 0x6d, 0x25, 0xc0, 0xdd, 0x0f, 0x3f, 0x66, + 0x43, 0xef, 0xe7, 0x6c, 0xe8, 0xfd, 0x9e, 0x0d, 0xbd, 0xaf, 0x7f, 0x86, 0xe7, 0xde, 0xdf, 0x39, + 0xe0, 0xfa, 0xf0, 0x78, 0x4a, 0x12, 0x99, 0x53, 0xa1, 0x8a, 0x24, 0x09, 0x52, 0xa8, 0xa8, 0x00, + 0x99, 0xa9, 0x20, 0x2e, 0x78, 0x70, 0x20, 0xe9, 0xbf, 0xb7, 0xf8, 0xc0, 0xfd, 0x7e, 0xf7, 0x2f, + 0xbf, 0x04, 0xb9, 0x37, 0x21, 0x8f, 0x5e, 0x8f, 0x9b, 0x6e, 0x6e, 0xe8, 0xe9, 0xba, 0x79, 0x4b, + 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x38, 0xb7, 0xac, 0xe1, 0xbf, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -331,74 +333,74 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// SessionClient is the client API for Session service. +// SessionServiceClient is the client API for SessionService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type SessionClient interface { +type SessionServiceClient interface { // Create opens new session between the client and the server. Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) } -type sessionClient struct { +type sessionServiceClient struct { cc *grpc.ClientConn } -func NewSessionClient(cc *grpc.ClientConn) SessionClient { - return &sessionClient{cc} +func NewSessionServiceClient(cc *grpc.ClientConn) SessionServiceClient { + return &sessionServiceClient{cc} } -func (c *sessionClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { +func (c *sessionServiceClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { out := new(CreateResponse) - err := c.cc.Invoke(ctx, "/neo.fs.v2.session.Session/Create", in, out, opts...) + err := c.cc.Invoke(ctx, "/neo.fs.v2.session.SessionService/Create", in, out, opts...) if err != nil { return nil, err } return out, nil } -// SessionServer is the server API for Session service. -type SessionServer interface { +// SessionServiceServer is the server API for SessionService service. +type SessionServiceServer interface { // Create opens new session between the client and the server. Create(context.Context, *CreateRequest) (*CreateResponse, error) } -// UnimplementedSessionServer can be embedded to have forward compatible implementations. -type UnimplementedSessionServer struct { +// UnimplementedSessionServiceServer can be embedded to have forward compatible implementations. +type UnimplementedSessionServiceServer struct { } -func (*UnimplementedSessionServer) Create(ctx context.Context, req *CreateRequest) (*CreateResponse, error) { +func (*UnimplementedSessionServiceServer) Create(ctx context.Context, req *CreateRequest) (*CreateResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") } -func RegisterSessionServer(s *grpc.Server, srv SessionServer) { - s.RegisterService(&_Session_serviceDesc, srv) +func RegisterSessionServiceServer(s *grpc.Server, srv SessionServiceServer) { + s.RegisterService(&_SessionService_serviceDesc, srv) } -func _Session_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _SessionService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CreateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(SessionServer).Create(ctx, in) + return srv.(SessionServiceServer).Create(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/neo.fs.v2.session.Session/Create", + FullMethod: "/neo.fs.v2.session.SessionService/Create", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SessionServer).Create(ctx, req.(*CreateRequest)) + return srv.(SessionServiceServer).Create(ctx, req.(*CreateRequest)) } return interceptor(ctx, in, info, handler) } -var _Session_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neo.fs.v2.session.Session", - HandlerType: (*SessionServer)(nil), +var _SessionService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neo.fs.v2.session.SessionService", + HandlerType: (*SessionServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Create", - Handler: _Session_Create_Handler, + Handler: _SessionService_Create_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/v2/storagegroup/types.pb.go b/v2/storagegroup/types.pb.go index e206d31c..2622367f 100644 --- a/v2/storagegroup/types.pb.go +++ b/v2/storagegroup/types.pb.go @@ -113,26 +113,26 @@ func init() { func init() { proto.RegisterFile("v2/storagegroup/types.proto", fileDescriptor_593772eae6c18cdf) } var fileDescriptor_593772eae6c18cdf = []byte{ - // 293 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0xd0, 0xdf, 0x4a, 0xf3, 0x30, - 0x18, 0x06, 0xf0, 0x2f, 0xdb, 0xf8, 0x84, 0x38, 0x9c, 0x44, 0x19, 0x45, 0xa1, 0x0c, 0x4f, 0x9c, - 0x07, 0x4b, 0xb4, 0x5e, 0x81, 0x32, 0xff, 0xec, 0x44, 0xa5, 0x3d, 0x13, 0x61, 0xa4, 0xed, 0xdb, - 0x36, 0x62, 0x9b, 0x90, 0x64, 0x45, 0x77, 0x25, 0x5e, 0x83, 0x57, 0xb2, 0x43, 0x2f, 0x41, 0xea, - 0x8d, 0x48, 0x37, 0xa4, 0xc5, 0xd3, 0x27, 0xbf, 0xbc, 0xf0, 0x3c, 0xf8, 0xb0, 0xf4, 0x98, 0xb1, - 0x52, 0xf3, 0x14, 0x52, 0x2d, 0x17, 0x8a, 0xd9, 0x37, 0x05, 0x86, 0x2a, 0x2d, 0xad, 0x24, 0xc3, - 0x02, 0x24, 0x4d, 0x0c, 0x2d, 0x3d, 0xda, 0x36, 0x07, 0x7b, 0xa5, 0xc7, 0x34, 0x24, 0xa6, 0x8d, - 0x8f, 0x56, 0x08, 0xf7, 0x83, 0x8d, 0xba, 0xa9, 0x15, 0x39, 0xc5, 0xfb, 0x25, 0x7f, 0x11, 0x31, - 0xb7, 0x42, 0x16, 0xf3, 0x98, 0x5b, 0x3e, 0x37, 0x62, 0x09, 0x0e, 0x1a, 0xa1, 0x71, 0xcf, 0x27, - 0xcd, 0xdb, 0x94, 0x5b, 0x1e, 0x88, 0x25, 0x90, 0x63, 0x3c, 0x68, 0xfd, 0xc8, 0xb8, 0xc9, 0x9c, - 0xce, 0x08, 0x8d, 0xfb, 0xfe, 0x4e, 0x13, 0xdf, 0x72, 0x93, 0x91, 0x13, 0xbc, 0x0b, 0xaf, 0x4a, - 0xe8, 0x0d, 0x04, 0x25, 0xa3, 0xcc, 0xe9, 0xae, 0xcf, 0x0e, 0x9a, 0xfc, 0xaa, 0x8e, 0x89, 0x87, - 0xb7, 0x72, 0xc8, 0x43, 0xd0, 0xc6, 0xe9, 0x8d, 0xba, 0xe3, 0x6d, 0xcf, 0xa1, 0x4d, 0xab, 0xba, - 0x04, 0xbd, 0x0f, 0x9f, 0x21, 0xb2, 0xb3, 0xa9, 0xff, 0x0b, 0x2f, 0x9f, 0x56, 0x95, 0x8b, 0x3e, - 0x2b, 0x17, 0x7d, 0x55, 0x2e, 0x7a, 0xff, 0x76, 0xff, 0x3d, 0x9e, 0xa5, 0xc2, 0x66, 0x8b, 0x90, - 0x46, 0x32, 0x67, 0x85, 0x51, 0x51, 0x34, 0x89, 0xa1, 0x64, 0x05, 0xc8, 0xc4, 0x4c, 0xb8, 0x12, - 0x93, 0x54, 0xb2, 0x3f, 0x43, 0x7e, 0x74, 0x86, 0x77, 0x20, 0xaf, 0x03, 0x7a, 0xf1, 0x30, 0xa3, - 0xed, 0x5d, 0xc2, 0xff, 0xeb, 0xbd, 0xce, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x71, 0xf1, - 0x6b, 0x7b, 0x01, 0x00, 0x00, + // 297 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xdf, 0x4a, 0xc3, 0x30, + 0x14, 0xc6, 0xcd, 0x36, 0x14, 0xe2, 0x70, 0x12, 0x45, 0xaa, 0x42, 0x19, 0xde, 0x38, 0x2f, 0x96, + 0x48, 0xbd, 0x14, 0x04, 0x65, 0xfe, 0xd9, 0x8d, 0xca, 0x7a, 0xe7, 0xcd, 0x48, 0xdb, 0xd3, 0x36, + 0xb2, 0x36, 0x21, 0xc9, 0x8a, 0xee, 0x49, 0x7c, 0x06, 0x9f, 0x64, 0x97, 0x3e, 0x82, 0xd4, 0x17, + 0x91, 0x6e, 0x48, 0x8b, 0x97, 0xf9, 0xf2, 0x3b, 0xe7, 0xf0, 0xfd, 0xf0, 0x71, 0xe1, 0x31, 0x63, + 0xa5, 0xe6, 0x09, 0x24, 0x5a, 0xce, 0x15, 0xb3, 0xef, 0x0a, 0x0c, 0x55, 0x5a, 0x5a, 0x49, 0x0e, + 0x72, 0x90, 0x34, 0x36, 0xb4, 0xf0, 0x68, 0x93, 0x39, 0xda, 0x2b, 0x3c, 0xa6, 0x21, 0x36, 0x4d, + 0xf8, 0x64, 0x89, 0x70, 0xd7, 0x5f, 0x53, 0xf7, 0x15, 0x45, 0xce, 0xf1, 0x7e, 0xc1, 0x67, 0x22, + 0xe2, 0x56, 0xc8, 0x7c, 0x1a, 0x71, 0xcb, 0xa7, 0x46, 0x2c, 0xc0, 0x41, 0x7d, 0x34, 0xe8, 0x4c, + 0x48, 0xfd, 0x37, 0xe2, 0x96, 0xfb, 0x62, 0x01, 0xe4, 0x14, 0xf7, 0x1a, 0x13, 0x29, 0x37, 0xa9, + 0xd3, 0xea, 0xa3, 0x41, 0x77, 0xb2, 0x53, 0xc7, 0x0f, 0xdc, 0xa4, 0xe4, 0x0c, 0xef, 0xc2, 0x9b, + 0x12, 0x7a, 0x0d, 0x82, 0x92, 0x61, 0xea, 0xb4, 0x57, 0x6b, 0x7b, 0x75, 0x7e, 0x5b, 0xc5, 0xc4, + 0xc3, 0x5b, 0x19, 0x64, 0x01, 0x68, 0xe3, 0x74, 0xfa, 0xed, 0xc1, 0xb6, 0xe7, 0xd0, 0xba, 0x55, + 0x55, 0x82, 0x3e, 0x05, 0xaf, 0x10, 0xda, 0xf1, 0x68, 0xf2, 0x07, 0xde, 0xcc, 0x96, 0xa5, 0x8b, + 0xbe, 0x4a, 0x17, 0x7d, 0x97, 0x2e, 0xfa, 0xf8, 0x71, 0x37, 0x5e, 0xae, 0x12, 0x61, 0xd3, 0x79, + 0x40, 0x43, 0x99, 0xb1, 0xdc, 0xa8, 0x30, 0x1c, 0x46, 0x50, 0xb0, 0x1c, 0x64, 0x6c, 0x86, 0x5c, + 0x89, 0x61, 0x22, 0xd9, 0x3f, 0x91, 0x97, 0xcd, 0xc7, 0x67, 0xeb, 0xf0, 0x11, 0xe4, 0x9d, 0x4f, + 0xaf, 0x9f, 0xc7, 0xd5, 0xdd, 0xa6, 0xa7, 0x60, 0x73, 0xe5, 0xef, 0xe2, 0x37, 0x00, 0x00, 0xff, + 0xff, 0xec, 0x24, 0x17, 0x69, 0x8b, 0x01, 0x00, 0x00, } func (m *StorageGroup) Marshal() (dAtA []byte, err error) {