EliChin/frostfs-api
1
0
Fork 0
forked from TrueCloudLab/frostfs-api
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#32] service: Remove gogoproto from typedef

Browse source 
There is a need to remove gogoproto usage from NeoFS API since this plugin
is not cross-language. This commit removes usage from service package.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-08-06 01:34:11 +03:00 committed by Stanislav Bogatyrev
parent 46fe7b93cd
commit a8beb62693
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
service/meta.proto
View file

@ -3,10 +3,6 @@ package service;
option go_package = "github.com/nspcc-dev/neofs-api-go/service"; option go_package = "github.com/nspcc-dev/neofs-api-go/service";
option csharp_namespace = "NeoFS.API.Service"; option csharp_namespace = "NeoFS.API.Service";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
option (gogoproto.stable_marshaler_all) = true;
// RequestMetaHeader contains information about request meta headers // RequestMetaHeader contains information about request meta headers
// (should be embedded into message) // (should be embedded into message)
message RequestMetaHeader { message RequestMetaHeader {
@ -20,7 +16,7 @@ message RequestMetaHeader {
// Raw determines whether the request is raw or not // Raw determines whether the request is raw or not
bool Raw = 4; bool Raw = 4;
// ExtendedHeader carries extended headers of the request // ExtendedHeader carries extended headers of the request
RequestExtendedHeader ExtendedHeader = 5 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; RequestExtendedHeader ExtendedHeader = 5;
} }
// ResponseMetaHeader contains meta information based on request processing by server // ResponseMetaHeader contains meta information based on request processing by server
@ -45,5 +41,5 @@ message RequestExtendedHeader {
} }
// Headers carries list of key-value headers // Headers carries list of key-value headers
repeated KV Headers = 1 [(gogoproto.nullable) = false]; repeated KV Headers = 1;
} }

15
service/verify.proto
View file

@ -4,9 +4,6 @@ option go_package = "github.com/nspcc-dev/neofs-api-go/service";
option csharp_namespace = "NeoFS.API.Service"; option csharp_namespace = "NeoFS.API.Service";
import "refs/types.proto"; import "refs/types.proto";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";
option (gogoproto.stable_marshaler_all) = true;
// RequestVerificationHeader is a set of signatures of every NeoFS Node that processed request // RequestVerificationHeader is a set of signatures of every NeoFS Node that processed request
// (should be embedded into message). // (should be embedded into message).
@ -32,7 +29,7 @@ message RequestVerificationHeader {
message Token { message Token {
message Info { message Info {
// ID is a token identifier. valid UUIDv4 represented in bytes // ID is a token identifier. valid UUIDv4 represented in bytes
bytes ID = 1 [(gogoproto.customtype) = "TokenID", (gogoproto.nullable) = false]; bytes ID = 1;
// OwnerID carries identifier of the manipulation object owner. // OwnerID carries identifier of the manipulation object owner.
refs.OwnerID OwnerID = 2; refs.OwnerID OwnerID = 2;
@ -56,13 +53,13 @@ message Token {
} }
// Verb is a type of request for which the token is issued // Verb is a type of request for which the token is issued
Verb verb = 3 [(gogoproto.customname) = "Verb"]; Verb verb = 3;
// Address is an object address for which token is issued // Address is an object address for which token is issued
refs.Address Address = 4 [(gogoproto.nullable) = false, (gogoproto.customtype) = "Address"]; refs.Address Address = 4;
// Lifetime is a lifetime of the session // Lifetime is a lifetime of the session
TokenLifetime Lifetime = 5 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; TokenLifetime Lifetime = 5;
// SessionKey is a public key of session key // SessionKey is a public key of session key
bytes SessionKey = 6; bytes SessionKey = 6;
@ -72,7 +69,7 @@ message Token {
} }
// TokenInfo is a grouped information about token // TokenInfo is a grouped information about token
Info TokenInfo = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; Info TokenInfo = 1;
// Signature is a signature of session token information // Signature is a signature of session token information
bytes Signature = 8; bytes Signature = 8;
@ -109,7 +106,7 @@ message BearerTokenMsg {
} }
// TokenInfo is a grouped information about token // TokenInfo is a grouped information about token
Info TokenInfo = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; Info TokenInfo = 1;
// OwnerKey is a public key of the token owner // OwnerKey is a public key of the token owner
bytes OwnerKey = 2; bytes OwnerKey = 2;