mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

Update neofs-api-go to latest version

Browse source 
Handle errors provided by JSON encoders.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-10-29 19:36:59 +03:00 • committed by Alex Vanin
parent b48a4ede02
commit b12d26f974
5 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/neofs-cli/modules/util.go
View file

@ -89,14 +89,14 @@ func signBearerToken(cmd *cobra.Command, _ []string) error {
var data []byte
if jsonFlag || len(to) == 0 {
data = v2ACL.BearerTokenToJSON(btok.ToV2())
if len(data) == 0 {
return errors.New("can't JSON encode bearer token")
data, err = v2ACL.BearerTokenToJSON(btok.ToV2())
if err != nil {
return fmt.Errorf("can't JSON encode bearer token: %w", err)
}
} else {
data, err = btok.ToV2().StableMarshal(nil)
if err != nil {
return errors.New("can't binary encode bearer token")
return fmt.Errorf("can't binary encode bearer token: %w", err)
}
}
@ -128,14 +128,14 @@ func convertEACLTable(cmd *cobra.Command, _ []string) error {
var data []byte
if jsonFlag || len(to) == 0 {
data = v2ACL.TableToJSON(table.ToV2())
if len(data) == 0 {
return errors.New("can't JSON encode extended ACL table")
data, err = v2ACL.TableToJSON(table.ToV2())
if err != nil {
return fmt.Errorf("can't JSON encode extended ACL table: %w", err)
}
} else {
data, err = table.ToV2().StableMarshal(nil)
if err != nil {
return errors.New("can't binary encode extended ACL table")
return fmt.Errorf("can't binary encode extended ACL table: %w", err)
}
}