TrueCloudLab/frostfs-testcases
26
0
Fork 21
Code Issues 2 Pull requests 3 Releases Activity Actions

[#1074] neofs-cli: Inline some of the functions

Browse source 
They are quite small, however will produce problems during subsequent refactoring.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-30 16:46:54 +03:00 • committed by fyrchik
parent 9efec21d34
commit a46f585fb3
3 changed files with 15 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,12 +114,14 @@ var listContainersCmd = &cobra.Command{
if containerOwner == "" {
user.IDFromKey(&idUser, key.PublicKey)
} else {
common.ExitOnErr(cmd, "", userFromString(&idUser, containerOwner))
err := idUser.DecodeString(containerOwner)
common.ExitOnErr(cmd, "invalid user ID: %w", err)
}
var prm internalclient.ListContainersPrm
cli := internalclient.GetSDKClientByFlag(cmd, key, commonflags.RPC)
prepareAPIClientWithKey(cmd, key, &prm)
var prm internalclient.ListContainersPrm
prm.SetClient(cli)
prm.SetAccount(idUser)
res, err := internalclient.ListContainers(prm)
@ -182,12 +184,10 @@ It will be stored in sidechain when inner ring will accepts it.`,
cnr.SetNonceUUID(nonce)
cnr.SetSessionToken(tok)
var (
putPrm internalclient.PutContainerPrm
getPrm internalclient.GetContainerPrm
)
cli := internalclient.GetSDKClientByFlag(cmd, key, commonflags.RPC)
prepareAPIClientWithKey(cmd, key, &putPrm, &getPrm)
var putPrm internalclient.PutContainerPrm
putPrm.SetClient(cli)
putPrm.SetContainer(*cnr)
res, err := internalclient.PutContainer(putPrm)
@ -200,6 +200,8 @@ It will be stored in sidechain when inner ring will accepts it.`,
if containerAwait {
cmd.Println("awaiting...")
var getPrm internalclient.GetContainerPrm
getPrm.SetClient(cli)
getPrm.SetContainer(id)
for i := 0; i < awaitTimeout; i++ {