@cryptotaxi247 / kubo / commits / 45fd7d213

pre-populate required arguments from request body

This way, we can always assume that indexing a required argument works. Also: * test that the command tree doesn't have any obvious bugs (duplicate options, arguments in the wrong order, etc). * simplify the usage ParseBodyArgs. * remove unnecessary check in the get command. fixes #4823 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>

Steven Allen committed Mar 17, 2018 at 12:22 UTC 45fd7d213ffe090111906743c245e33ed4a20826
30 files changed +57 -41
cmd/ipfs/daemon.go
+1 -1
@@ -22,11 +22,11 @@ import (
22 migrate "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
23
24 "gx/ipfs/QmRK2LxanhK2gZq6k6R7vk5ZoYZk8ULSSTB7FzDsMUX6CB/go-multiaddr-net"
25 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
26 mprome "gx/ipfs/QmSTf3wJXBQk2fxdmXtodvyczrCPgJaK1B1maY78qeebNX/go-metrics-prometheus"
27 iconn "gx/ipfs/QmToCvh5eJtoDheMggre7b2zeFCJ6tAyB82YVs457cqoUE/go-libp2p-interface-conn"
28 ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
29 "gx/ipfs/QmX3QZ5jHEPidwUrymXV1iSCSUhdGxj15sm2gP4jKMef7B/client_golang/prometheus"
29 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
30 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
31 )
32
cmd/ipfs/ipfs.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 commands "github.com/ipfs/go-ipfs/core/commands"
7
8 lgc "github.com/ipfs/go-ipfs/commands/legacy"
9 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
9 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
10 )
11
12 // This is the CLI root, used for executing commands accessible to CLI clients.
cmd/ipfs/main.go
+3 -3
@@ -30,11 +30,11 @@ import (
30 u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
31 manet "gx/ipfs/QmRK2LxanhK2gZq6k6R7vk5ZoYZk8ULSSTB7FzDsMUX6CB/go-multiaddr-net"
32 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
33 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
34 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds/cli"
35 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds/http"
36 ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
37 osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
35 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
36 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/cli"
37 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/http"
38 loggables "gx/ipfs/Qmf9JgVLz46pxPXwG2eWSJpkqVCcjD4rp7zCRi2KP6GTNB/go-libp2p-loggables"
39 )
40
commands/legacy/command.go
+1 -1
@@ -3,7 +3,7 @@ package legacy
3 import (
4 "io"
5
6 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
6 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
7
8 oldcmds "github.com/ipfs/go-ipfs/commands"
9 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
commands/legacy/legacy.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "io"
5 "runtime/debug"
6
7 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
7 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
8
9 oldcmds "github.com/ipfs/go-ipfs/commands"
10 )
commands/legacy/legacy_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "testing"
8
9 oldcmds "github.com/ipfs/go-ipfs/commands"
10 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
10 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
11 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
12 )
13
commands/legacy/request.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "os"
8 "reflect"
9
10 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
10 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
11 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
12 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
13
commands/legacy/response.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "reflect"
8 "sync"
9
10 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
10 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
11 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
12
13 oldcmds "github.com/ipfs/go-ipfs/commands"
commands/request.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 "github.com/ipfs/go-ipfs/core"
10 "github.com/ipfs/go-ipfs/repo/config"
11
12 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
12 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
13 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
14 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
15 )
core/commands/add.go
+1 -1
@@ -16,9 +16,9 @@ import (
16 mfs "github.com/ipfs/go-ipfs/mfs"
17 ft "github.com/ipfs/go-ipfs/unixfs"
18
19 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
20 bstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore"
21 mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
21 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
22 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
23 files "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit/files"
24 pb "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb"
core/commands/bitswap.go
+1 -1
@@ -12,8 +12,8 @@ import (
12 decision "github.com/ipfs/go-ipfs/exchange/bitswap/decision"
13
14 "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
15 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
16 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
16 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
17 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
18 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
19 )
core/commands/block.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 util "github.com/ipfs/go-ipfs/blocks/blockstoreutil"
12 e "github.com/ipfs/go-ipfs/core/commands/e"
13
14 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
15 mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
15 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
16 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
17 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
18 blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
core/commands/cat.go
+2 -2
@@ -9,7 +9,7 @@ import (
9 core "github.com/ipfs/go-ipfs/core"
10 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
11
12 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
12 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
13 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
14 )
15
@@ -62,7 +62,7 @@ var CatCmd = &cmds.Command{
62 }
63
64 err = req.ParseBodyArgs()
65 - if err != nil && !cmds.IsAllArgsAlreadyCovered(err) {
65 + if err != nil {
66 res.SetError(err, cmdkit.ErrNormal)
67 return
68 }
core/commands/commands.go
+1 -1
@@ -13,7 +13,7 @@ import (
13
14 e "github.com/ipfs/go-ipfs/core/commands/e"
15
16 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
16 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
17 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
18 )
19
core/commands/commands_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strings"
5 "testing"
6
7 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
7 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
8 )
9
10 func collectPaths(prefix string, cmd *cmds.Command, out map[string]struct{}) {
core/commands/files.go
+1 -1
@@ -25,8 +25,8 @@ import (
25
26 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
27 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
28 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
29 mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
29 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
30 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
31 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
32 ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
core/commands/filestore.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 "github.com/ipfs/go-ipfs/filestore"
13
14 lgc "github.com/ipfs/go-ipfs/commands/legacy"
15 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
15 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
16 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
17 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
18 )
core/commands/get.go
+1 -5
@@ -16,7 +16,7 @@ import (
16 tar "github.com/ipfs/go-ipfs/thirdparty/tar"
17 uarchive "github.com/ipfs/go-ipfs/unixfs/archive"
18
19 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
19 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
20 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
21 "gx/ipfs/QmeWjRodbcZFKe5tMN7poEx3izym6osrLSnTLf9UjJZBbs/pb"
22 )
@@ -53,10 +53,6 @@ may also specify the level of compression by specifying '-l=<1-9>'.
53 return err
54 },
55 Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
56 - if len(req.Arguments) == 0 {
57 - res.SetError(errors.New("not enough arugments provided"), cmdkit.ErrClient)
58 - return
59 - }
56 cmplvl, err := getCompressOptions(req)
57 if err != nil {
58 res.SetError(err, cmdkit.ErrNormal)
core/commands/get_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "fmt"
6 "testing"
7
8 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
8 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
9 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
10 )
11
core/commands/helptext_test.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "strings"
5 "testing"
6
7 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
7 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
8 )
9
10 func checkHelptextRecursive(t *testing.T, name []string, c *cmds.Command) {
core/commands/object/object.go
+1 -1
@@ -22,7 +22,7 @@ import (
22 pin "github.com/ipfs/go-ipfs/pin"
23 ft "github.com/ipfs/go-ipfs/unixfs"
24
25 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
25 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
26 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
27 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
28 ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
core/commands/object/patch.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 ft "github.com/ipfs/go-ipfs/unixfs"
17
18 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
19 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
19 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
20 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
21 )
22
core/commands/pubsub.go
+2 -2
@@ -13,9 +13,9 @@ import (
13 core "github.com/ipfs/go-ipfs/core"
14 e "github.com/ipfs/go-ipfs/core/commands/e"
15
16 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
17 floodsub "gx/ipfs/QmSFihvoND3eDaAYRCeLgLPt62yCPgMZs1NSZmKFEtJQQw/go-libp2p-floodsub"
18 pstore "gx/ipfs/QmXauCuJzmzapetmC6W4TuDJLL1yFFrVzSHoWv8YdbmnxH/go-libp2p-peerstore"
18 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
19 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
20 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
21 blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
@@ -226,7 +226,7 @@ To use, the daemon must be run with '--enable-pubsub-experiment'.
226 topic := req.Arguments[0]
227
228 err = req.ParseBodyArgs()
229 - if err != nil && !cmds.IsAllArgsAlreadyCovered(err) {
229 + if err != nil {
230 res.SetError(err, cmdkit.ErrNormal)
231 return
232 }
core/commands/repo.go
+1 -1
@@ -17,8 +17,8 @@ import (
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18 lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
19
20 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
21 bstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore"
21 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
22 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
23 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
24 )
core/commands/root.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 lgc "github.com/ipfs/go-ipfs/commands/legacy"
14 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
15 - "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
15 + "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
16 "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
17 )
18
core/commands/root_test.go new
+22
@@ -0,0 +1,22 @@
1 +package commands
2 +
3 +import (
4 + "testing"
5 +)
6 +
7 +func TestCommandTree(t *testing.T) {
8 + printErrors := func(errs map[string][]error) {
9 + if errs == nil {
10 + return
11 + }
12 + t.Error("In Root command tree:")
13 + for cmd, err := range errs {
14 + t.Errorf(" In X command %s:", cmd)
15 + for _, e := range err {
16 + t.Errorf(" %s", e)
17 + }
18 + }
19 + }
20 + printErrors(Root.DebugValidate())
21 + printErrors(RootRO.DebugValidate())
22 +}
core/commands/stat.go
+1 -1
@@ -8,9 +8,9 @@ import (
8 "time"
9
10 humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
11 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
12 protocol "gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
13 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
13 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
14 cmdkit "gx/ipfs/QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM/go-ipfs-cmdkit"
15 metrics "gx/ipfs/QmdeBtQGXjSt7cb97nx9JyLHHv5va2LyEAue7Q5tDFzpLy/go-libp2p-metrics"
16 )
core/corehttp/commands.go
+2 -2
@@ -15,8 +15,8 @@ import (
15 path "github.com/ipfs/go-ipfs/path"
16 config "github.com/ipfs/go-ipfs/repo/config"
17
18 - cmds "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds"
19 - cmdsHttp "gx/ipfs/QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3/go-ipfs-cmds/http"
18 + cmds "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds"
19 + cmdsHttp "gx/ipfs/QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP/go-ipfs-cmds/http"
20 )
21
22 var (
package.json
+2 -2
@@ -408,9 +408,9 @@
408 "version": "2.1.5"
409 },
410 {
411 - "hash": "QmabLouZTZwhfALuBcssPvkzhbYGMb4394huT7HY4LQ6d3",
411 + "hash": "QmSBXjZJCTmRSLXzXr4duHKzWfgDX8aJ6XuPXCQZuVU1LP",
412 "name": "go-ipfs-cmds",
413 - "version": "1.0.8"
413 + "version": "1.0.11"
414 },
415 {
416 "hash": "QmceUdzxkimdYsgtX733uNgzf1DLHyBKN6ehGSp85ayppM",
test/sharness/t0090-get.sh
+1 -3
@@ -177,9 +177,7 @@ test_get_cmd
177
178 test_expect_success "empty request to get doesn't panic and returns error" '
179 curl "http://$API_ADDR/api/v0/get" > curl_out || true &&
180 - grep "not enough arugments provided" curl_out
181 -
182 -
180 + grep "argument \"ipfs-path\" is required" curl_out
181 '
182 test_kill_ipfs_daemon
183