TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1424] neofs-cli: Fail immediately if a key can't be fetched

Browse source 
If the key can't be fetched, an error is always returned, so it makes
sense to fail the whole command inside of a `key.Get*()`.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-24 11:22:23 +03:00 • committed by LeL
parent d9c5ca5e77
commit 295ec3700a
19 changed files with 70 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/neofs-cli/modules/container.go
View file

@ -15,6 +15,7 @@ import (
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
"github.com/nspcc-dev/neofs-node/pkg/core/version"
"github.com/nspcc-dev/neofs-sdk-go/acl"
"github.com/nspcc-dev/neofs-sdk-go/container"
@ -116,8 +117,7 @@ var listContainersCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
var idUser user.ID
key, err := getKey()
common.ExitOnErr(cmd, "", err)
key := key.GetOrGenerate(cmd)
if containerOwner == "" {
user.IDFromKey(&idUser, key.PublicKey)
@ -164,8 +164,7 @@ It will be stored in sidechain when inner ring will accepts it.`,
tok, err := getSessionToken(sessionTokenPath)
common.ExitOnErr(cmd, "", err)
key, err := getKey()
common.ExitOnErr(cmd, "", err)
key := key.GetOrGenerate(cmd)
var idOwner *user.ID