From b232e9f46f31ba4d7da2958f4b14835819ab0637 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 22 Oct 2020 13:39:54 +0200 Subject: [PATCH] make vet happy, use protobuf generated merger --- accounts/pkg/service/v0/accounts.go | 3 ++- accounts/pkg/service/v0/groups.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go index f59e843a43..b6a0ccec81 100644 --- a/accounts/pkg/service/v0/accounts.go +++ b/accounts/pkg/service/v0/accounts.go @@ -308,7 +308,8 @@ func (s Service) CreateAccount(ctx context.Context, in *proto.CreateAccountReque if in.Account == nil { return merrors.InternalServerError(s.id, "invalid account: empty") } - *out = *in.Account + + out.XXX_Merge(in.Account) if out.Id == "" { out.Id = uuid.Must(uuid.NewV4()).String() diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go index 8b307f576c..c65f04b8b9 100644 --- a/accounts/pkg/service/v0/groups.go +++ b/accounts/pkg/service/v0/groups.go @@ -113,7 +113,7 @@ func (s Service) CreateGroup(c context.Context, in *proto.CreateGroupRequest, ou if in.Group == nil { return merrors.InternalServerError(s.id, "invalid group: empty") } - *out = *in.Group + out.XXX_Merge(in.Group) if out.Id == "" { out.Id = uuid.Must(uuid.NewV4()).String()