dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[nspcc-dev#1692] cli: Remove --generate-key option in neofs-cli container delete

Browse source 
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2022-09-19 16:10:56 +03:00 committed by LeL
parent bb02913c39
commit c7f85994e5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -11,6 +11,8 @@ Changelog for NeoFS Node
### Removed ### Removed
- Remove WIF and NEP2 support in `neofs-cli`'s --wallet flag (#1128) - Remove WIF and NEP2 support in `neofs-cli`'s --wallet flag (#1128)
- Remove --generate-key option in `neofs-cli container delete` (#1692)
### Updated ### Updated
### Updating from v0.32.0 ### Updating from v0.32.0

8
cmd/neofs-cli/modules/container/delete.go
View file

@ -31,7 +31,7 @@ Only owner of the container has a permission to remove container.`,
common.ReadSessionToken(cmd, tok, sessionTokenPath) common.ReadSessionToken(cmd, tok, sessionTokenPath)
} }
pk := key.GetOrGenerate(cmd) pk := key.Get(cmd)
cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC) cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
if force, _ := cmd.Flags().GetBool(forceFlag); !force { if force, _ := cmd.Flags().GetBool(forceFlag); !force {
@ -92,10 +92,12 @@ Only owner of the container has a permission to remove container.`,
} }
func initContainerDeleteCmd() { func initContainerDeleteCmd() {
commonflags.Init(deleteContainerCmd)
flags := deleteContainerCmd.Flags() flags := deleteContainerCmd.Flags()
flags.StringP(commonflags.WalletPath, commonflags.WalletPathShorthand, commonflags.WalletPathDefault, commonflags.WalletPathUsage)
flags.StringP(commonflags.Account, commonflags.AccountShorthand, commonflags.AccountDefault, commonflags.AccountUsage)
flags.StringP(commonflags.RPC, commonflags.RPCShorthand, commonflags.RPCDefault, commonflags.RPCUsage)
flags.StringVar(&containerID, "cid", "", "container ID") flags.StringVar(&containerID, "cid", "", "container ID")
flags.BoolVar(&containerAwait, "await", false, "block execution until container is removed") flags.BoolVar(&containerAwait, "await", false, "block execution until container is removed")
flags.Bool(forceFlag, false, "do not check whether container contains locks and remove immediately") flags.Bool(forceFlag, false, "do not check whether container contains locks and remove immediately")