From 030b37e2d834b70c8dc1c3fa2e9db26f89482e7d Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Mon, 4 Mar 2024 15:12:03 +0400 Subject: [PATCH 1/2] *: Regenerate code with the latest API definitions From https://github.com/nspcc-dev/neofs-api/commit/f3ed513fa80c837a85f4ec012e3826e7d116ac84. Signed-off-by: Leonard Lyubich --- accounting/grpc/service.pb.go | 2 +- accounting/grpc/types.pb.go | 2 +- acl/grpc/types.pb.go | 110 +++++++++++++++++++-------------- audit/grpc/types.pb.go | 2 +- container/grpc/service.pb.go | 2 +- container/grpc/types.pb.go | 2 +- link/grpc/types.pb.go | 2 +- lock/grpc/types.pb.go | 2 +- netmap/grpc/service.pb.go | 2 +- netmap/grpc/types.pb.go | 2 +- object/grpc/service.pb.go | 6 +- object/grpc/service_grpc.pb.go | 32 +++++----- object/grpc/types.pb.go | 11 ++-- refs/grpc/types.pb.go | 2 +- reputation/grpc/service.pb.go | 2 +- reputation/grpc/types.pb.go | 2 +- session/grpc/service.pb.go | 2 +- session/grpc/types.pb.go | 6 +- status/grpc/types.pb.go | 2 +- storagegroup/grpc/types.pb.go | 2 +- subnet/grpc/types.pb.go | 2 +- tombstone/grpc/types.pb.go | 41 ++++++------ util/proto/test/test.pb.go | 2 +- 23 files changed, 131 insertions(+), 109 deletions(-) diff --git a/accounting/grpc/service.pb.go b/accounting/grpc/service.pb.go index 8a2ce5fc..d24d4821 100644 --- a/accounting/grpc/service.pb.go +++ b/accounting/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: accounting/grpc/service.proto diff --git a/accounting/grpc/types.pb.go b/accounting/grpc/types.pb.go index ca241b75..be4f2670 100644 --- a/accounting/grpc/types.pb.go +++ b/accounting/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: accounting/grpc/types.proto diff --git a/acl/grpc/types.pb.go b/acl/grpc/types.pb.go index 333f91ec..06788888 100644 --- a/acl/grpc/types.pb.go +++ b/acl/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: acl/grpc/types.proto @@ -740,6 +740,9 @@ type BearerToken_Body struct { OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerID,proto3" json:"owner_id,omitempty"` // Token expiration and valid time period parameters Lifetime *BearerToken_Body_TokenLifetime `protobuf:"bytes,3,opt,name=lifetime,proto3" json:"lifetime,omitempty"` + // Token issuer's user ID in NeoFS. It must equal to the related + // container's owner. + Issuer *grpc.OwnerID `protobuf:"bytes,4,opt,name=issuer,proto3" json:"issuer,omitempty"` } func (x *BearerToken_Body) Reset() { @@ -795,6 +798,13 @@ func (x *BearerToken_Body) GetLifetime() *BearerToken_Body_TokenLifetime { return nil } +func (x *BearerToken_Body) GetIssuer() *grpc.OwnerID { + if x != nil { + return x.Issuer + } + return nil +} + // Lifetime parameters of the token. Field names taken from // [rfc7519](https://tools.ietf.org/html/rfc7519). type BearerToken_Body_TokenLifetime struct { @@ -911,14 +921,14 @@ var file_acl_grpc_types_proto_rawDesc = []byte{ 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x45, 0x41, 0x43, 0x4c, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, - 0x83, 0x03, 0x0a, 0x0b, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, + 0xb4, 0x03, 0x0a, 0x0b, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x37, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x1a, 0x85, 0x02, + 0x72, 0x65, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x1a, 0xb6, 0x02, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x37, 0x0a, 0x0a, 0x65, 0x61, 0x63, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x45, 0x41, 0x43, 0x4c, 0x54, @@ -930,46 +940,49 @@ var file_acl_grpc_types_proto_rawDesc = []byte{ 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x61, 0x63, 0x6c, 0x2e, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4c, 0x69, 0x66, 0x65, - 0x74, 0x69, 0x6d, 0x65, 0x52, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x45, - 0x0a, 0x0d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x65, 0x78, - 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x62, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, - 0x6e, 0x62, 0x66, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x03, 0x69, 0x61, 0x74, 0x2a, 0x3e, 0x0a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x14, 0x0a, - 0x10, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, - 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x55, 0x53, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0a, 0x0a, - 0x06, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x54, 0x48, - 0x45, 0x52, 0x53, 0x10, 0x03, 0x2a, 0x90, 0x01, 0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, 0x50, - 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, - 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, - 0x01, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, - 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x54, 0x5f, 0x50, - 0x52, 0x45, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x5f, - 0x47, 0x54, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x5f, 0x47, 0x45, 0x10, 0x05, - 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x5f, 0x4c, 0x54, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, - 0x4e, 0x55, 0x4d, 0x5f, 0x4c, 0x45, 0x10, 0x07, 0x2a, 0x7a, 0x0a, 0x09, 0x4f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, 0x49, - 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, - 0x12, 0x07, 0x0a, 0x03, 0x47, 0x45, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x45, 0x41, - 0x44, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x55, 0x54, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, - 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x45, 0x41, 0x52, - 0x43, 0x48, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x45, 0x54, 0x52, 0x41, 0x4e, 0x47, 0x45, - 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x45, 0x54, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x48, 0x41, - 0x53, 0x48, 0x10, 0x07, 0x2a, 0x35, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, - 0x0a, 0x12, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, - 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x10, - 0x01, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x45, 0x4e, 0x59, 0x10, 0x02, 0x2a, 0x4a, 0x0a, 0x0a, 0x48, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x45, 0x41, - 0x44, 0x45, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, - 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, 0x0a, - 0x0a, 0x06, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x45, - 0x52, 0x56, 0x49, 0x43, 0x45, 0x10, 0x03, 0x42, 0x4d, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, - 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, - 0x61, 0x63, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x3b, 0x61, 0x63, 0x6c, 0xaa, 0x02, 0x17, 0x4e, - 0x65, 0x6f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x41, - 0x50, 0x49, 0x2e, 0x41, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x69, 0x6d, 0x65, 0x52, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2f, + 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, + 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x2e, + 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x1a, + 0x45, 0x0a, 0x0d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x65, + 0x78, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x62, 0x66, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x03, 0x6e, 0x62, 0x66, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x03, 0x69, 0x61, 0x74, 0x2a, 0x3e, 0x0a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x14, + 0x0a, 0x10, 0x52, 0x4f, 0x4c, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, + 0x45, 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x55, 0x53, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0a, + 0x0a, 0x06, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x54, + 0x48, 0x45, 0x52, 0x53, 0x10, 0x03, 0x2a, 0x90, 0x01, 0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x16, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, + 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, + 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4e, 0x4f, 0x54, + 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f, 0x54, 0x5f, + 0x50, 0x52, 0x45, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, + 0x5f, 0x47, 0x54, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x5f, 0x47, 0x45, 0x10, + 0x05, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x5f, 0x4c, 0x54, 0x10, 0x06, 0x12, 0x0a, 0x0a, + 0x06, 0x4e, 0x55, 0x4d, 0x5f, 0x4c, 0x45, 0x10, 0x07, 0x2a, 0x7a, 0x0a, 0x09, 0x4f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x45, 0x52, 0x41, 0x54, + 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, + 0x00, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x45, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x45, + 0x41, 0x44, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x55, 0x54, 0x10, 0x03, 0x12, 0x0a, 0x0a, + 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x45, 0x41, + 0x52, 0x43, 0x48, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x45, 0x54, 0x52, 0x41, 0x4e, 0x47, + 0x45, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x45, 0x54, 0x52, 0x41, 0x4e, 0x47, 0x45, 0x48, + 0x41, 0x53, 0x48, 0x10, 0x07, 0x2a, 0x35, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x16, 0x0a, 0x12, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, + 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x4c, 0x4c, 0x4f, 0x57, + 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x45, 0x4e, 0x59, 0x10, 0x02, 0x2a, 0x4a, 0x0a, 0x0a, + 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x12, 0x48, 0x45, + 0x41, 0x44, 0x45, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, + 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x51, 0x55, 0x45, 0x53, 0x54, 0x10, 0x01, 0x12, + 0x0a, 0x0a, 0x06, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x53, + 0x45, 0x52, 0x56, 0x49, 0x43, 0x45, 0x10, 0x03, 0x42, 0x4d, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, + 0x2f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, + 0x2f, 0x61, 0x63, 0x6c, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x3b, 0x61, 0x63, 0x6c, 0xaa, 0x02, 0x17, + 0x4e, 0x65, 0x6f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, + 0x41, 0x50, 0x49, 0x2e, 0x41, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1020,11 +1033,12 @@ var file_acl_grpc_types_proto_depIdxs = []int32{ 6, // 12: neo.fs.v2.acl.BearerToken.Body.eacl_table:type_name -> neo.fs.v2.acl.EACLTable 15, // 13: neo.fs.v2.acl.BearerToken.Body.owner_id:type_name -> neo.fs.v2.refs.OwnerID 11, // 14: neo.fs.v2.acl.BearerToken.Body.lifetime:type_name -> neo.fs.v2.acl.BearerToken.Body.TokenLifetime - 15, // [15:15] is the sub-list for method output_type - 15, // [15:15] is the sub-list for method input_type - 15, // [15:15] is the sub-list for extension type_name - 15, // [15:15] is the sub-list for extension extendee - 0, // [0:15] is the sub-list for field type_name + 15, // 15: neo.fs.v2.acl.BearerToken.Body.issuer:type_name -> neo.fs.v2.refs.OwnerID + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_acl_grpc_types_proto_init() } diff --git a/audit/grpc/types.pb.go b/audit/grpc/types.pb.go index ea518fc4..13053f2b 100644 --- a/audit/grpc/types.pb.go +++ b/audit/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: audit/grpc/types.proto diff --git a/container/grpc/service.pb.go b/container/grpc/service.pb.go index fc6746e5..b5080789 100644 --- a/container/grpc/service.pb.go +++ b/container/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: container/grpc/service.proto diff --git a/container/grpc/types.pb.go b/container/grpc/types.pb.go index 0d729c2d..1e12a806 100644 --- a/container/grpc/types.pb.go +++ b/container/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: container/grpc/types.proto diff --git a/link/grpc/types.pb.go b/link/grpc/types.pb.go index db3ac0ee..1f14252a 100644 --- a/link/grpc/types.pb.go +++ b/link/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: link/grpc/types.proto diff --git a/lock/grpc/types.pb.go b/lock/grpc/types.pb.go index a045b647..c56e6d96 100644 --- a/lock/grpc/types.pb.go +++ b/lock/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: lock/grpc/types.proto diff --git a/netmap/grpc/service.pb.go b/netmap/grpc/service.pb.go index 51a82b7c..8dc1bc1e 100644 --- a/netmap/grpc/service.pb.go +++ b/netmap/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: netmap/grpc/service.proto diff --git a/netmap/grpc/types.pb.go b/netmap/grpc/types.pb.go index 24d33ada..786d5f36 100644 --- a/netmap/grpc/types.pb.go +++ b/netmap/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: netmap/grpc/types.proto diff --git a/object/grpc/service.pb.go b/object/grpc/service.pb.go index 736a23ca..4b0d5d9d 100644 --- a/object/grpc/service.pb.go +++ b/object/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: object/grpc/service.proto @@ -1559,7 +1559,9 @@ type PutRequest_Body_Init struct { ObjectId *grpc1.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` // Object signature if available Signature *grpc1.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` - // Object's Header + // Object's Header. The maximum length is 16KB. The only exclusion are + // replication requests, i.e. requests sent by container nodes with + // 'meta_header.ttl=1': for such cases the limit is 4MB. Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"` // Number of the object copies to store within the RPC call. By default // object is processed according to the container's placement policy. diff --git a/object/grpc/service_grpc.pb.go b/object/grpc/service_grpc.pb.go index 5d71e227..bad2e0b1 100644 --- a/object/grpc/service_grpc.pb.go +++ b/object/grpc/service_grpc.pb.go @@ -43,11 +43,11 @@ type ObjectServiceClient interface { // Extended headers can change `Get` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions (starting from `__NEOFS__NETMAP_EPOCH` if specified or // the latest one otherwise) of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -76,7 +76,7 @@ type ObjectServiceClient interface { // Extended headers can change `Put` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -107,7 +107,7 @@ type ObjectServiceClient interface { // Extended headers can change `Delete` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -180,10 +180,10 @@ type ObjectServiceClient interface { // Extended headers can change `GetRange` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -212,10 +212,10 @@ type ObjectServiceClient interface { // Extended headers can change `GetRangeHash` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -440,11 +440,11 @@ type ObjectServiceServer interface { // Extended headers can change `Get` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions (starting from `__NEOFS__NETMAP_EPOCH` if specified or // the latest one otherwise) of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -473,7 +473,7 @@ type ObjectServiceServer interface { // Extended headers can change `Put` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -504,7 +504,7 @@ type ObjectServiceServer interface { // Extended headers can change `Delete` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -577,10 +577,10 @@ type ObjectServiceServer interface { // Extended headers can change `GetRange` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // @@ -609,10 +609,10 @@ type ObjectServiceServer interface { // Extended headers can change `GetRangeHash` behaviour: // - __NEOFS__NETMAP_EPOCH \ // Will use the requsted version of Network Map for object placement - // calculation. + // calculation. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // Will try older versions of Network Map to find an object until the depth - // limit is reached. + // limit is reached. DEPRECATED: header ignored by servers. // // Please refer to detailed `XHeader` description. // diff --git a/object/grpc/types.pb.go b/object/grpc/types.pb.go index 24f5d4fe..0ea43a18 100644 --- a/object/grpc/types.pb.go +++ b/object/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: object/grpc/types.proto @@ -301,7 +301,8 @@ type Header struct { // Session token, if it was used during Object creation. Need it to verify // integrity and authenticity out of Request scope. SessionToken *grpc1.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` - // User-defined object attributes + // User-defined object attributes. Attributes vary in length from object to + // object, so keep an eye on the entire Header limit depending on the context. 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"` @@ -598,9 +599,11 @@ func (x *SplitInfo) GetFirstPart() *grpc.ObjectID { // Decimal number that defines what epoch must produce // object notification with UTF-8 object address in a // body (`0` value produces notification right after -// object put) +// object put). +// DEPRECATED: attribute ignored by servers. // - __NEOFS__TICK_TOPIC \ -// UTF-8 string topic ID that is used for object notification +// UTF-8 string topic ID that is used for object notification. +// DEPRECATED: attribute ignored by servers. // // And some well-known attributes used by applications only: // diff --git a/refs/grpc/types.pb.go b/refs/grpc/types.pb.go index 5cd37c77..e5e4fa0c 100644 --- a/refs/grpc/types.pb.go +++ b/refs/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: refs/grpc/types.proto diff --git a/reputation/grpc/service.pb.go b/reputation/grpc/service.pb.go index d7446185..c2fd3e10 100644 --- a/reputation/grpc/service.pb.go +++ b/reputation/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: reputation/grpc/service.proto diff --git a/reputation/grpc/types.pb.go b/reputation/grpc/types.pb.go index 4e80d0b3..584b12a4 100644 --- a/reputation/grpc/types.pb.go +++ b/reputation/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: reputation/grpc/types.proto diff --git a/session/grpc/service.pb.go b/session/grpc/service.pb.go index ee64a057..e29875cf 100644 --- a/session/grpc/service.pb.go +++ b/session/grpc/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: session/grpc/service.proto diff --git a/session/grpc/types.pb.go b/session/grpc/types.pb.go index 37673618..ae477c33 100644 --- a/session/grpc/types.pb.go +++ b/session/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: session/grpc/types.proto @@ -355,12 +355,12 @@ func (x *SessionToken) GetSignature() *grpc.Signature { // - __NEOFS__NETMAP_EPOCH \ // Netmap epoch to use for object placement calculation. The `value` is string // encoded `uint64` in decimal presentation. If set to '0' or not set, the -// current epoch only will be used. +// current epoch only will be used. DEPRECATED: header ignored by servers. // - __NEOFS__NETMAP_LOOKUP_DEPTH \ // If object can't be found using current epoch's netmap, this header limits // how many past epochs the node can look up through. The `value` is string // encoded `uint64` in decimal presentation. If set to '0' or not set, only the -// current epoch will be used. +// current epoch will be used. DEPRECATED: header ignored by servers. type XHeader struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/status/grpc/types.pb.go b/status/grpc/types.pb.go index 23189fec..3da5729e 100644 --- a/status/grpc/types.pb.go +++ b/status/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: status/grpc/types.proto diff --git a/storagegroup/grpc/types.pb.go b/storagegroup/grpc/types.pb.go index 272b8210..de212480 100644 --- a/storagegroup/grpc/types.pb.go +++ b/storagegroup/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: storagegroup/grpc/types.proto diff --git a/subnet/grpc/types.pb.go b/subnet/grpc/types.pb.go index 18e05566..6235c107 100644 --- a/subnet/grpc/types.pb.go +++ b/subnet/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: subnet/grpc/types.proto diff --git a/tombstone/grpc/types.pb.go b/tombstone/grpc/types.pb.go index f8da2104..14bb1269 100644 --- a/tombstone/grpc/types.pb.go +++ b/tombstone/grpc/types.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: tombstone/grpc/types.proto @@ -29,9 +29,11 @@ type Tombstone struct { unknownFields protoimpl.UnknownFields // Last NeoFS epoch number of the tombstone lifetime. It's set by the tombstone - // creator depending on the current NeoFS network settings. A tombstone object - // must have the same expiration epoch value in `__NEOFS__EXPIRATION_EPOCH` - // attribute. Otherwise, the tombstone will be rejected by a storage node. + // creator depending on the current NeoFS network settings. + // DEPRECATED. Field ignored by servers, set corresponding object attribute + // `__NEOFS__EXPIRATION_EPOCH` only. + // + // Deprecated: Marked as deprecated in tombstone/grpc/types.proto. ExpirationEpoch uint64 `protobuf:"varint,1,opt,name=expiration_epoch,json=expirationEpoch,proto3" json:"expiration_epoch,omitempty"` // 16 byte UUID used to identify the split object hierarchy parts. Must be // unique inside a container. All objects participating in the split must @@ -73,6 +75,7 @@ func (*Tombstone) Descriptor() ([]byte, []int) { return file_tombstone_grpc_types_proto_rawDescGZIP(), []int{0} } +// Deprecated: Marked as deprecated in tombstone/grpc/types.proto. func (x *Tombstone) GetExpirationEpoch() uint64 { if x != nil { return x.ExpirationEpoch @@ -101,22 +104,22 @@ var file_tombstone_grpc_types_proto_rawDesc = []byte{ 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x13, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x74, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x1a, 0x15, 0x72, 0x65, 0x66, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85, 0x01, 0x0a, 0x09, 0x54, 0x6f, 0x6d, - 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, + 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x01, 0x0a, 0x09, 0x54, 0x6f, 0x6d, + 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x12, 0x2d, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x0f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x70, 0x6f, 0x63, - 0x68, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x07, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x49, 0x44, 0x12, 0x32, 0x0a, 0x07, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, 0x66, 0x73, 0x2e, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x44, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, - 0x42, 0x5f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, - 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x2d, 0x61, - 0x70, 0x69, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, - 0x6e, 0x65, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x3b, 0x74, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, - 0x65, 0xaa, 0x02, 0x1d, 0x4e, 0x65, 0x6f, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x74, 0x6f, 0x72, - 0x61, 0x67, 0x65, 0x2e, 0x41, 0x50, 0x49, 0x2e, 0x54, 0x6f, 0x6d, 0x62, 0x73, 0x74, 0x6f, 0x6e, - 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x02, 0x18, 0x01, 0x52, 0x0f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x49, 0x44, + 0x12, 0x32, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x18, 0x2e, 0x6e, 0x65, 0x6f, 0x2e, 0x66, 0x73, 0x2e, 0x76, 0x32, 0x2e, 0x72, 0x65, + 0x66, 0x73, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x44, 0x52, 0x07, 0x6d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x73, 0x42, 0x5f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x6e, 0x65, 0x6f, + 0x66, 0x73, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x74, 0x6f, 0x6d, + 0x62, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x3b, 0x74, 0x6f, 0x6d, 0x62, + 0x73, 0x74, 0x6f, 0x6e, 0x65, 0xaa, 0x02, 0x1d, 0x4e, 0x65, 0x6f, 0x2e, 0x46, 0x69, 0x6c, 0x65, + 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x41, 0x50, 0x49, 0x2e, 0x54, 0x6f, 0x6d, 0x62, + 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/util/proto/test/test.pb.go b/util/proto/test/test.pb.go index 531aeb35..1ac91fea 100644 --- a/util/proto/test/test.pb.go +++ b/util/proto/test/test.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.25.1 // source: util/proto/test/test.proto From c97dae074e7c0fd7f3eeb94e9879af4853a5f6fa Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Mon, 4 Mar 2024 15:19:28 +0400 Subject: [PATCH 2/2] acl: Support `issuer` field in bearer token The field was added within https://github.com/nspcc-dev/neofs-api/issues/266. Signed-off-by: Leonard Lyubich --- acl/convert.go | 15 +++++++++++++++ acl/grpc/types.go | 5 +++++ acl/marshal.go | 5 ++++- acl/test/generate.go | 1 + acl/types.go | 14 +++++++++++++- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/acl/convert.go b/acl/convert.go index fd63b256..f3e47f06 100644 --- a/acl/convert.go +++ b/acl/convert.go @@ -435,6 +435,7 @@ func (bt *BearerTokenBody) ToGRPCMessage() grpc.Message { m = new(acl.BearerToken_Body) m.SetOwnerId(bt.ownerID.ToGRPCMessage().(*refsGRPC.OwnerID)) + m.SetIssuer(bt.issuer.ToGRPCMessage().(*refsGRPC.OwnerID)) m.SetLifetime(bt.lifetime.ToGRPCMessage().(*acl.BearerToken_Body_TokenLifetime)) m.SetEaclTable(bt.eacl.ToGRPCMessage().(*acl.EACLTable)) } @@ -464,6 +465,20 @@ func (bt *BearerTokenBody) FromGRPCMessage(m grpc.Message) error { } } + issuer := v.GetIssuer() + if issuer == nil { + bt.issuer = nil + } else { + if bt.issuer == nil { + bt.issuer = new(refs.OwnerID) + } + + err = bt.issuer.FromGRPCMessage(issuer) + if err != nil { + return err + } + } + lifetime := v.GetLifetime() if lifetime == nil { bt.lifetime = nil diff --git a/acl/grpc/types.go b/acl/grpc/types.go index 032f5c91..e82b67ba 100644 --- a/acl/grpc/types.go +++ b/acl/grpc/types.go @@ -79,6 +79,11 @@ func (m *BearerToken_Body) SetOwnerId(v *refs.OwnerID) { m.OwnerId = v } +// SetIssuer sets identifier of the bearer token issuer. +func (m *BearerToken_Body) SetIssuer(v *refs.OwnerID) { + m.Issuer = v +} + // SetLifetime sets lifetime of the bearer token. func (m *BearerToken_Body) SetLifetime(v *BearerToken_Body_TokenLifetime) { m.Lifetime = v diff --git a/acl/marshal.go b/acl/marshal.go index 87d476d8..5f1a33b7 100644 --- a/acl/marshal.go +++ b/acl/marshal.go @@ -31,6 +31,7 @@ const ( bearerTokenBodyACLField = 1 bearerTokenBodyOwnerField = 2 bearerTokenBodyLifetimeField = 3 + bearerTokenBodyIssuerField = 4 bearerTokenBodyField = 1 bearerTokenSignatureField = 2 @@ -251,7 +252,8 @@ func (bt *BearerTokenBody) StableMarshal(buf []byte) []byte { offset += protoutil.NestedStructureMarshal(bearerTokenBodyACLField, buf[offset:], bt.eacl) offset += protoutil.NestedStructureMarshal(bearerTokenBodyOwnerField, buf[offset:], bt.ownerID) - protoutil.NestedStructureMarshal(bearerTokenBodyLifetimeField, buf[offset:], bt.lifetime) + offset += protoutil.NestedStructureMarshal(bearerTokenBodyLifetimeField, buf[offset:], bt.lifetime) + protoutil.NestedStructureMarshal(bearerTokenBodyIssuerField, buf[offset:], bt.issuer) return buf } @@ -264,6 +266,7 @@ func (bt *BearerTokenBody) StableSize() (size int) { size += protoutil.NestedStructureSize(bearerTokenBodyACLField, bt.eacl) size += protoutil.NestedStructureSize(bearerTokenBodyOwnerField, bt.ownerID) size += protoutil.NestedStructureSize(bearerTokenBodyLifetimeField, bt.lifetime) + size += protoutil.NestedStructureSize(bearerTokenBodyIssuerField, bt.issuer) return size } diff --git a/acl/test/generate.go b/acl/test/generate.go index 3d90fc91..ca491007 100644 --- a/acl/test/generate.go +++ b/acl/test/generate.go @@ -22,6 +22,7 @@ func GenerateBearerTokenBody(empty bool) *acl.BearerTokenBody { if !empty { m.SetOwnerID(accountingtest.GenerateOwnerID(false)) + m.SetIssuer(accountingtest.GenerateOwnerID(false)) m.SetEACL(GenerateTable(false)) m.SetLifetime(GenerateTokenLifetime(false)) } diff --git a/acl/types.go b/acl/types.go index 8d145b61..91226967 100644 --- a/acl/types.go +++ b/acl/types.go @@ -49,7 +49,7 @@ type TokenLifetime struct { type BearerTokenBody struct { eacl *Table - ownerID *refs.OwnerID + ownerID, issuer *refs.OwnerID lifetime *TokenLifetime } @@ -334,6 +334,18 @@ func (bt *BearerTokenBody) SetOwnerID(v *refs.OwnerID) { bt.ownerID = v } +func (bt *BearerTokenBody) GetIssuer() *refs.OwnerID { + if bt != nil { + return bt.issuer + } + + return nil +} + +func (bt *BearerTokenBody) SetIssuer(v *refs.OwnerID) { + bt.issuer = v +} + func (bt *BearerTokenBody) GetLifetime() *TokenLifetime { if bt != nil { return bt.lifetime