[#1424] neofs-cli: Fail immediately if a key can't be fetched

If the key can't be fetched, an error is always returned, so it makes
sense to fail the whole command inside of a `key.Get*()`.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>

cmd/neofs-cli/modules/control/drop_objects.go

@@ -6,6 +6,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
 	"github.com/spf13/cobra"
@@ -18,7 +19,7 @@ var dropObjectsCmd = &cobra.Command{
 	Short: "Drop objects from the node's local storage",
 	Long:  "Drop objects from the node's local storage",
 	Run: func(cmd *cobra.Command, args []string) {
-		pk := getKey(cmd)
+		pk := key.Get(cmd)
 
 		dropObjectsList, _ := cmd.Flags().GetStringSlice(dropObjectsFlag)
 		binAddrList := make([][]byte, 0, len(dropObjectsList))

cmd/neofs-cli/modules/control/healthcheck.go

@@ -6,6 +6,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	ircontrol "github.com/nspcc-dev/neofs-node/pkg/services/control/ir"
 	ircontrolsrv "github.com/nspcc-dev/neofs-node/pkg/services/control/ir/server"
@@ -34,7 +35,7 @@ func initControlHealthCheckCmd() {
 }
 
 func healthCheck(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	cli := getClient(cmd, pk)
 

cmd/neofs-cli/modules/control/set_netmap_status.go

@@ -6,6 +6,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -43,7 +44,7 @@ func initControlSetNetmapStatusCmd() {
 }
 
 func setNetmapStatus(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	var status control.NetmapStatus
 

cmd/neofs-cli/modules/control/shards_dump.go

@@ -4,6 +4,7 @@ import (
 	"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -21,7 +22,7 @@ var dumpShardCmd = &cobra.Command{
 }
 
 func dumpShard(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	body := new(control.DumpShardRequest_Body)
 	body.SetShardID(getShardID(cmd))

cmd/neofs-cli/modules/control/shards_list.go

@@ -7,6 +7,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -27,7 +28,7 @@ func initControlShardsListCmd() {
 }
 
 func listShards(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	req := new(control.ListShardsRequest)
 	req.SetBody(new(control.ListShardsRequest_Body))

cmd/neofs-cli/modules/control/shards_restore.go

@@ -4,6 +4,7 @@ import (
 	"github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -21,7 +22,7 @@ var restoreShardCmd = &cobra.Command{
 }
 
 func restoreShard(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	body := new(control.RestoreShardRequest_Body)
 	body.SetShardID(getShardID(cmd))

cmd/neofs-cli/modules/control/shards_set_mode.go

@@ -7,6 +7,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -46,7 +47,7 @@ func initControlSetShardModeCmd() {
 }
 
 func setShardMode(cmd *cobra.Command, _ []string) {
-	pk := getKey(cmd)
+	pk := key.Get(cmd)
 
 	var mode control.ShardMode
 

cmd/neofs-cli/modules/control/snapshot.go

@@ -5,6 +5,7 @@ import (
 	rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
+	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	"github.com/nspcc-dev/neofs-node/pkg/services/control"
 	"github.com/spf13/cobra"
 )
@@ -18,7 +19,7 @@ var snapshotCmd = &cobra.Command{
 	Short: "Get network map snapshot",
 	Long:  "Get network map snapshot",
 	Run: func(cmd *cobra.Command, args []string) {
-		pk := getKey(cmd)
+		pk := key.Get(cmd)
 
 		req := new(control.NetmapSnapshotRequest)
 		req.SetBody(new(control.NetmapSnapshotRequest_Body))

cmd/neofs-cli/modules/control/util.go

@@ -7,7 +7,6 @@ import (
 	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 	internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
-	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	controlSvc "github.com/nspcc-dev/neofs-node/pkg/services/control/server"
 	"github.com/nspcc-dev/neofs-sdk-go/client"
 	neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto"
@@ -54,9 +53,3 @@ func getClient(cmd *cobra.Command, pk *ecdsa.PrivateKey) *client.Client {
 	common.ExitOnErr(cmd, "", err)
 	return cli
 }
-
-func getKey(cmd *cobra.Command) *ecdsa.PrivateKey {
-	pk, err := key.Get()
-	common.ExitOnErr(cmd, "", err)
-	return pk
-}