realloc/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#185] v2: Return errors in JSON converters

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-10-28 15:10:54 +03:00 • committed by Alex Vanin
parent ac38d13f04
commit 352e99d9b9
6 changed files with 105 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

63
v2/acl/json.go
View file

@ -1,93 +1,84 @@
package acl
import (
"errors"
acl "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc"
"google.golang.org/protobuf/encoding/protojson"
)
func RecordToJSON(r *Record) (data []byte) {
var (
errEmptyInput = errors.New("empty input")
)
func RecordToJSON(r *Record) ([]byte, error) {
if r == nil {
return nil
return nil, errEmptyInput
}
msg := RecordToGRPCMessage(r)
data, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
if err != nil {
return nil
}
return
return protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
}
func RecordFromJSON(data []byte) *Record {
func RecordFromJSON(data []byte) (*Record, error) {
if len(data) == 0 {
return nil
return nil, errEmptyInput
}
msg := new(acl.EACLRecord)
if err := protojson.Unmarshal(data, msg); err != nil {
return nil
return nil, err
}
return RecordFromGRPCMessage(msg)
return RecordFromGRPCMessage(msg), nil
}
func TableToJSON(t *Table) (data []byte) {
func TableToJSON(t *Table) ([]byte, error) {
if t == nil {
return nil
return nil, errEmptyInput
}
msg := TableToGRPCMessage(t)
data, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
if err != nil {
return nil
}
return
return protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
}
func TableFromJSON(data []byte) *Table {
func TableFromJSON(data []byte) (*Table, error) {
if len(data) == 0 {
return nil
return nil, errEmptyInput
}
msg := new(acl.EACLTable)
if err := protojson.Unmarshal(data, msg); err != nil {
return nil
return nil, err
}
return TableFromGRPCMessage(msg)
return TableFromGRPCMessage(msg), nil
}
func BearerTokenToJSON(t *BearerToken) (data []byte) {
func BearerTokenToJSON(t *BearerToken) ([]byte, error) {
if t == nil {
return nil
return nil, errEmptyInput
}
msg := BearerTokenToGRPCMessage(t)
data, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
if err != nil {
return nil
}
return
return protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(msg)
}
func BearerTokenFromJSON(data []byte) *BearerToken {
func BearerTokenFromJSON(data []byte) (*BearerToken, error) {
if len(data) == 0 {
return nil
return nil, errEmptyInput
}
msg := new(acl.BearerToken)
if err := protojson.Unmarshal(data, msg); err != nil {
return nil
return nil, err
}
return BearerTokenFromGRPCMessage(msg)
return BearerTokenFromGRPCMessage(msg), nil
}