From 676a3efa79e136fc95ced5c8263c16032dd64f7b Mon Sep 17 00:00:00 2001 From: Airat Arifullin Date: Tue, 11 Jul 2023 12:36:33 +0300 Subject: [PATCH] [#390] cli: Make tree commands errors and messages more verbose Signed-off-by: Airat Arifullin a.arifullin@yadro.com --- cmd/frostfs-cli/modules/tree/add.go | 6 +++--- cmd/frostfs-cli/modules/tree/add_by_path.go | 6 +++--- cmd/frostfs-cli/modules/tree/get_by_path.go | 6 +++--- cmd/frostfs-cli/modules/tree/healthcheck.go | 9 +++++---- cmd/frostfs-cli/modules/tree/list.go | 6 +++--- cmd/frostfs-cli/modules/tree/move.go | 12 ++++++------ cmd/frostfs-cli/modules/tree/remove.go | 8 ++++---- cmd/frostfs-cli/modules/tree/subtree.go | 6 +++--- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmd/frostfs-cli/modules/tree/add.go b/cmd/frostfs-cli/modules/tree/add.go index ea9245271..28718687d 100644 --- a/cmd/frostfs-cli/modules/tree/add.go +++ b/cmd/frostfs-cli/modules/tree/add.go @@ -50,7 +50,7 @@ func add(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -64,10 +64,10 @@ func add(cmd *cobra.Command, _ []string) { BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(), } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) resp, err := cli.Add(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to cal add: %w", err) cmd.Println("Node ID: ", resp.Body.NodeId) } diff --git a/cmd/frostfs-cli/modules/tree/add_by_path.go b/cmd/frostfs-cli/modules/tree/add_by_path.go index 26e3dddfc..4661853a5 100644 --- a/cmd/frostfs-cli/modules/tree/add_by_path.go +++ b/cmd/frostfs-cli/modules/tree/add_by_path.go @@ -53,7 +53,7 @@ func addByPath(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -74,10 +74,10 @@ func addByPath(cmd *cobra.Command, _ []string) { BearerToken: common.ReadBearerToken(cmd, bearerFlagKey).Marshal(), } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) resp, err := cli.AddByPath(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to addByPath %w", err) cmd.Printf("Parent ID: %d\n", resp.GetBody().GetParentId()) diff --git a/cmd/frostfs-cli/modules/tree/get_by_path.go b/cmd/frostfs-cli/modules/tree/get_by_path.go index c76027938..f239066cd 100644 --- a/cmd/frostfs-cli/modules/tree/get_by_path.go +++ b/cmd/frostfs-cli/modules/tree/get_by_path.go @@ -53,7 +53,7 @@ func getByPath(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -78,10 +78,10 @@ func getByPath(cmd *cobra.Command, _ []string) { BearerToken: bt, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) resp, err := cli.GetNodeByPath(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to call getNodeByPath: %w", err) nn := resp.GetBody().GetNodes() if len(nn) == 0 { diff --git a/cmd/frostfs-cli/modules/tree/healthcheck.go b/cmd/frostfs-cli/modules/tree/healthcheck.go index 46d4c3409..f0506467e 100644 --- a/cmd/frostfs-cli/modules/tree/healthcheck.go +++ b/cmd/frostfs-cli/modules/tree/healthcheck.go @@ -1,6 +1,7 @@ package tree import ( + "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" @@ -28,15 +29,15 @@ func healthcheck(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) req := &tree.HealthcheckRequest{ Body: &tree.HealthcheckRequest_Body{}, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) _, err = cli.Healthcheck(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to call healthcheck: %w", err) - cmd.Println("Success.") + common.PrintVerbose(cmd, "Successful healthcheck invocation.") } diff --git a/cmd/frostfs-cli/modules/tree/list.go b/cmd/frostfs-cli/modules/tree/list.go index 8e4d2bd4c..a25d066d5 100644 --- a/cmd/frostfs-cli/modules/tree/list.go +++ b/cmd/frostfs-cli/modules/tree/list.go @@ -41,7 +41,7 @@ func list(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -52,10 +52,10 @@ func list(cmd *cobra.Command, _ []string) { }, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) resp, err := cli.TreeList(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to call treeList %w", err) for _, treeID := range resp.GetBody().GetIds() { cmd.Println(treeID) diff --git a/cmd/frostfs-cli/modules/tree/move.go b/cmd/frostfs-cli/modules/tree/move.go index b91769185..84b2fb80e 100644 --- a/cmd/frostfs-cli/modules/tree/move.go +++ b/cmd/frostfs-cli/modules/tree/move.go @@ -48,7 +48,7 @@ func move(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -71,7 +71,7 @@ func move(cmd *cobra.Command, _ []string) { BearerToken: bt, }, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(subTreeReq, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(subTreeReq, pk)) resp, err := cli.GetSubTree(ctx, subTreeReq) commonCmd.ExitOnErr(cmd, "rpc call: %w", err) @@ -81,7 +81,7 @@ func move(cmd *cobra.Command, _ []string) { meta = subtreeResp.GetBody().GetMeta() } if !errors.Is(err, io.EOF) { - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to read getSubTree response stream: %w", err) } var metaErr error if len(meta) == 0 { @@ -99,9 +99,9 @@ func move(cmd *cobra.Command, _ []string) { }, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) _, err = cli.Move(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) - cmd.Println("Success.") + commonCmd.ExitOnErr(cmd, "failed to call move: %w", err) + common.PrintVerbose(cmd, "Successful move invocation.") } diff --git a/cmd/frostfs-cli/modules/tree/remove.go b/cmd/frostfs-cli/modules/tree/remove.go index 7002ac9a4..74e9d9749 100644 --- a/cmd/frostfs-cli/modules/tree/remove.go +++ b/cmd/frostfs-cli/modules/tree/remove.go @@ -44,7 +44,7 @@ func remove(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -66,9 +66,9 @@ func remove(cmd *cobra.Command, _ []string) { }, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) _, err = cli.Remove(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) - cmd.Println("Success.") + commonCmd.ExitOnErr(cmd, "failed to call remove: %w", err) + common.PrintVerbose(cmd, "Successful remove invocation.") } diff --git a/cmd/frostfs-cli/modules/tree/subtree.go b/cmd/frostfs-cli/modules/tree/subtree.go index f6dcf85ff..64cb351ec 100644 --- a/cmd/frostfs-cli/modules/tree/subtree.go +++ b/cmd/frostfs-cli/modules/tree/subtree.go @@ -48,7 +48,7 @@ func getSubTree(cmd *cobra.Command, _ []string) { ctx := cmd.Context() cli, err := _client(ctx) - commonCmd.ExitOnErr(cmd, "client: %w", err) + commonCmd.ExitOnErr(cmd, "failed to create client: %w", err) rawCID := make([]byte, sha256.Size) cnr.Encode(rawCID) @@ -74,10 +74,10 @@ func getSubTree(cmd *cobra.Command, _ []string) { }, } - commonCmd.ExitOnErr(cmd, "message signing: %w", tree.SignMessage(req, pk)) + commonCmd.ExitOnErr(cmd, "signing message: %w", tree.SignMessage(req, pk)) resp, err := cli.GetSubTree(ctx, req) - commonCmd.ExitOnErr(cmd, "rpc call: %w", err) + commonCmd.ExitOnErr(cmd, "failed to call getSubTree: %w", err) subtreeResp, err := resp.Recv() for ; err == nil; subtreeResp, err = resp.Recv() {