From 9816d59ec0feae7002a7915548d52d7bb1014c38 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 23 Jun 2022 16:52:47 +0300 Subject: [PATCH] [#1323] neofs-cli: Reuse JSON flag for multiple commands Signed-off-by: Evgenii Stratonikov --- cmd/neofs-cli/internal/commonflags/json.go | 3 +++ cmd/neofs-cli/modules/bearer/create.go | 2 +- cmd/neofs-cli/modules/container/get.go | 2 +- cmd/neofs-cli/modules/container/get_eacl.go | 2 +- cmd/neofs-cli/modules/control/snapshot.go | 2 +- cmd/neofs-cli/modules/netmap/nodeinfo.go | 2 +- cmd/neofs-cli/modules/object/get.go | 2 +- cmd/neofs-cli/modules/object/head.go | 4 ++-- cmd/neofs-cli/modules/object/range.go | 2 +- cmd/neofs-cli/modules/session/create.go | 2 +- cmd/neofs-cli/modules/util/convert_eacl.go | 5 +++-- cmd/neofs-cli/modules/util/sign_bearer.go | 2 +- 12 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 cmd/neofs-cli/internal/commonflags/json.go diff --git a/cmd/neofs-cli/internal/commonflags/json.go b/cmd/neofs-cli/internal/commonflags/json.go new file mode 100644 index 00000000..33021f05 --- /dev/null +++ b/cmd/neofs-cli/internal/commonflags/json.go @@ -0,0 +1,3 @@ +package commonflags + +const JSON = "json" diff --git a/cmd/neofs-cli/modules/bearer/create.go b/cmd/neofs-cli/modules/bearer/create.go index 3796b115..a96ab721 100644 --- a/cmd/neofs-cli/modules/bearer/create.go +++ b/cmd/neofs-cli/modules/bearer/create.go @@ -28,7 +28,7 @@ const ( expireAtFlag = "expire-at" ownerFlag = "owner" outFlag = "out" - jsonFlag = "json" + jsonFlag = commonflags.JSON ) var createCmd = &cobra.Command{ diff --git a/cmd/neofs-cli/modules/container/get.go b/cmd/neofs-cli/modules/container/get.go index 1bdd1922..6386b41e 100644 --- a/cmd/neofs-cli/modules/container/get.go +++ b/cmd/neofs-cli/modules/container/get.go @@ -80,7 +80,7 @@ func initContainerInfoCmd() { flags.StringVar(&containerID, "cid", "", "container ID") flags.StringVar(&containerPathTo, "to", "", "path to dump encoded container") flags.StringVar(&containerPathFrom, "from", "", "path to file with encoded container") - flags.BoolVar(&containerJSON, "json", false, "print or dump container in JSON format") + flags.BoolVar(&containerJSON, commonflags.JSON, false, "print or dump container in JSON format") } type stringWriter cobra.Command diff --git a/cmd/neofs-cli/modules/container/get_eacl.go b/cmd/neofs-cli/modules/container/get_eacl.go index 6ccf3654..d1a5d989 100644 --- a/cmd/neofs-cli/modules/container/get_eacl.go +++ b/cmd/neofs-cli/modules/container/get_eacl.go @@ -59,5 +59,5 @@ func initContainerGetEACLCmd() { flags.StringVar(&containerID, "cid", "", "container ID") flags.StringVar(&containerPathTo, "to", "", "path to dump encoded container (default: binary encoded)") - flags.BoolVar(&containerJSON, "json", false, "encode EACL table in json format") + flags.BoolVar(&containerJSON, commonflags.JSON, false, "encode EACL table in json format") } diff --git a/cmd/neofs-cli/modules/control/snapshot.go b/cmd/neofs-cli/modules/control/snapshot.go index 3e4c2827..49345d78 100644 --- a/cmd/neofs-cli/modules/control/snapshot.go +++ b/cmd/neofs-cli/modules/control/snapshot.go @@ -11,7 +11,7 @@ import ( ) const ( - netmapSnapshotJSONFlag = "json" + netmapSnapshotJSONFlag = commonflags.JSON ) var snapshotCmd = &cobra.Command{ diff --git a/cmd/neofs-cli/modules/netmap/nodeinfo.go b/cmd/neofs-cli/modules/netmap/nodeinfo.go index 0f44b7c5..2a747dea 100644 --- a/cmd/neofs-cli/modules/netmap/nodeinfo.go +++ b/cmd/neofs-cli/modules/netmap/nodeinfo.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" ) -const nodeInfoJSONFlag = "json" +const nodeInfoJSONFlag = commonflags.JSON var nodeInfoCmd = &cobra.Command{ Use: "nodeinfo", diff --git a/cmd/neofs-cli/modules/object/get.go b/cmd/neofs-cli/modules/object/get.go index 0409ac10..6269e4cf 100644 --- a/cmd/neofs-cli/modules/object/get.go +++ b/cmd/neofs-cli/modules/object/get.go @@ -115,7 +115,7 @@ func getObject(cmd *cobra.Command, _ []string) { } func strictOutput(cmd *cobra.Command) bool { - toJSON, _ := cmd.Flags().GetBool("json") + toJSON, _ := cmd.Flags().GetBool(commonflags.JSON) toProto, _ := cmd.Flags().GetBool("proto") return toJSON || toProto } diff --git a/cmd/neofs-cli/modules/object/head.go b/cmd/neofs-cli/modules/object/head.go index fc50fab0..1f464241 100644 --- a/cmd/neofs-cli/modules/object/head.go +++ b/cmd/neofs-cli/modules/object/head.go @@ -40,7 +40,7 @@ func initObjectHeadCmd() { flags.String("file", "", "File to write header to. Default: stdout.") flags.Bool("main-only", false, "Return only main fields") - flags.Bool("json", false, "Marshal output in JSON") + flags.Bool(commonflags.JSON, false, "Marshal output in JSON") flags.Bool("proto", false, "Marshal output in Protobuf") flags.Bool(rawFlag, false, rawFlagDesc) } @@ -96,7 +96,7 @@ func saveAndPrintHeader(cmd *cobra.Command, obj *object.Object, filename string) } func marshalHeader(cmd *cobra.Command, hdr *object.Object) ([]byte, error) { - toJSON, _ := cmd.Flags().GetBool("json") + toJSON, _ := cmd.Flags().GetBool(commonflags.JSON) toProto, _ := cmd.Flags().GetBool("proto") switch { case toJSON && toProto: diff --git a/cmd/neofs-cli/modules/object/range.go b/cmd/neofs-cli/modules/object/range.go index d85a9fa7..a1fc2a3b 100644 --- a/cmd/neofs-cli/modules/object/range.go +++ b/cmd/neofs-cli/modules/object/range.go @@ -120,7 +120,7 @@ func printSplitInfo(cmd *cobra.Command, info *object.SplitInfo) { } func marshalSplitInfo(cmd *cobra.Command, info *object.SplitInfo) ([]byte, error) { - toJSON, _ := cmd.Flags().GetBool("json") + toJSON, _ := cmd.Flags().GetBool(commonflags.JSON) toProto, _ := cmd.Flags().GetBool("proto") switch { case toJSON && toProto: diff --git a/cmd/neofs-cli/modules/session/create.go b/cmd/neofs-cli/modules/session/create.go index 25204435..ab0bb8fc 100644 --- a/cmd/neofs-cli/modules/session/create.go +++ b/cmd/neofs-cli/modules/session/create.go @@ -19,7 +19,7 @@ import ( const ( lifetimeFlag = "lifetime" outFlag = "out" - jsonFlag = "json" + jsonFlag = commonflags.JSON ) const defaultLifetime = 10 diff --git a/cmd/neofs-cli/modules/util/convert_eacl.go b/cmd/neofs-cli/modules/util/convert_eacl.go index d55405a3..ab38875d 100644 --- a/cmd/neofs-cli/modules/util/convert_eacl.go +++ b/cmd/neofs-cli/modules/util/convert_eacl.go @@ -6,6 +6,7 @@ import ( "os" "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" + "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" "github.com/spf13/cobra" ) @@ -23,13 +24,13 @@ func initConvertEACLCmd() { _ = convertEACLCmd.MarkFlagRequired("from") flags.String("to", "", "File to dump extended ACL table (default: binary encoded)") - flags.Bool("json", false, "Dump extended ACL table in JSON encoding") + flags.Bool(commonflags.JSON, false, "Dump extended ACL table in JSON encoding") } func convertEACLTable(cmd *cobra.Command, _ []string) { pathFrom := cmd.Flag("from").Value.String() to := cmd.Flag("to").Value.String() - jsonFlag, _ := cmd.Flags().GetBool("json") + jsonFlag, _ := cmd.Flags().GetBool(commonflags.JSON) table := common.ReadEACL(cmd, pathFrom) diff --git a/cmd/neofs-cli/modules/util/sign_bearer.go b/cmd/neofs-cli/modules/util/sign_bearer.go index 877077f0..29225d11 100644 --- a/cmd/neofs-cli/modules/util/sign_bearer.go +++ b/cmd/neofs-cli/modules/util/sign_bearer.go @@ -10,7 +10,7 @@ import ( ) const ( - signBearerJSONFlag = "json" + signBearerJSONFlag = commonflags.JSON ) var signBearerCmd = &cobra.Command{