|
1 | 1 | package container
|
2 | 2 |
|
3 | 3 | import (
|
| 4 | + "errors" |
4 | 5 | "fmt"
|
5 | 6 |
|
6 | 7 | internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
@@ -31,18 +32,18 @@ var listContainersCmd = &cobra.Command{
|
31 | 32 | RunE: func(cmd *cobra.Command, _ []string) error {
|
32 | 33 | var idUser user.ID
|
33 | 34 |
|
34 |
| - key, err := key.GetOrGenerate(cmd) |
35 |
| - if err != nil { |
| 35 | + pk, err := key.Get(cmd) |
| 36 | + if err != nil && !errors.Is(err, key.ErrMissingFlag) { |
36 | 37 | return err
|
37 | 38 | }
|
38 | 39 |
|
39 |
| - if flagVarListContainerOwner == "" { |
40 |
| - idUser = user.NewFromECDSAPublicKey(key.PublicKey) |
41 |
| - } else { |
| 40 | + if flagVarListContainerOwner != "" { |
42 | 41 | err := idUser.DecodeString(flagVarListContainerOwner)
|
43 | 42 | if err != nil {
|
44 | 43 | return fmt.Errorf("invalid user ID: %w", err)
|
45 | 44 | }
|
| 45 | + } else if pk != nil { |
| 46 | + idUser = user.NewFromECDSAPublicKey(pk.PublicKey) |
46 | 47 | }
|
47 | 48 |
|
48 | 49 | ctx, cancel := commonflags.GetCommandContext(cmd)
|
@@ -83,7 +84,7 @@ func initContainerListContainersCmd() {
|
83 | 84 | flags := listContainersCmd.Flags()
|
84 | 85 |
|
85 | 86 | flags.StringVar(&flagVarListContainerOwner, flagListContainerOwner, "",
|
86 |
| - "Owner of containers (omit to use owner from private key)", |
| 87 | + "Owner of containers (omit to use owner from private key or if no key provided - list all containers)", |
87 | 88 | )
|
88 | 89 | flags.BoolVar(&flagVarListPrintAttr, flagListPrintAttr, false,
|
89 | 90 | "Request and print attributes of each container",
|
|
0 commit comments