Skip to content

Commit a6dab21

Browse files
committed
Update to kubo with rpc suport for symlinks
1 parent 1577c24 commit a6dab21

File tree

5 files changed

+46
-9
lines changed

5 files changed

+46
-9
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/cheggaaa/pb/v3 v3.1.4
77
github.com/ipfs/boxo v0.22.1-0.20240814075207-b27ba953ad58
8-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea
8+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6
99
github.com/libp2p/go-libp2p v0.36.1
1010
github.com/multiformats/go-multiaddr v0.13.0
1111
github.com/urfave/cli/v2 v2.25.7

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ github.com/ipfs/go-unixfsnode v1.9.0 h1:ubEhQhr22sPAKO2DNsyVBW7YB/zA8Zkif25aBvz8
368368
github.com/ipfs/go-unixfsnode v1.9.0/go.mod h1:HxRu9HYHOjK6HUqFBAi++7DVoWAHn0o4v/nZ/VA+0g8=
369369
github.com/ipfs/go-verifcid v0.0.3 h1:gmRKccqhWDocCRkC+a59g5QW7uJw5bpX9HWBevXa0zs=
370370
github.com/ipfs/go-verifcid v0.0.3/go.mod h1:gcCtGniVzelKrbk9ooUSX/pM3xlH73fZZJDzQJRvOUw=
371-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea h1:46yAF5MYeq6jj90HtvyVT8oxgg3gn6LQv1OW0yR9ZY4=
372-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea/go.mod h1:QuWIeYvLkstvAslRHIt8UVCroP+ckMLVysh9gyH2kOg=
371+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6 h1:eBpHvmO3JsVnnp6xk2/TCxUwO6l3sGwov7S2vBo4CS4=
372+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6/go.mod h1:QuWIeYvLkstvAslRHIt8UVCroP+ckMLVysh9gyH2kOg=
373373
github.com/ipld/go-car v0.6.2 h1:Hlnl3Awgnq8icK+ze3iRghk805lu8YNq3wlREDTF2qc=
374374
github.com/ipld/go-car v0.6.2/go.mod h1:oEGXdwp6bmxJCZ+rARSkDliTeYnVzv3++eXajZ+Bmr8=
375375
github.com/ipld/go-car/v2 v2.13.1 h1:KnlrKvEPEzr5IZHKTXLAEub+tPrzeAFQVRlSQvuxBO4=

sharness/dependencies/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/chriscool/go-sleep v0.0.0-20150606204034-743ab5f1bb48
77
github.com/ipfs/ipget v0.9.2
8-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea
8+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6
99
github.com/whyrusleeping/pollEndpoint v0.0.0-20211207235059-e4819e26509a
1010
)
1111

sharness/dependencies/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ github.com/ipfs/go-unixfsnode v1.9.0 h1:ubEhQhr22sPAKO2DNsyVBW7YB/zA8Zkif25aBvz8
437437
github.com/ipfs/go-unixfsnode v1.9.0/go.mod h1:HxRu9HYHOjK6HUqFBAi++7DVoWAHn0o4v/nZ/VA+0g8=
438438
github.com/ipfs/go-verifcid v0.0.3 h1:gmRKccqhWDocCRkC+a59g5QW7uJw5bpX9HWBevXa0zs=
439439
github.com/ipfs/go-verifcid v0.0.3/go.mod h1:gcCtGniVzelKrbk9ooUSX/pM3xlH73fZZJDzQJRvOUw=
440-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea h1:46yAF5MYeq6jj90HtvyVT8oxgg3gn6LQv1OW0yR9ZY4=
441-
github.com/ipfs/kubo v0.29.1-0.20240814075518-8d75eb260aea/go.mod h1:QuWIeYvLkstvAslRHIt8UVCroP+ckMLVysh9gyH2kOg=
440+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6 h1:eBpHvmO3JsVnnp6xk2/TCxUwO6l3sGwov7S2vBo4CS4=
441+
github.com/ipfs/kubo v0.29.1-0.20240814195154-0312a99bcfb6/go.mod h1:QuWIeYvLkstvAslRHIt8UVCroP+ckMLVysh9gyH2kOg=
442442
github.com/ipld/go-car v0.6.2 h1:Hlnl3Awgnq8icK+ze3iRghk805lu8YNq3wlREDTF2qc=
443443
github.com/ipld/go-car v0.6.2/go.mod h1:oEGXdwp6bmxJCZ+rARSkDliTeYnVzv3++eXajZ+Bmr8=
444444
github.com/ipld/go-car/v2 v2.13.1 h1:KnlrKvEPEzr5IZHKTXLAEub+tPrzeAFQVRlSQvuxBO4=

sharness/t0040-unixfs-mode-modtime.sh

+40-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ test_expect_success "retrieve file with mode and mtime" '
3434
'
3535

3636
test_expect_success "create a test directory" '
37-
mkdir test_dir2 &&
38-
cp test_file test_dir2/data.txt &&
39-
ipfs add --mode=0777 --mtime=660000000 -rQ test_dir2 > dir_hash
37+
mkdir test_dir &&
38+
cp test_file test_dir/data.txt &&
39+
ipfs add --mode=0777 --mtime=660000000 -rQ test_dir > dir_hash
4040
'
4141

4242
test_expect_success "retrieve a directory with mode and mtime" '
@@ -57,6 +57,43 @@ test_expect_success "retrieve a directory with mode and mtime" '
5757
esac
5858
'
5959

60+
test_expect_success "create a test directory with symlink" '
61+
case $(uname -s) in
62+
Linux|FreeBSD|Darwin)
63+
mkdir test_dir2 &&
64+
cp test_file test_dir2/data.txt &&
65+
ln -s test_file test_dir2/test_file_link &&
66+
chmod -h 0777 test_dir2/test_file_link &&
67+
touch -h -t 9011301320 test_dir2/test_file_link &&
68+
ipfs add --preserve-mode --preserve-mtime -rQ test_dir2 > dir2_hash
69+
;;
70+
*)
71+
echo "unsupported system: $(uname)"
72+
esac
73+
'
74+
75+
test_expect_success "retrieve a directory with symlink with mode and mtime" '
76+
case $(uname -s) in
77+
Linux|FreeBSD)
78+
ipget --node=local -o got_dir2 "/ipfs/$(<dir2_hash)" &&
79+
readlink got_dir2/test_file_link > link_target &&
80+
echo "test_file" > expect_target &&
81+
test_cmp expect_target link_target &&
82+
stat --format="%Y" got_dir2/test_file_link > out3 &&
83+
echo "660000000" > expect3 &&
84+
test_cmp expect3 out3
85+
;;
86+
Darwin)
87+
ipget --node=local -o got_dir2 "/ipfs/$(<dir2_hash)" &&
88+
readlink got_dir2/test_file_link > link_target &&
89+
echo "test_file" > expect_target &&
90+
test_cmp expect_target link_target
91+
;;
92+
*)
93+
echo "unsupported system: $(uname)"
94+
esac
95+
'
96+
6097
# kill the local ipfs node
6198
test_kill_ipfs_daemon
6299

0 commit comments

Comments
 (0)