diff --git a/go.mod b/go.mod
index 422777fab409bd0e9db47c4a1c7c3366389f92e9..771b4b2816d9345ea68be355f29402f14e3f94d0 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 a39b9b3e2cd3adbb20a2ac1838fa9ec57e082ab5..80c27386c3eeb7bfdf3d3d9a92fdfe9b5a889a2b 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 9de34e92049e1c1278e4573862b4a7502289f260..921a949f4dd7911fa52401847dc4b5e0b59042eb 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 421a0178c29b691c33085761bc1710e3c4cbe4eb..c2fa38b4ec74518f3ece6cee511da55cff8cca81 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 fea7765facc0f5ba2c6f07a5c7016d2e326a5d23..3e9e5219e1f5a60570c8f9c8937b44c33cab3681 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 7408e691dd4fb1e8e772ffe9e530fcd112d02729..17bb2b0b66393528911dde4bc6c04d16e5b11532 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 eaf778f878438fc2a44ef980a25a3aed803fcee8..535db8faff2504f93ff27c2f4127348b8aa24166 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 ec484dfe3b9a8ee1cb38d1d1d03cbfc5ce7a1f8a..19c57b787a8c89ee2369a687790dae2f565fffd8 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 6ece1b8b7d40f2c78d178ea88cf2aeb2ff7bb44f..aa9dd17f5c752934141722a026ce6f20d76f7046 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 0f41276cea0c2112aa1eb316b83d745c88208b07..39dff3e2605d60c9dea28377c08b597a360aea21 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 34c541f8f4e05556c58c2a0a8547812a3afe4e1e..8af4fb64b2e9f8d858b02553a02816862ab9da1a 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 169e726d32ec7cfbbc465a7100d10aad2b80d481..0290a6e51f20696ffdd4ceb839ecd461f3444eb5 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 ccb07ffb912ac93312281938c55b2f796661bc2f..714c861c8a40f360cdaecbde68ed312a5625efe0 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 6457395d3feb1d38245fb6c7fc22faaa884a73de..8e773515ce78e75e8f61c53de33a128a56193a62 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 21c22460089b5f4c5291991a5df3cd62015234ac..b9e4bc83d143dd224a42613b9987b29e3dc9f7c7 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 34e0fa4db1cf8149475dde562b3179091089f70f..aa177145521dacc1e91d01db918bd5f2234b2e12 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 6411216cd4f54cedd9bf2a3c61ff77b98d70cc35..97a50a1d2cffbb5578d1466b7fee48c396b45d87 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 c29d7987f8f656b562b9260436e03d3b7c35edc2..6dde6ecac8764a23a4435971b3495576c8a0f0d5 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 1389d32692eaf27f5068073d330696d1ad221bd3..04cda9910ead1d9004d24d17b0b251ced7c8d093 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 8fe38dbe1080d6a1ec7acdc9c565afd4c3852cdc..22a2a52230f4d92c71eab19a6f3da4e3eafac524 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 f18c2f576daddd4af61c9ca8138bbbc1903ad280..8265b2bfd4609537465864f3aa84a0aae97af1ba 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 0b373ba8af9959a3493ce37dd590113937c5727e..a86a2811e632a18aa473d506a4fe241a88d4aa9c 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 6168318d6d8a278648a92c88981c196f133db53a..6c41a8c257af438b91b9fbacef8a316a22c639e1 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 c4fb6cd1f1751bb3beb69696ce81635369b43085..b3b4eafad723a51cfbc03a774754c27dc7bf24b3 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 e319e19f9d32b9d3efa1e0d6fe485372e177efa2..a27396b613b2ec46fffec11fdb107116e942ac5a 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 85403cab8c13fb71612e275a2851c02a904d8abc..99e87f535531544ea588885970da0cb374cd154c 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 9899e39885a8ca07de15f74f2eeda24d65296928..ee7b788e2bf670b9f885c0fa3d9a52cbff30502e 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 fa7cf241737173d3c41cadaa2ae9fa17ecb43fe7..3a5ae2da4141eac9187d4078b9091519b8236532 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 14ff72216edb875ed3ca15cc879913fdb21a7ed7..b697d60733031bc259ce0d5b2efc24f2bb63bc94 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 882f73893efb740c378698eafa0c782a7101276a..228f43fae9adc57694147029edb239bce6282774 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 1d252fc1eddf3204d0b065dea21ecab10cb2a26f..b111a6160dba31fb7adb2919a66d8e3bf620ef16 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 98ab6654cb836eb49052faff76e447a07c12d538..2bc7826216698f31f56a5636cf9fb8d8106c7d87 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 3af5bbae0ed86bf079d93622cc8f1aa4f7fbdfd8..214cdf463436c71195457305de39516bd24e20d0 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 5d06e8232c89f226e4f7c0a80ca6d52eb219d48f..f8124ba307afb6caa42b881a0c5778f465bf6f0f 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 88e549f6e23e99a04d037fcefb4603a13821d24a..fe25ca1a7b676599d5d09463cdbb6c11aba87939 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 6df6b7951b031d7125b2a93174cf38117671ec7a..4ae734b0a23702978ace45ee6c481ac40f6f77ca 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 9ee491a71335a89beb14582f02b8b26fd3a264d6..01bf7d6ba127dcf46c00d8f75c81b978de5e4e7e 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 1d11e1c0990df144d99f511d20b4f844d4431b7a..0fd37e02ea14464fb9f7c8f3e2be5a862d01ea61 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 92918a88884de0a621858b7e09c49c66d83e5cab..3fd1180e5e2742e172d52da51cc4d00314355a48 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 966189093b756b558406ebacf758da6c2a3f4839..6bddb799d5ad72686df3a716bf427d61cc0499a9 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 1cf24d998b6422ad418cfbb0a47a51eba6fe801d..e8576fc07054247b34b6476a5c1b44335ea749d3 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 747b1a8cada8b5e189e5e4c7994c79cb36df8b02..165df31c97454de1d493c293112c320bda47e044 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 aa66bf57105f290aae04a763c5a8e931a410fc53..76455aafe2c9d667c9cff0a7ca75ae8916300940 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 dc012c75f1ff3a6965d9152f204c7d7f6b61d285..8a102252340da30189bf7f65124be1f010d225f8 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 be91797a2f1a7522c668d6bed19a84a5aab59df2..9a92bde894407be7520aa0f27a2112c5f4294cf0 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 5eea04ebcb85df088a9ad1d8c2608789a5a456e3..efe05ac83e9006e3d8345d25beca40fa0f4187ac 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 d8cc6a0a974d353cbdf5391c815b19056937507d..bf33dbbeea79339df43617ab97f460ca27d927b4 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 98f4b74c1d23e667d8c1d2c7290cd136f5e20a5d..4fcd2868c5d20dbb1b60187940c50a6327529da5 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 1837d41081572ab74ebfd7c9594a8292b4c9de29..2b45912bd1ab18ab8651b18cd17fbc6679b2d883 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 d0789e52420b5383530e10f89e06100197a32bbb..3a73ddd7680439be98f1e8ca6ec0f4dbb70b076a 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 2be01e97a5a98fcf5189b386fbb36d1a60f43db7..8817f6d832fc1d971ed9f36e80de1e5375e7d00d 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 {