george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1704] cli: Add force option to the command container create

Browse source 
Validate policy before container creation

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2022-09-27 09:49:45 +03:00 • committed by fyrchik
parent 4eb0ed11f8
commit 8bf82d738b
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,8 +13,6 @@ import (
"github.com/spf13/cobra"
)
const forceFlag = "force"
var deleteContainerCmd = &cobra.Command{
Use: "delete",
Short: "Delete existing container",
@ -34,7 +32,7 @@ Only owner of the container has a permission to remove container.`,
pk := key.Get(cmd)
cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
if force, _ := cmd.Flags().GetBool(forceFlag); !force {
if force, _ := cmd.Flags().GetBool(commonflags.ForceFlag); !force {
fs := objectSDK.NewSearchFilters()
fs.AddTypeFilter(objectSDK.MatchStringEqual, objectSDK.TypeLock)
@ -52,7 +50,7 @@ Only owner of the container has a permission to remove container.`,
if len(res.IDList()) != 0 {
common.ExitOnErr(cmd, "",
fmt.Errorf("Container wasn't removed because LOCK objects were found.\n"+
"Use --%s flag to remove anyway.", forceFlag))
"Use --%s flag to remove anyway.", commonflags.ForceFlag))
}
}
@ -100,5 +98,5 @@ func initContainerDeleteCmd() {
flags.StringVar(&containerID, "cid", "", "container ID")
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.BoolP(commonflags.ForceFlag, commonflags.ForceFlagShorthand, false, "do not check whether container contains locks and remove immediately")
}