mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-19 14:13:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

make vet happy, use protobuf generated merger

Browse Source
This commit is contained in:
A.Unger
2020-10-22 13:39:54 +02:00
parent a484a6bc53
commit b232e9f46f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/pkg/service/v0/accounts.go
View File

@@ -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()

2
accounts/pkg/service/v0/groups.go
View File

@@ -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()