From a8beb62693e002faf9bb823c55cae4580455166c Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Thu, 6 Aug 2020 01:34:11 +0300
Subject: [PATCH] [#32] service: Remove gogoproto from typedef

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>
---
 service/meta.proto   |  8 ++------
 service/verify.proto | 15 ++++++---------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/service/meta.proto b/service/meta.proto
index 8171980..34304ee 100644
--- a/service/meta.proto
+++ b/service/meta.proto
@@ -3,10 +3,6 @@ package service;
 option go_package = "github.com/nspcc-dev/neofs-api-go/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
 // (should be embedded into message)
 message RequestMetaHeader {
@@ -20,7 +16,7 @@ message RequestMetaHeader {
     // Raw determines whether the request is raw or not
     bool Raw       = 4;
     // 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
@@ -45,5 +41,5 @@ message RequestExtendedHeader {
     }
 
     // Headers carries list of key-value headers
-    repeated KV Headers = 1 [(gogoproto.nullable) = false];
+    repeated KV Headers = 1;
 }
diff --git a/service/verify.proto b/service/verify.proto
index 5206a33..9a91ced 100644
--- a/service/verify.proto
+++ b/service/verify.proto
@@ -4,9 +4,6 @@ option go_package = "github.com/nspcc-dev/neofs-api-go/service";
 option csharp_namespace = "NeoFS.API.Service";
 
 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
 // (should be embedded into message).
@@ -32,7 +29,7 @@ message RequestVerificationHeader {
 message Token {
     message Info {
         // 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.
         refs.OwnerID OwnerID = 2;
@@ -56,13 +53,13 @@ message Token {
         }
 
         // 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
-        refs.Address Address = 4 [(gogoproto.nullable) = false, (gogoproto.customtype) = "Address"];
+        refs.Address Address = 4;
 
         // 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
         bytes SessionKey = 6;
@@ -72,7 +69,7 @@ message 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
     bytes Signature = 8;
@@ -109,7 +106,7 @@ message BearerTokenMsg {
     }
 
     // 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
     bytes OwnerKey = 2;