From d4317cbaccd1b1bc6d4094a5cc23c9cf8e809c1e Mon Sep 17 00:00:00 2001
From: Anton Sattarov <dirty.mew@gmail.com>
Date: Tue, 7 Nov 2023 11:54:04 +0100
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D1=8B=D0=B9=20protobuff=20github.com/golang/?=
 =?UTF-8?q?protobuf=20v1.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod                                        |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../transport/grpc/server.microgen.go         |  2 +-
 pkg/clients/transport/grpc/client.microgen.go |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/clients/transport/grpc/server.microgen.go |  2 +-
 .../transport/grpc/client.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../transport/grpc/server.microgen.go         |  2 +-
 .../transport/grpc/client.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../transport/grpc/server.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../transport/grpc/server.microgen.go         |  2 +-
 .../grpc/protobuf_type_converters.microgen.go | 18 +++++++-------
 .../transport/grpc/client.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../grpc/protobuf_type_converters.microgen.go |  6 ++---
 .../transport/grpc/server.microgen.go         |  2 +-
 pkg/events/nats_integration_test.go           |  2 +-
 pkg/events/proto_encoder.go                   |  2 +-
 pkg/files/transport/grpc/client.microgen.go   |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/files/transport/grpc/server.microgen.go   |  2 +-
 .../transport/grpc/client.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../grpc/protobuf_type_converters.microgen.go | 24 ++++++-------------
 .../transport/grpc/server.microgen.go         |  2 +-
 pkg/items/events.go                           |  2 +-
 pkg/items/transport/grpc/client.microgen.go   |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/items/transport/grpc/server.microgen.go   |  2 +-
 pkg/locales/transport/grpc/client.microgen.go |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/locales/transport/grpc/server.microgen.go |  2 +-
 pkg/members/transport/grpc/client.microgen.go |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/members/transport/grpc/server.microgen.go |  2 +-
 .../transport/grpc/client.microgen.go         |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../transport/grpc/server.microgen.go         |  2 +-
 pkg/roles/transport/grpc/client.microgen.go   |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/roles/transport/grpc/server.microgen.go   |  2 +-
 pkg/spaces/transport/grpc/client.microgen.go  |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 pkg/spaces/transport/grpc/server.microgen.go  |  2 +-
 pkg/users/transport/grpc/client.microgen.go   |  2 +-
 .../protobuf_endpoint_converters.microgen.go  |  2 +-
 .../grpc/protobuf_type_converters.microgen.go |  2 +-
 pkg/users/transport/grpc/server.microgen.go   |  2 +-
 51 files changed, 67 insertions(+), 77 deletions(-)

diff --git a/go.mod b/go.mod
index 422777fa..771b4b28 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/antonmedv/expr v1.9.0
 	github.com/avast/retry-go/v4 v4.5.0
 	github.com/go-kit/kit v0.13.0
-	github.com/golang/protobuf v1.5.3
 	github.com/gosimple/slug v1.13.1
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru/v2 v2.0.7
@@ -36,6 +35,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
diff --git a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
index a39b9b3e..80c27386 100644
--- a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/account/versions/transport/grpc/server.microgen.go b/pkg/account/versions/transport/grpc/server.microgen.go
index 9de34e92..921a949f 100644
--- a/pkg/account/versions/transport/grpc/server.microgen.go
+++ b/pkg/account/versions/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type versionsServer struct {
diff --git a/pkg/clients/transport/grpc/client.microgen.go b/pkg/clients/transport/grpc/client.microgen.go
index 421a0178..c2fa38b4 100644
--- a/pkg/clients/transport/grpc/client.microgen.go
+++ b/pkg/clients/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
index fea7765f..3e9e5219 100644
--- a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -10,7 +10,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/clients/transport/grpc/server.microgen.go b/pkg/clients/transport/grpc/server.microgen.go
index 7408e691..17bb2b0b 100644
--- a/pkg/clients/transport/grpc/server.microgen.go
+++ b/pkg/clients/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type clientsServer struct {
diff --git a/pkg/collaborators/transport/grpc/client.microgen.go b/pkg/collaborators/transport/grpc/client.microgen.go
index eaf778f8..535db8fa 100644
--- a/pkg/collaborators/transport/grpc/client.microgen.go
+++ b/pkg/collaborators/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
index ec484dfe..19c57b78 100644
--- a/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Set_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/collaborators/transport/grpc/server.microgen.go b/pkg/collaborators/transport/grpc/server.microgen.go
index 6ece1b8b..aa9dd17f 100644
--- a/pkg/collaborators/transport/grpc/server.microgen.go
+++ b/pkg/collaborators/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type collaboratorsServer struct {
diff --git a/pkg/collections/transport/grpc/client.microgen.go b/pkg/collections/transport/grpc/client.microgen.go
index 0f41276c..39dff3e2 100644
--- a/pkg/collections/transport/grpc/client.microgen.go
+++ b/pkg/collections/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/collections/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/collections/transport/grpc/protobuf_endpoint_converters.microgen.go
index 34c541f8..8af4fb64 100644
--- a/pkg/collections/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/collections/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/collections/transport/grpc/server.microgen.go b/pkg/collections/transport/grpc/server.microgen.go
index 169e726d..0290a6e5 100644
--- a/pkg/collections/transport/grpc/server.microgen.go
+++ b/pkg/collections/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type collectionsServer struct {
diff --git a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
index ccb07ffb..714c861c 100644
--- a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/content/versions/transport/grpc/server.microgen.go b/pkg/content/versions/transport/grpc/server.microgen.go
index 6457395d..8e773515 100644
--- a/pkg/content/versions/transport/grpc/server.microgen.go
+++ b/pkg/content/versions/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type versionsServer struct {
diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
index 21c22460..b9e4bc83 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -20,8 +20,8 @@ import (
 	environmentspb "git.perx.ru/perxis/perxis-go/proto/environments"
 	itemspb "git.perx.ru/perxis/perxis-go/proto/items"
 	localespb "git.perx.ru/perxis/perxis-go/proto/locales"
-	"github.com/golang/protobuf/ptypes"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func ListPtrLocalesLocaleToProto(locales []*locales.Locale) ([]*localespb.Locale, error) {
@@ -55,7 +55,7 @@ func PtrEnvironmentsEnvironmentToProto(env *environments.Environment) (*environm
 			State: environmentspb.StateInfo_State(env.StateInfo.State),
 			Info:  env.StateInfo.Info,
 		}
-		protoEnvironment.StateInfo.StartedAt, _ = ptypes.TimestampProto(env.StateInfo.StartedAt)
+		protoEnvironment.StateInfo.StartedAt = timestamppb.New(env.StateInfo.StartedAt)
 	}
 	if env.Config != nil {
 		protoEnvironment.Config = &environmentspb.Config{
@@ -81,7 +81,7 @@ func ProtoToPtrEnvironmentsEnvironment(protoEnv *environmentspb.Environment) (*e
 			State: environments.State(protoEnv.StateInfo.State),
 			Info:  protoEnv.StateInfo.Info,
 		}
-		env.StateInfo.StartedAt, _ = ptypes.Timestamp(protoEnv.StateInfo.StartedAt)
+		env.StateInfo.StartedAt = protoEnv.StateInfo.StartedAt.AsTime()
 	}
 	if protoEnv.Config != nil {
 		env.Config = &environments.Config{
@@ -214,9 +214,9 @@ func PtrItemsItemToProto(item *items.Item) (*itemspb.Item, error) {
 	}
 	//protoItem.Permissions - не передается для delivery
 
-	protoItem.CreatedRevAt, _ = ptypes.TimestampProto(item.CreatedRevAt)
-	protoItem.CreatedAt, _ = ptypes.TimestampProto(item.CreatedAt)
-	protoItem.UpdatedAt, _ = ptypes.TimestampProto(item.UpdatedAt)
+	protoItem.CreatedRevAt = timestamppb.New(item.CreatedRevAt)
+	protoItem.CreatedAt = timestamppb.New(item.CreatedAt)
+	protoItem.UpdatedAt = timestamppb.New(item.UpdatedAt)
 
 	return protoItem, nil
 }
@@ -243,9 +243,9 @@ func ProtoToPtrItemsItem(protoItem *itemspb.Item) (*items.Item, error) {
 	item.Translations, _ = ProtoToMapStringMapStringInterface(protoItem.Translations)
 	//item.Permissions - не передается для delivery
 
-	item.CreatedRevAt, _ = ptypes.Timestamp(protoItem.CreatedRevAt)
-	item.CreatedAt, _ = ptypes.Timestamp(protoItem.CreatedAt)
-	item.UpdatedAt, _ = ptypes.Timestamp(protoItem.UpdatedAt)
+	item.CreatedRevAt = protoItem.CreatedRevAt.AsTime()
+	item.CreatedAt = protoItem.CreatedAt.AsTime()
+	item.UpdatedAt = protoItem.UpdatedAt.AsTime()
 
 	return item, nil
 }
diff --git a/pkg/environments/transport/grpc/client.microgen.go b/pkg/environments/transport/grpc/client.microgen.go
index 34e0fa4d..aa177145 100644
--- a/pkg/environments/transport/grpc/client.microgen.go
+++ b/pkg/environments/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
index 6411216c..97a50a1d 100644
--- a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go b/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go
index c29d7987..6dde6eca 100644
--- a/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,7 +7,7 @@ package transportgrpc
 import (
 	service "git.perx.ru/perxis/perxis-go/pkg/environments"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
-	"github.com/golang/protobuf/ptypes"
+	timestamp "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func PtrEnvironmentToProto(env *service.Environment) (*pb.Environment, error) {
@@ -25,7 +25,7 @@ func PtrEnvironmentToProto(env *service.Environment) (*pb.Environment, error) {
 			State: pb.StateInfo_State(env.StateInfo.State),
 			Info:  env.StateInfo.Info,
 		}
-		protoEnvironment.StateInfo.StartedAt, _ = ptypes.TimestampProto(env.StateInfo.StartedAt)
+		protoEnvironment.StateInfo.StartedAt = timestamp.New(env.StateInfo.StartedAt)
 	}
 	if env.Config != nil {
 		protoEnvironment.Config = &pb.Config{
@@ -51,7 +51,7 @@ func ProtoToPtrEnvironment(protoEnv *pb.Environment) (*service.Environment, erro
 			State: service.State(protoEnv.StateInfo.State),
 			Info:  protoEnv.StateInfo.Info,
 		}
-		env.StateInfo.StartedAt, _ = ptypes.Timestamp(protoEnv.StateInfo.StartedAt)
+		env.StateInfo.StartedAt = protoEnv.StateInfo.StartedAt.AsTime()
 	}
 	if protoEnv.Config != nil {
 		env.Config = &service.Config{
diff --git a/pkg/environments/transport/grpc/server.microgen.go b/pkg/environments/transport/grpc/server.microgen.go
index 1389d326..04cda991 100644
--- a/pkg/environments/transport/grpc/server.microgen.go
+++ b/pkg/environments/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type environmentsServer struct {
diff --git a/pkg/events/nats_integration_test.go b/pkg/events/nats_integration_test.go
index 8fe38dbe..22a2a522 100644
--- a/pkg/events/nats_integration_test.go
+++ b/pkg/events/nats_integration_test.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	pb "git.perx.ru/perxis/perxis-go/pkg/events/test_proto"
-	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/proto"
 )
 
 type Test struct {
diff --git a/pkg/events/proto_encoder.go b/pkg/events/proto_encoder.go
index f18c2f57..8265b2bf 100644
--- a/pkg/events/proto_encoder.go
+++ b/pkg/events/proto_encoder.go
@@ -2,9 +2,9 @@ package events
 
 import (
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
-	"github.com/golang/protobuf/proto"
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/encoders/protobuf"
+	"google.golang.org/protobuf/proto"
 )
 
 type ProtoEncoder interface {
diff --git a/pkg/files/transport/grpc/client.microgen.go b/pkg/files/transport/grpc/client.microgen.go
index 0b373ba8..a86a2811 100644
--- a/pkg/files/transport/grpc/client.microgen.go
+++ b/pkg/files/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/files/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/files"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go
index 6168318d..6c41a8c2 100644
--- a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -10,7 +10,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/files"
 	"git.perx.ru/perxis/perxis-go/pkg/files/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/files"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_StartUpload_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/files/transport/grpc/server.microgen.go b/pkg/files/transport/grpc/server.microgen.go
index c4fb6cd1..b3b4eafa 100644
--- a/pkg/files/transport/grpc/server.microgen.go
+++ b/pkg/files/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/files/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/files"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type filesServer struct {
diff --git a/pkg/invitations/transport/grpc/client.microgen.go b/pkg/invitations/transport/grpc/client.microgen.go
index e319e19f..a27396b6 100644
--- a/pkg/invitations/transport/grpc/client.microgen.go
+++ b/pkg/invitations/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/invitations"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go
index 85403cab..99e87f53 100644
--- a/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/invitations/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/invitations"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go b/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
index 9899e398..ee7b788e 100644
--- a/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/invitations/transport/grpc/protobuf_type_converters.microgen.go
@@ -10,29 +10,21 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/invitations"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
 	pb "git.perx.ru/perxis/perxis-go/proto/invitations"
-	"github.com/golang/protobuf/ptypes"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
+	timestamp "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func PtrTimeTimeToProto(validUntil *time.Time) (*timestamp.Timestamp, error) {
 	if validUntil == nil {
 		return nil, nil
 	}
-	t, err := ptypes.TimestampProto(*validUntil)
-	if err != nil {
-		return nil, err
-	}
-	return t, err
+	return timestamp.New(*validUntil), nil
 }
 
 func ProtoToPtrTimeTime(protoValidUntil *timestamp.Timestamp) (*time.Time, error) {
 	if protoValidUntil == nil {
 		return nil, nil
 	}
-	t, err := ptypes.Timestamp(protoValidUntil)
-	if err != nil {
-		return nil, err
-	}
+	t := protoValidUntil.AsTime()
 	return &t, nil
 }
 
@@ -49,12 +41,10 @@ func PtrInvitationToProto(invitation *service.Invitation) (*pb.Invitation, error
 		Role:    invitation.Role,
 	}
 	if invitation.CreatedAt != nil && !invitation.CreatedAt.IsZero() {
-		t, _ := ptypes.TimestampProto(*invitation.CreatedAt)
-		pi.CreatedAt = t
+		pi.CreatedAt = timestamp.New(*invitation.CreatedAt)
 	}
 	if invitation.ValidUntil != nil && !invitation.ValidUntil.IsZero() {
-		t, _ := ptypes.TimestampProto(*invitation.ValidUntil)
-		pi.ValidUntil = t
+		pi.ValidUntil = timestamp.New(*invitation.ValidUntil)
 	}
 	return pi, nil
 }
@@ -72,11 +62,11 @@ func ProtoToPtrInvitation(protoInvitation *pb.Invitation) (*service.Invitation,
 		Role:    protoInvitation.Role,
 	}
 	if protoInvitation.CreatedAt != nil {
-		t, _ := ptypes.Timestamp(protoInvitation.CreatedAt)
+		t := protoInvitation.CreatedAt.AsTime()
 		i.CreatedAt = &t
 	}
 	if protoInvitation.ValidUntil != nil {
-		t, _ := ptypes.Timestamp(protoInvitation.ValidUntil)
+		t := protoInvitation.ValidUntil.AsTime()
 		i.ValidUntil = &t
 	}
 	return i, nil
diff --git a/pkg/invitations/transport/grpc/server.microgen.go b/pkg/invitations/transport/grpc/server.microgen.go
index fa7cf241..3a5ae2da 100644
--- a/pkg/invitations/transport/grpc/server.microgen.go
+++ b/pkg/invitations/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/invitations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/invitations"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type invitationsServer struct {
diff --git a/pkg/items/events.go b/pkg/items/events.go
index 14ff7221..b697d607 100644
--- a/pkg/items/events.go
+++ b/pkg/items/events.go
@@ -3,7 +3,7 @@ package items
 import (
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	pb "git.perx.ru/perxis/perxis-go/proto/items"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 const (
diff --git a/pkg/items/transport/grpc/client.microgen.go b/pkg/items/transport/grpc/client.microgen.go
index 882f7389..228f43fa 100644
--- a/pkg/items/transport/grpc/client.microgen.go
+++ b/pkg/items/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/items"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go
index 1d252fc1..b111a616 100644
--- a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/items"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/items/transport/grpc/server.microgen.go b/pkg/items/transport/grpc/server.microgen.go
index 98ab6654..2bc78262 100644
--- a/pkg/items/transport/grpc/server.microgen.go
+++ b/pkg/items/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/items"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type itemsServer struct {
diff --git a/pkg/locales/transport/grpc/client.microgen.go b/pkg/locales/transport/grpc/client.microgen.go
index 3af5bbae..214cdf46 100644
--- a/pkg/locales/transport/grpc/client.microgen.go
+++ b/pkg/locales/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/locales"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
index 5d06e823..f8124ba3 100644
--- a/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/locales"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/locales/transport/grpc/server.microgen.go b/pkg/locales/transport/grpc/server.microgen.go
index 88e549f6..fe25ca1a 100644
--- a/pkg/locales/transport/grpc/server.microgen.go
+++ b/pkg/locales/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/locales"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type localesServer struct {
diff --git a/pkg/members/transport/grpc/client.microgen.go b/pkg/members/transport/grpc/client.microgen.go
index 6df6b795..4ae734b0 100644
--- a/pkg/members/transport/grpc/client.microgen.go
+++ b/pkg/members/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/members/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/members"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/members/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/members/transport/grpc/protobuf_endpoint_converters.microgen.go
index 9ee491a7..01bf7d6b 100644
--- a/pkg/members/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/members/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/members/transport"
 	"git.perx.ru/perxis/perxis-go/proto/members"
-	"github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Set_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/members/transport/grpc/server.microgen.go b/pkg/members/transport/grpc/server.microgen.go
index 1d11e1c0..0fd37e02 100644
--- a/pkg/members/transport/grpc/server.microgen.go
+++ b/pkg/members/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/members/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/members"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type membersServer struct {
diff --git a/pkg/organizations/transport/grpc/client.microgen.go b/pkg/organizations/transport/grpc/client.microgen.go
index 92918a88..3fd1180e 100644
--- a/pkg/organizations/transport/grpc/client.microgen.go
+++ b/pkg/organizations/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/organizations"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go
index 96618909..6bddb799 100644
--- a/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/organizations/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/organizations"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/organizations/transport/grpc/server.microgen.go b/pkg/organizations/transport/grpc/server.microgen.go
index 1cf24d99..e8576fc0 100644
--- a/pkg/organizations/transport/grpc/server.microgen.go
+++ b/pkg/organizations/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/organizations"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type organizationsServer struct {
diff --git a/pkg/roles/transport/grpc/client.microgen.go b/pkg/roles/transport/grpc/client.microgen.go
index 747b1a8c..165df31c 100644
--- a/pkg/roles/transport/grpc/client.microgen.go
+++ b/pkg/roles/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/roles"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
index aa66bf57..76455aaf 100644
--- a/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/roles"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/roles/transport/grpc/server.microgen.go b/pkg/roles/transport/grpc/server.microgen.go
index dc012c75..8a102252 100644
--- a/pkg/roles/transport/grpc/server.microgen.go
+++ b/pkg/roles/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/roles"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type rolesServer struct {
diff --git a/pkg/spaces/transport/grpc/client.microgen.go b/pkg/spaces/transport/grpc/client.microgen.go
index be91797a..9a92bde8 100644
--- a/pkg/spaces/transport/grpc/client.microgen.go
+++ b/pkg/spaces/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
index 5eea04eb..efe05ac8 100644
--- a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/spaces/transport/grpc/server.microgen.go b/pkg/spaces/transport/grpc/server.microgen.go
index d8cc6a0a..bf33dbbe 100644
--- a/pkg/spaces/transport/grpc/server.microgen.go
+++ b/pkg/spaces/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/spaces"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type spacesServer struct {
diff --git a/pkg/users/transport/grpc/client.microgen.go b/pkg/users/transport/grpc/client.microgen.go
index 98f4b74c..4fcd2868 100644
--- a/pkg/users/transport/grpc/client.microgen.go
+++ b/pkg/users/transport/grpc/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {
diff --git a/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
index 1837d410..2b45912b 100644
--- a/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {
diff --git a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go b/pkg/users/transport/grpc/protobuf_type_converters.microgen.go
index d0789e52..3a73ddd7 100644
--- a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/users/transport/grpc/protobuf_type_converters.microgen.go
@@ -9,7 +9,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/users"
 	common "git.perx.ru/perxis/perxis-go/proto/common"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
-	"github.com/golang/protobuf/ptypes/wrappers"
+	wrappers "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func PtrUserToProto(create *service.User) (*pb.User, error) {
diff --git a/pkg/users/transport/grpc/server.microgen.go b/pkg/users/transport/grpc/server.microgen.go
index 2be01e97..8817f6d8 100644
--- a/pkg/users/transport/grpc/server.microgen.go
+++ b/pkg/users/transport/grpc/server.microgen.go
@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type usersServer struct {
-- 
GitLab