From 51e886dd67597bc78e420f2324bd1ec9085e4a7e Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Fri, 25 Nov 2022 14:12:11 +0300 Subject: [PATCH] [#2090] neofs-cli: Remove `--header` from `object get` Signed-off-by: Anton Nikiforov --- CHANGELOG.md | 3 ++- cmd/neofs-cli/modules/object/get.go | 12 ++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c5258fd..3d3a92bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,8 @@ Changelog for NeoFS Node - ObjectID signature output in the CLI (#2104) ### Removed -- `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands +- `-g` option from `neofs-cli control ...` and `neofs-cli container create` commands (#2089) +- `--header` from `neofs-cli object get` (#2090) ### Updated ### Updating from v0.34.0 diff --git a/cmd/neofs-cli/modules/object/get.go b/cmd/neofs-cli/modules/object/get.go index 6c2e09fa..69bbd644 100644 --- a/cmd/neofs-cli/modules/object/get.go +++ b/cmd/neofs-cli/modules/object/get.go @@ -37,7 +37,6 @@ func initObjectGetCmd() { _ = objectGetCmd.MarkFlagRequired(commonflags.OIDFlag) flags.String(fileFlag, "", "File to write object payload to(with -b together with signature and header). Default: stdout.") - flags.String("header", "", "File to write header to. Default: stdout.") flags.Bool(rawFlag, false, rawFlagDesc) flags.Bool(noProgressFlag, false, "Do not show progress bar") flags.Bool(binaryFlag, false, "Serialize whole object structure into given file(id + signature + header + payload).") @@ -124,16 +123,13 @@ func getObject(cmd *cobra.Command, _ []string) { common.ExitOnErr(cmd, "unable to write binary object in out: %w ", err) } - hdrFile := cmd.Flag("header").Value.String() - if filename != "" { - if hdrFile != "" || !strictOutput(cmd) { - cmd.Printf("[%s] Object successfully saved\n", filename) - } + if filename != "" && !strictOutput(cmd) { + cmd.Printf("[%s] Object successfully saved\n", filename) } // Print header only if file is not streamed to stdout. - if filename != "" || hdrFile != "" { - err = saveAndPrintHeader(cmd, res.Header(), hdrFile) + if filename != "" { + err = printHeader(cmd, res.Header()) common.ExitOnErr(cmd, "", err) } }