2017-02-09 15:29:17 +00:00
|
|
|
package test
|
2016-12-23 18:35:37 +00:00
|
|
|
|
|
|
|
import (
|
2018-03-13 14:32:56 +00:00
|
|
|
"context"
|
2016-12-23 18:35:37 +00:00
|
|
|
"errors"
|
2019-03-01 17:46:27 +00:00
|
|
|
"strings"
|
2016-12-23 18:35:37 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2022-06-15 09:19:17 +00:00
|
|
|
"github.com/ipfs-cluster/ipfs-cluster/api"
|
|
|
|
"github.com/ipfs-cluster/ipfs-cluster/state"
|
2019-03-01 17:46:27 +00:00
|
|
|
|
Add PinPath/UnpinPath support.
Squashed commit of the following:
commit 38cf569c6aed77c46ee4e0f8baa4d1a9daf8f03e
Merge: d125f69 aaada42
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 20 11:02:00 2019 +0000
Merge pull request #634 from ipfs/issue_450
Support PinPath, UnpinPath (resolve before pinning)
commit aaada42054e1f1c7b2abb1270859d0de41a0e5d8
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 22:16:25 2019 +0530
formatResponse accepts api.Pin and not api.PinSerial
commit b5da4bea045865814cc422da71827b44ddd44b90
Merge: ba59036 cc8dd7e
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 21:36:46 2019 +0530
Merge branch 'master' into issue_450
commit ba5903649c1df1dba20f4d6f7e3573d6fe24921f
Merge: f002914 d59880c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:41:11 2019 +0530
Merge branch 'issue_450' of github.com:ipfs/ipfs-cluster into issue_450
commit f00291494c0c02621c2296cbb7ac71e4c23aa9ec
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:31:39 2019 +0530
PinPath: more improvements
Added tracing for new methods
commit d59880c338eaa8214fe06b4f930a540793d78407
Merge: 0ca4c7c b4f0eb3
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 13 15:22:49 2019 +0000
Merge branch 'master' into issue_450
commit 0ca4c7c3b0670ed9c8279f8274d36e3485c10030
Merge: d35017a ecef9ea
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:10:13 2019 +0530
Merge branch 'master' into issue_450
commit d35017a8de91ca9fc9a9a047c48c75134cee9f98
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:07:25 2019 +0530
PinPath: more improvements
- Worth having `PinOptions` as a separate field in the struct and
constructing the query in the test with ToQuery()
- sharness: "intialization" line can be placed outside the tests at
the top
commit 68e3b90417ffbad89d41a70ac81d85f9037f8848
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Sun Feb 10 21:43:50 2019 +0530
Using if-continue pattern instead of if-else
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 3c29799f3b85be328b27508332ab92049d8b82f3
Merge: 956790b 4324889
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Feb 7 10:25:52 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 956790b381db9858e4194f983e898b07dc51ba66
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 21:11:20 2019 +0530
Removing resolved path
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7191cc46cedfbec116a9746937e28881b50ca044
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:45:07 2019 +0530
Fix go vet
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f8b3d5b63b1b7569e2a3e0d82894fd4491c246c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:07:03 2019 +0530
Fixed linting error
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 23c57eb467755a1f21387a1615a7f34e97348053
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 09:20:41 2019 +0530
Fixed tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 0caedd94aefeb3b6649dedc214cb4b849ace2ea4
Merge: 17e555e 5a7ee1d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 00:07:10 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 17e555e4a7c574413df90aac70c5cc29cab98f54
Author: Hector Sanjuan <code@hector.link>
Date: Tue Feb 5 16:58:50 2019 +0000
PinPath: address some feedback + improvements
* Changed client's Pin() API and PinPath to be consistent
* Added helper methods to turn PinPath to query and back
* Make code and tests build
* Use TestCidResolved everywhere
* Fix cluster.PinPath arguments
* Fix formatting of responses with --no-status
* Make tests readable and call Fatal when needed
* Use a pathTestCases variable
commit f0e7369c47c5ddadc8ed45df5fd2d4d9b2d42b38
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 5 18:34:26 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Addressed review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-198751932
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit a8b4f181d2d7afed32ee41331dfaab19fd66a173
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 22:41:27 2019 +0530
Fixing tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit e39b95ca19e4d75506f4f492678245ef13936a44
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 14:52:53 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- PinPath and UnpinPath should return api.Pin
- PinPath should accept pin options
- Removing duplicate logic for Resolve from cluster
- And many other review comments https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-195509504
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit d146075126320896665ba58d337a13789f68ea86
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 17:08:41 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
PinPath(in both rest and rpc) should return a serializable struct in the
form `{"\":"Q...cid..string..."}` (as used in "github.com/ipfs/go-cid"
to marshal and unmarshal)
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 1f4869568a8adb450275257154ea3a26d03a30f3
Merge: 7acfd28 a244af9
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 07:18:56 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7acfd282732ddf2282a67d4f9d0170a494eb3ed4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 22 18:14:32 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- RPC must always use serializable structs
- In command, just use pin with path as cid is also a valid path
- Addressing many other small review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-192122534
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 36905041e1e3f0b204942030aab3ab7b5b9e4d62
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 09:36:42 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Extra logic for path checking should go into resolve so that it can be
properly reused
Added sharness tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 9116bda3534e77bb391d873051bb520a1b01a326
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 08:08:07 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
error strings should not be capitalized
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit ca7e61861374f456300a85ddc0374e594f74f963
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 23:40:25 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Tests
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 522fbcd899f01c01680375561a32a87464157c0a
Merge: f1a56ab f7bc468
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 10:40:54 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f1a56ab925fb74c0c44273a4524afa4843cf757f
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Jan 14 20:58:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- IPFS Connector should act as a pure IPFS client, any extra logic
should go to cluster.go
- Use cid.Undef, instead of cid.Cid{}
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit c83b91054f6774f1f9d4930cfc3f1fa28236f57c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Jan 10 08:57:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- Separate handlers, methods and rpc apis for PinPath and UnpinPath from
Pin and Unpin
- Support ipld paths as well
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 719dff88129366ce3ccb5e04cb6f8082a0915c5c
Merge: 91ceb47 21170c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:38:35 2019 +0530
Merge branch 'issue_450_old' into HEAD
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 91ceb4796259ca7ef2974ec43e6a278a12796b13
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:36:41 2019 +0530
Revert "WIP: Figure out why test does not impleme"
This reverts commit 28a3a3f25dce6f296c8cbef86221644c099a7e75.
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 28a3a3f25dce6f296c8cbef86221644c099a7e75
Author: cd10012 <ced361@nyu.edu>
Date: Tue Jul 24 23:23:10 2018 -0400
WIP: Figure out why test does not implement IPFSConnector interface...
License: MIT
Signed-off-by: cd10012 <ced361@nyu.edu>
commit 21170c48e77e69583db64544b08120a9baf40d8d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 8 10:37:59 2019 +0530
Support PinPath, UnpinPath (resolve before pinning)
This commit adds API support for pinning using path
`POST /pins/<ipfs or ipns path>` and `DELETE /pins/<ipfs or ipns path>`
will resolve the path into a cid and perform perform pinning or
unpinning
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Co-authored-by: Hector Sanjuan <hector@protocol.ai>
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2019-02-20 11:07:50 +00:00
|
|
|
gopath "github.com/ipfs/go-path"
|
2019-06-14 10:41:11 +00:00
|
|
|
host "github.com/libp2p/go-libp2p-core/host"
|
|
|
|
peer "github.com/libp2p/go-libp2p-core/peer"
|
2018-10-17 13:28:03 +00:00
|
|
|
rpc "github.com/libp2p/go-libp2p-gorpc"
|
2016-12-23 18:35:37 +00:00
|
|
|
)
|
|
|
|
|
2019-12-06 12:08:57 +00:00
|
|
|
var (
|
|
|
|
// ErrBadCid is returned when using ErrorCid. Operations with that CID always
|
|
|
|
// fail.
|
|
|
|
ErrBadCid = errors.New("this is an expected error when using ErrorCid")
|
|
|
|
// ErrLinkNotFound is error returned when no link is found
|
|
|
|
ErrLinkNotFound = errors.New("no link by that name")
|
|
|
|
)
|
2016-12-23 18:35:37 +00:00
|
|
|
|
2017-02-09 15:29:17 +00:00
|
|
|
// NewMockRPCClient creates a mock ipfs-cluster RPC server and returns
|
|
|
|
// a client to it.
|
2018-06-25 03:33:17 +00:00
|
|
|
func NewMockRPCClient(t testing.TB) *rpc.Client {
|
2017-10-23 11:46:37 +00:00
|
|
|
return NewMockRPCClientWithHost(t, nil)
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewMockRPCClientWithHost returns a mock ipfs-cluster RPC server
|
|
|
|
// initialized with a given host.
|
2018-06-25 03:33:17 +00:00
|
|
|
func NewMockRPCClientWithHost(t testing.TB, h host.Host) *rpc.Client {
|
2022-03-22 09:56:16 +00:00
|
|
|
s := rpc.NewServer(h, "mock", rpc.WithStreamBufferSize(1024))
|
|
|
|
c := rpc.NewClientWithServer(h, "mock", s, rpc.WithMultiStreamBufferSize(1024))
|
2019-05-04 20:36:10 +00:00
|
|
|
err := s.RegisterName("Cluster", &mockCluster{})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = s.RegisterName("PinTracker", &mockPinTracker{})
|
2016-12-23 18:35:37 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2019-05-04 20:36:10 +00:00
|
|
|
err = s.RegisterName("IPFSConnector", &mockIPFSConnector{})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = s.RegisterName("Consensus", &mockConsensus{})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2022-01-28 18:31:13 +00:00
|
|
|
err = s.RegisterName("PeerMonitor", &mockPeerMonitor{})
|
2019-05-04 20:36:10 +00:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
2016-12-23 18:35:37 +00:00
|
|
|
return c
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
type mockCluster struct{}
|
|
|
|
type mockPinTracker struct{}
|
|
|
|
type mockIPFSConnector struct{}
|
|
|
|
type mockConsensus struct{}
|
2022-01-28 18:31:13 +00:00
|
|
|
type mockPeerMonitor struct{}
|
2019-05-04 20:36:10 +00:00
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) Pin(ctx context.Context, in api.Pin, out *api.Pin) error {
|
2019-02-27 20:09:31 +00:00
|
|
|
if in.Cid.Equals(ErrorCid) {
|
2017-02-09 15:29:17 +00:00
|
|
|
return ErrBadCid
|
2016-12-23 18:35:37 +00:00
|
|
|
}
|
2022-03-11 13:01:15 +00:00
|
|
|
|
|
|
|
// a pin is never returned the replications set to 0.
|
|
|
|
if in.ReplicationFactorMin == 0 {
|
|
|
|
in.ReplicationFactorMin = -1
|
|
|
|
}
|
|
|
|
if in.ReplicationFactorMax == 0 {
|
|
|
|
in.ReplicationFactorMax = -1
|
|
|
|
}
|
2022-03-19 01:52:46 +00:00
|
|
|
*out = in
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) Unpin(ctx context.Context, in api.Pin, out *api.Pin) error {
|
2019-02-27 20:09:31 +00:00
|
|
|
if in.Cid.Equals(ErrorCid) {
|
2017-02-09 15:29:17 +00:00
|
|
|
return ErrBadCid
|
2016-12-23 18:35:37 +00:00
|
|
|
}
|
2019-07-29 11:26:53 +00:00
|
|
|
if in.Cid.Equals(NotFoundCid) {
|
|
|
|
return state.ErrNotFound
|
|
|
|
}
|
2022-03-19 01:52:46 +00:00
|
|
|
*out = in
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) PinPath(ctx context.Context, in api.PinPath, out *api.Pin) error {
|
2019-03-01 17:46:27 +00:00
|
|
|
p, err := gopath.ParsePath(in.Path)
|
Add PinPath/UnpinPath support.
Squashed commit of the following:
commit 38cf569c6aed77c46ee4e0f8baa4d1a9daf8f03e
Merge: d125f69 aaada42
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 20 11:02:00 2019 +0000
Merge pull request #634 from ipfs/issue_450
Support PinPath, UnpinPath (resolve before pinning)
commit aaada42054e1f1c7b2abb1270859d0de41a0e5d8
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 22:16:25 2019 +0530
formatResponse accepts api.Pin and not api.PinSerial
commit b5da4bea045865814cc422da71827b44ddd44b90
Merge: ba59036 cc8dd7e
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 21:36:46 2019 +0530
Merge branch 'master' into issue_450
commit ba5903649c1df1dba20f4d6f7e3573d6fe24921f
Merge: f002914 d59880c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:41:11 2019 +0530
Merge branch 'issue_450' of github.com:ipfs/ipfs-cluster into issue_450
commit f00291494c0c02621c2296cbb7ac71e4c23aa9ec
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:31:39 2019 +0530
PinPath: more improvements
Added tracing for new methods
commit d59880c338eaa8214fe06b4f930a540793d78407
Merge: 0ca4c7c b4f0eb3
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 13 15:22:49 2019 +0000
Merge branch 'master' into issue_450
commit 0ca4c7c3b0670ed9c8279f8274d36e3485c10030
Merge: d35017a ecef9ea
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:10:13 2019 +0530
Merge branch 'master' into issue_450
commit d35017a8de91ca9fc9a9a047c48c75134cee9f98
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:07:25 2019 +0530
PinPath: more improvements
- Worth having `PinOptions` as a separate field in the struct and
constructing the query in the test with ToQuery()
- sharness: "intialization" line can be placed outside the tests at
the top
commit 68e3b90417ffbad89d41a70ac81d85f9037f8848
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Sun Feb 10 21:43:50 2019 +0530
Using if-continue pattern instead of if-else
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 3c29799f3b85be328b27508332ab92049d8b82f3
Merge: 956790b 4324889
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Feb 7 10:25:52 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 956790b381db9858e4194f983e898b07dc51ba66
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 21:11:20 2019 +0530
Removing resolved path
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7191cc46cedfbec116a9746937e28881b50ca044
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:45:07 2019 +0530
Fix go vet
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f8b3d5b63b1b7569e2a3e0d82894fd4491c246c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:07:03 2019 +0530
Fixed linting error
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 23c57eb467755a1f21387a1615a7f34e97348053
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 09:20:41 2019 +0530
Fixed tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 0caedd94aefeb3b6649dedc214cb4b849ace2ea4
Merge: 17e555e 5a7ee1d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 00:07:10 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 17e555e4a7c574413df90aac70c5cc29cab98f54
Author: Hector Sanjuan <code@hector.link>
Date: Tue Feb 5 16:58:50 2019 +0000
PinPath: address some feedback + improvements
* Changed client's Pin() API and PinPath to be consistent
* Added helper methods to turn PinPath to query and back
* Make code and tests build
* Use TestCidResolved everywhere
* Fix cluster.PinPath arguments
* Fix formatting of responses with --no-status
* Make tests readable and call Fatal when needed
* Use a pathTestCases variable
commit f0e7369c47c5ddadc8ed45df5fd2d4d9b2d42b38
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 5 18:34:26 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Addressed review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-198751932
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit a8b4f181d2d7afed32ee41331dfaab19fd66a173
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 22:41:27 2019 +0530
Fixing tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit e39b95ca19e4d75506f4f492678245ef13936a44
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 14:52:53 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- PinPath and UnpinPath should return api.Pin
- PinPath should accept pin options
- Removing duplicate logic for Resolve from cluster
- And many other review comments https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-195509504
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit d146075126320896665ba58d337a13789f68ea86
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 17:08:41 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
PinPath(in both rest and rpc) should return a serializable struct in the
form `{"\":"Q...cid..string..."}` (as used in "github.com/ipfs/go-cid"
to marshal and unmarshal)
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 1f4869568a8adb450275257154ea3a26d03a30f3
Merge: 7acfd28 a244af9
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 07:18:56 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7acfd282732ddf2282a67d4f9d0170a494eb3ed4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 22 18:14:32 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- RPC must always use serializable structs
- In command, just use pin with path as cid is also a valid path
- Addressing many other small review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-192122534
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 36905041e1e3f0b204942030aab3ab7b5b9e4d62
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 09:36:42 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Extra logic for path checking should go into resolve so that it can be
properly reused
Added sharness tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 9116bda3534e77bb391d873051bb520a1b01a326
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 08:08:07 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
error strings should not be capitalized
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit ca7e61861374f456300a85ddc0374e594f74f963
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 23:40:25 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Tests
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 522fbcd899f01c01680375561a32a87464157c0a
Merge: f1a56ab f7bc468
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 10:40:54 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f1a56ab925fb74c0c44273a4524afa4843cf757f
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Jan 14 20:58:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- IPFS Connector should act as a pure IPFS client, any extra logic
should go to cluster.go
- Use cid.Undef, instead of cid.Cid{}
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit c83b91054f6774f1f9d4930cfc3f1fa28236f57c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Jan 10 08:57:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- Separate handlers, methods and rpc apis for PinPath and UnpinPath from
Pin and Unpin
- Support ipld paths as well
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 719dff88129366ce3ccb5e04cb6f8082a0915c5c
Merge: 91ceb47 21170c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:38:35 2019 +0530
Merge branch 'issue_450_old' into HEAD
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 91ceb4796259ca7ef2974ec43e6a278a12796b13
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:36:41 2019 +0530
Revert "WIP: Figure out why test does not impleme"
This reverts commit 28a3a3f25dce6f296c8cbef86221644c099a7e75.
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 28a3a3f25dce6f296c8cbef86221644c099a7e75
Author: cd10012 <ced361@nyu.edu>
Date: Tue Jul 24 23:23:10 2018 -0400
WIP: Figure out why test does not implement IPFSConnector interface...
License: MIT
Signed-off-by: cd10012 <ced361@nyu.edu>
commit 21170c48e77e69583db64544b08120a9baf40d8d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 8 10:37:59 2019 +0530
Support PinPath, UnpinPath (resolve before pinning)
This commit adds API support for pinning using path
`POST /pins/<ipfs or ipns path>` and `DELETE /pins/<ipfs or ipns path>`
will resolve the path into a cid and perform perform pinning or
unpinning
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Co-authored-by: Hector Sanjuan <hector@protocol.ai>
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2019-02-20 11:07:50 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
var pin api.Pin
|
2019-03-01 17:46:27 +00:00
|
|
|
if p.IsJustAKey() && !strings.HasPrefix(in.Path, "/ipns") {
|
|
|
|
c, _, err := gopath.SplitAbsPath(p)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-04-07 11:53:30 +00:00
|
|
|
cc := api.NewCid(c)
|
|
|
|
if cc.Equals(ErrorCid) {
|
2019-03-01 17:46:27 +00:00
|
|
|
return ErrBadCid
|
|
|
|
}
|
2022-04-07 11:53:30 +00:00
|
|
|
pin = api.PinWithOpts(cc, in.PinOptions)
|
2019-03-01 17:46:27 +00:00
|
|
|
} else {
|
|
|
|
pin = api.PinWithOpts(CidResolved, in.PinOptions)
|
Add PinPath/UnpinPath support.
Squashed commit of the following:
commit 38cf569c6aed77c46ee4e0f8baa4d1a9daf8f03e
Merge: d125f69 aaada42
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 20 11:02:00 2019 +0000
Merge pull request #634 from ipfs/issue_450
Support PinPath, UnpinPath (resolve before pinning)
commit aaada42054e1f1c7b2abb1270859d0de41a0e5d8
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 22:16:25 2019 +0530
formatResponse accepts api.Pin and not api.PinSerial
commit b5da4bea045865814cc422da71827b44ddd44b90
Merge: ba59036 cc8dd7e
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 21:36:46 2019 +0530
Merge branch 'master' into issue_450
commit ba5903649c1df1dba20f4d6f7e3573d6fe24921f
Merge: f002914 d59880c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:41:11 2019 +0530
Merge branch 'issue_450' of github.com:ipfs/ipfs-cluster into issue_450
commit f00291494c0c02621c2296cbb7ac71e4c23aa9ec
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:31:39 2019 +0530
PinPath: more improvements
Added tracing for new methods
commit d59880c338eaa8214fe06b4f930a540793d78407
Merge: 0ca4c7c b4f0eb3
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 13 15:22:49 2019 +0000
Merge branch 'master' into issue_450
commit 0ca4c7c3b0670ed9c8279f8274d36e3485c10030
Merge: d35017a ecef9ea
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:10:13 2019 +0530
Merge branch 'master' into issue_450
commit d35017a8de91ca9fc9a9a047c48c75134cee9f98
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:07:25 2019 +0530
PinPath: more improvements
- Worth having `PinOptions` as a separate field in the struct and
constructing the query in the test with ToQuery()
- sharness: "intialization" line can be placed outside the tests at
the top
commit 68e3b90417ffbad89d41a70ac81d85f9037f8848
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Sun Feb 10 21:43:50 2019 +0530
Using if-continue pattern instead of if-else
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 3c29799f3b85be328b27508332ab92049d8b82f3
Merge: 956790b 4324889
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Feb 7 10:25:52 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 956790b381db9858e4194f983e898b07dc51ba66
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 21:11:20 2019 +0530
Removing resolved path
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7191cc46cedfbec116a9746937e28881b50ca044
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:45:07 2019 +0530
Fix go vet
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f8b3d5b63b1b7569e2a3e0d82894fd4491c246c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:07:03 2019 +0530
Fixed linting error
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 23c57eb467755a1f21387a1615a7f34e97348053
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 09:20:41 2019 +0530
Fixed tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 0caedd94aefeb3b6649dedc214cb4b849ace2ea4
Merge: 17e555e 5a7ee1d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 00:07:10 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 17e555e4a7c574413df90aac70c5cc29cab98f54
Author: Hector Sanjuan <code@hector.link>
Date: Tue Feb 5 16:58:50 2019 +0000
PinPath: address some feedback + improvements
* Changed client's Pin() API and PinPath to be consistent
* Added helper methods to turn PinPath to query and back
* Make code and tests build
* Use TestCidResolved everywhere
* Fix cluster.PinPath arguments
* Fix formatting of responses with --no-status
* Make tests readable and call Fatal when needed
* Use a pathTestCases variable
commit f0e7369c47c5ddadc8ed45df5fd2d4d9b2d42b38
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 5 18:34:26 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Addressed review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-198751932
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit a8b4f181d2d7afed32ee41331dfaab19fd66a173
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 22:41:27 2019 +0530
Fixing tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit e39b95ca19e4d75506f4f492678245ef13936a44
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 14:52:53 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- PinPath and UnpinPath should return api.Pin
- PinPath should accept pin options
- Removing duplicate logic for Resolve from cluster
- And many other review comments https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-195509504
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit d146075126320896665ba58d337a13789f68ea86
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 17:08:41 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
PinPath(in both rest and rpc) should return a serializable struct in the
form `{"\":"Q...cid..string..."}` (as used in "github.com/ipfs/go-cid"
to marshal and unmarshal)
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 1f4869568a8adb450275257154ea3a26d03a30f3
Merge: 7acfd28 a244af9
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 07:18:56 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7acfd282732ddf2282a67d4f9d0170a494eb3ed4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 22 18:14:32 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- RPC must always use serializable structs
- In command, just use pin with path as cid is also a valid path
- Addressing many other small review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-192122534
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 36905041e1e3f0b204942030aab3ab7b5b9e4d62
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 09:36:42 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Extra logic for path checking should go into resolve so that it can be
properly reused
Added sharness tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 9116bda3534e77bb391d873051bb520a1b01a326
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 08:08:07 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
error strings should not be capitalized
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit ca7e61861374f456300a85ddc0374e594f74f963
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 23:40:25 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Tests
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 522fbcd899f01c01680375561a32a87464157c0a
Merge: f1a56ab f7bc468
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 10:40:54 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f1a56ab925fb74c0c44273a4524afa4843cf757f
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Jan 14 20:58:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- IPFS Connector should act as a pure IPFS client, any extra logic
should go to cluster.go
- Use cid.Undef, instead of cid.Cid{}
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit c83b91054f6774f1f9d4930cfc3f1fa28236f57c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Jan 10 08:57:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- Separate handlers, methods and rpc apis for PinPath and UnpinPath from
Pin and Unpin
- Support ipld paths as well
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 719dff88129366ce3ccb5e04cb6f8082a0915c5c
Merge: 91ceb47 21170c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:38:35 2019 +0530
Merge branch 'issue_450_old' into HEAD
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 91ceb4796259ca7ef2974ec43e6a278a12796b13
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:36:41 2019 +0530
Revert "WIP: Figure out why test does not impleme"
This reverts commit 28a3a3f25dce6f296c8cbef86221644c099a7e75.
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 28a3a3f25dce6f296c8cbef86221644c099a7e75
Author: cd10012 <ced361@nyu.edu>
Date: Tue Jul 24 23:23:10 2018 -0400
WIP: Figure out why test does not implement IPFSConnector interface...
License: MIT
Signed-off-by: cd10012 <ced361@nyu.edu>
commit 21170c48e77e69583db64544b08120a9baf40d8d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 8 10:37:59 2019 +0530
Support PinPath, UnpinPath (resolve before pinning)
This commit adds API support for pinning using path
`POST /pins/<ipfs or ipns path>` and `DELETE /pins/<ipfs or ipns path>`
will resolve the path into a cid and perform perform pinning or
unpinning
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Co-authored-by: Hector Sanjuan <hector@protocol.ai>
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2019-02-20 11:07:50 +00:00
|
|
|
}
|
2019-03-01 17:46:27 +00:00
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
*out = pin
|
Add PinPath/UnpinPath support.
Squashed commit of the following:
commit 38cf569c6aed77c46ee4e0f8baa4d1a9daf8f03e
Merge: d125f69 aaada42
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 20 11:02:00 2019 +0000
Merge pull request #634 from ipfs/issue_450
Support PinPath, UnpinPath (resolve before pinning)
commit aaada42054e1f1c7b2abb1270859d0de41a0e5d8
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 22:16:25 2019 +0530
formatResponse accepts api.Pin and not api.PinSerial
commit b5da4bea045865814cc422da71827b44ddd44b90
Merge: ba59036 cc8dd7e
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 19 21:36:46 2019 +0530
Merge branch 'master' into issue_450
commit ba5903649c1df1dba20f4d6f7e3573d6fe24921f
Merge: f002914 d59880c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:41:11 2019 +0530
Merge branch 'issue_450' of github.com:ipfs/ipfs-cluster into issue_450
commit f00291494c0c02621c2296cbb7ac71e4c23aa9ec
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Feb 18 08:31:39 2019 +0530
PinPath: more improvements
Added tracing for new methods
commit d59880c338eaa8214fe06b4f930a540793d78407
Merge: 0ca4c7c b4f0eb3
Author: Hector Sanjuan <hsanjuan@users.noreply.github.com>
Date: Wed Feb 13 15:22:49 2019 +0000
Merge branch 'master' into issue_450
commit 0ca4c7c3b0670ed9c8279f8274d36e3485c10030
Merge: d35017a ecef9ea
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:10:13 2019 +0530
Merge branch 'master' into issue_450
commit d35017a8de91ca9fc9a9a047c48c75134cee9f98
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 12 13:07:25 2019 +0530
PinPath: more improvements
- Worth having `PinOptions` as a separate field in the struct and
constructing the query in the test with ToQuery()
- sharness: "intialization" line can be placed outside the tests at
the top
commit 68e3b90417ffbad89d41a70ac81d85f9037f8848
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Sun Feb 10 21:43:50 2019 +0530
Using if-continue pattern instead of if-else
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 3c29799f3b85be328b27508332ab92049d8b82f3
Merge: 956790b 4324889
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Feb 7 10:25:52 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 956790b381db9858e4194f983e898b07dc51ba66
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 21:11:20 2019 +0530
Removing resolved path
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7191cc46cedfbec116a9746937e28881b50ca044
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:45:07 2019 +0530
Fix go vet
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f8b3d5b63b1b7569e2a3e0d82894fd4491c246c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 16:07:03 2019 +0530
Fixed linting error
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 23c57eb467755a1f21387a1615a7f34e97348053
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 09:20:41 2019 +0530
Fixed tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 0caedd94aefeb3b6649dedc214cb4b849ace2ea4
Merge: 17e555e 5a7ee1d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Feb 6 00:07:10 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 17e555e4a7c574413df90aac70c5cc29cab98f54
Author: Hector Sanjuan <code@hector.link>
Date: Tue Feb 5 16:58:50 2019 +0000
PinPath: address some feedback + improvements
* Changed client's Pin() API and PinPath to be consistent
* Added helper methods to turn PinPath to query and back
* Make code and tests build
* Use TestCidResolved everywhere
* Fix cluster.PinPath arguments
* Fix formatting of responses with --no-status
* Make tests readable and call Fatal when needed
* Use a pathTestCases variable
commit f0e7369c47c5ddadc8ed45df5fd2d4d9b2d42b38
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Feb 5 18:34:26 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Addressed review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-198751932
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit a8b4f181d2d7afed32ee41331dfaab19fd66a173
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 22:41:27 2019 +0530
Fixing tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit e39b95ca19e4d75506f4f492678245ef13936a44
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 29 14:52:53 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- PinPath and UnpinPath should return api.Pin
- PinPath should accept pin options
- Removing duplicate logic for Resolve from cluster
- And many other review comments https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-195509504
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit d146075126320896665ba58d337a13789f68ea86
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 17:08:41 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
PinPath(in both rest and rpc) should return a serializable struct in the
form `{"\":"Q...cid..string..."}` (as used in "github.com/ipfs/go-cid"
to marshal and unmarshal)
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 1f4869568a8adb450275257154ea3a26d03a30f3
Merge: 7acfd28 a244af9
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 23 07:18:56 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 7acfd282732ddf2282a67d4f9d0170a494eb3ed4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 22 18:14:32 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- RPC must always use serializable structs
- In command, just use pin with path as cid is also a valid path
- Addressing many other small review comments as in
https://github.com/ipfs/ipfs-cluster/pull/634#pullrequestreview-192122534
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 36905041e1e3f0b204942030aab3ab7b5b9e4d62
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 09:36:42 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Extra logic for path checking should go into resolve so that it can be
properly reused
Added sharness tests
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 9116bda3534e77bb391d873051bb520a1b01a326
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 16 08:08:07 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
error strings should not be capitalized
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit ca7e61861374f456300a85ddc0374e594f74f963
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 23:40:25 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
Tests
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 522fbcd899f01c01680375561a32a87464157c0a
Merge: f1a56ab f7bc468
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 15 10:40:54 2019 +0530
Merge branch 'master' into issue_450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit f1a56ab925fb74c0c44273a4524afa4843cf757f
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Mon Jan 14 20:58:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- IPFS Connector should act as a pure IPFS client, any extra logic
should go to cluster.go
- Use cid.Undef, instead of cid.Cid{}
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit c83b91054f6774f1f9d4930cfc3f1fa28236f57c
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Thu Jan 10 08:57:17 2019 +0530
Support PinPath, UnpinPath(resolve before pinning)
- Separate handlers, methods and rpc apis for PinPath and UnpinPath from
Pin and Unpin
- Support ipld paths as well
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 719dff88129366ce3ccb5e04cb6f8082a0915c5c
Merge: 91ceb47 21170c4
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:38:35 2019 +0530
Merge branch 'issue_450_old' into HEAD
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 91ceb4796259ca7ef2974ec43e6a278a12796b13
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Wed Jan 9 19:36:41 2019 +0530
Revert "WIP: Figure out why test does not impleme"
This reverts commit 28a3a3f25dce6f296c8cbef86221644c099a7e75.
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
commit 28a3a3f25dce6f296c8cbef86221644c099a7e75
Author: cd10012 <ced361@nyu.edu>
Date: Tue Jul 24 23:23:10 2018 -0400
WIP: Figure out why test does not implement IPFSConnector interface...
License: MIT
Signed-off-by: cd10012 <ced361@nyu.edu>
commit 21170c48e77e69583db64544b08120a9baf40d8d
Author: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Date: Tue Jan 8 10:37:59 2019 +0530
Support PinPath, UnpinPath (resolve before pinning)
This commit adds API support for pinning using path
`POST /pins/<ipfs or ipns path>` and `DELETE /pins/<ipfs or ipns path>`
will resolve the path into a cid and perform perform pinning or
unpinning
Fixes #450
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
Co-authored-by: Hector Sanjuan <hector@protocol.ai>
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
2019-02-20 11:07:50 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) UnpinPath(ctx context.Context, in api.PinPath, out *api.Pin) error {
|
2019-07-29 11:26:53 +00:00
|
|
|
if in.Path == NotFoundPath {
|
|
|
|
return state.ErrNotFound
|
|
|
|
}
|
|
|
|
|
|
|
|
// Mock-Unpin behaves like pin (doing nothing).
|
2019-03-01 17:46:27 +00:00
|
|
|
return mock.PinPath(ctx, in, out)
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) Pins(ctx context.Context, in <-chan struct{}, out chan<- api.Pin) error {
|
2018-08-14 13:18:16 +00:00
|
|
|
opts := api.PinOptions{
|
|
|
|
ReplicationFactorMin: -1,
|
|
|
|
ReplicationFactorMax: -1,
|
|
|
|
}
|
2018-08-10 12:39:44 +00:00
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
out <- api.PinWithOpts(Cid1, opts)
|
|
|
|
out <- api.PinCid(Cid2)
|
|
|
|
out <- api.PinWithOpts(Cid3, opts)
|
|
|
|
close(out)
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockCluster) PinGet(ctx context.Context, in api.Cid, out *api.Pin) error {
|
2019-02-27 17:04:35 +00:00
|
|
|
switch in.String() {
|
2019-02-27 20:09:31 +00:00
|
|
|
case ErrorCid.String():
|
2019-01-10 19:03:59 +00:00
|
|
|
return errors.New("this is an expected error when using ErrorCid")
|
2019-02-27 20:19:10 +00:00
|
|
|
case Cid1.String(), Cid3.String():
|
2019-02-27 17:04:35 +00:00
|
|
|
p := api.PinCid(in)
|
2018-08-14 13:18:16 +00:00
|
|
|
p.ReplicationFactorMin = -1
|
|
|
|
p.ReplicationFactorMax = -1
|
2022-03-19 01:52:46 +00:00
|
|
|
*out = p
|
2018-06-07 02:19:15 +00:00
|
|
|
return nil
|
2019-02-27 20:19:10 +00:00
|
|
|
case Cid2.String(): // This is a remote pin
|
2019-02-27 17:04:35 +00:00
|
|
|
p := api.PinCid(in)
|
2018-08-14 13:18:16 +00:00
|
|
|
p.ReplicationFactorMin = 1
|
|
|
|
p.ReplicationFactorMax = 1
|
2022-03-19 01:52:46 +00:00
|
|
|
*out = p
|
2018-08-14 13:18:16 +00:00
|
|
|
default:
|
2022-03-11 15:18:08 +00:00
|
|
|
return state.ErrNotFound
|
2017-04-06 02:27:02 +00:00
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockCluster) ID(ctx context.Context, in struct{}, out *api.ID) error {
|
2017-02-08 17:04:08 +00:00
|
|
|
//_, pubkey, _ := crypto.GenerateKeyPair(
|
|
|
|
// DefaultConfigCrypto,
|
|
|
|
// DefaultConfigKeyLength)
|
2019-02-27 17:04:35 +00:00
|
|
|
|
2019-08-15 11:19:26 +00:00
|
|
|
addr, _ := api.NewMultiaddr("/ip4/127.0.0.1/tcp/4001/p2p/" + PeerID1.Pretty())
|
2019-02-27 17:04:35 +00:00
|
|
|
*out = api.ID{
|
2019-02-27 20:19:10 +00:00
|
|
|
ID: PeerID1,
|
2017-02-08 17:04:08 +00:00
|
|
|
//PublicKey: pubkey,
|
|
|
|
Version: "0.0.mock",
|
2022-01-28 17:21:11 +00:00
|
|
|
IPFS: api.IPFSID{
|
2019-02-27 20:19:10 +00:00
|
|
|
ID: PeerID1,
|
2019-02-27 17:04:35 +00:00
|
|
|
Addresses: []api.Multiaddr{addr},
|
2017-01-26 18:59:31 +00:00
|
|
|
},
|
2017-03-23 18:34:33 +00:00
|
|
|
}
|
2017-01-24 15:19:23 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-23 00:27:57 +00:00
|
|
|
func (mock *mockCluster) IDStream(ctx context.Context, in <-chan struct{}, out chan<- api.ID) error {
|
|
|
|
defer close(out)
|
|
|
|
var id api.ID
|
|
|
|
mock.ID(ctx, struct{}{}, &id)
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
return ctx.Err()
|
|
|
|
case out <- id:
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockCluster) Version(ctx context.Context, in struct{}, out *api.Version) error {
|
2017-02-15 14:16:34 +00:00
|
|
|
*out = api.Version{
|
|
|
|
Version: "0.0.mock",
|
|
|
|
}
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-23 00:27:57 +00:00
|
|
|
func (mock *mockCluster) Peers(ctx context.Context, in <-chan struct{}, out chan<- api.ID) error {
|
2022-03-19 01:52:46 +00:00
|
|
|
id := api.ID{}
|
2022-03-23 00:27:57 +00:00
|
|
|
mock.ID(ctx, struct{}{}, &id)
|
|
|
|
out <- id
|
|
|
|
close(out)
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-23 00:27:57 +00:00
|
|
|
func (mock *mockCluster) PeersWithFilter(ctx context.Context, in <-chan []peer.ID, out chan<- api.ID) error {
|
|
|
|
inCh := make(chan struct{})
|
|
|
|
close(inCh)
|
|
|
|
return mock.Peers(ctx, inCh, out)
|
2021-10-05 09:57:00 +00:00
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockCluster) PeerAdd(ctx context.Context, in peer.ID, out *api.ID) error {
|
2019-02-27 17:04:35 +00:00
|
|
|
id := api.ID{}
|
2018-03-13 14:32:56 +00:00
|
|
|
mock.ID(ctx, struct{}{}, &id)
|
2017-01-30 12:12:25 +00:00
|
|
|
*out = id
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockCluster) PeerRemove(ctx context.Context, in peer.ID, out *struct{}) error {
|
2017-01-30 12:12:25 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockCluster) ConnectGraph(ctx context.Context, in struct{}, out *api.ConnectGraph) error {
|
2019-02-27 17:04:35 +00:00
|
|
|
*out = api.ConnectGraph{
|
2019-02-27 20:19:10 +00:00
|
|
|
ClusterID: PeerID1,
|
2019-02-27 17:04:35 +00:00
|
|
|
IPFSLinks: map[string][]peer.ID{
|
2020-04-14 21:44:18 +00:00
|
|
|
peer.Encode(PeerID4): {PeerID5, PeerID6},
|
|
|
|
peer.Encode(PeerID5): {PeerID4, PeerID6},
|
|
|
|
peer.Encode(PeerID6): {PeerID4, PeerID5},
|
2018-01-18 02:49:35 +00:00
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
ClusterLinks: map[string][]peer.ID{
|
2020-04-14 21:44:18 +00:00
|
|
|
peer.Encode(PeerID1): {PeerID2, PeerID3},
|
|
|
|
peer.Encode(PeerID2): {PeerID1, PeerID3},
|
|
|
|
peer.Encode(PeerID3): {PeerID1, PeerID2},
|
2018-01-18 02:49:35 +00:00
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
ClustertoIPFS: map[string]peer.ID{
|
2020-04-14 17:58:00 +00:00
|
|
|
peer.Encode(PeerID1): PeerID4,
|
|
|
|
peer.Encode(PeerID2): PeerID5,
|
|
|
|
peer.Encode(PeerID3): PeerID6,
|
2018-01-18 02:49:35 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockCluster) StatusAll(ctx context.Context, in <-chan api.TrackerStatus, out chan<- api.GlobalPinInfo) error {
|
|
|
|
defer close(out)
|
|
|
|
filter := <-in
|
|
|
|
|
2020-04-14 17:58:00 +00:00
|
|
|
pid := peer.Encode(PeerID1)
|
2022-03-19 01:52:46 +00:00
|
|
|
gPinInfos := []api.GlobalPinInfo{
|
2017-01-24 11:39:08 +00:00
|
|
|
{
|
2022-03-11 11:58:12 +00:00
|
|
|
Cid: Cid1,
|
|
|
|
Name: "aaa",
|
2022-02-01 23:39:09 +00:00
|
|
|
PeerMap: map[string]api.PinInfoShort{
|
2019-02-27 17:04:35 +00:00
|
|
|
pid: {
|
2017-02-08 17:04:08 +00:00
|
|
|
Status: api.TrackerStatusPinned,
|
2016-12-23 18:35:37 +00:00
|
|
|
TS: time.Now(),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-01-24 11:39:08 +00:00
|
|
|
{
|
2022-03-11 11:58:12 +00:00
|
|
|
Cid: Cid2,
|
|
|
|
Name: "bbb",
|
2022-02-01 23:39:09 +00:00
|
|
|
PeerMap: map[string]api.PinInfoShort{
|
2019-02-27 17:04:35 +00:00
|
|
|
pid: {
|
2017-02-08 17:04:08 +00:00
|
|
|
Status: api.TrackerStatusPinning,
|
2016-12-23 18:35:37 +00:00
|
|
|
TS: time.Now(),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2017-01-24 11:39:08 +00:00
|
|
|
{
|
2022-03-11 11:58:12 +00:00
|
|
|
Cid: Cid3,
|
|
|
|
Name: "ccc",
|
|
|
|
Metadata: map[string]string{
|
|
|
|
"ccc": "3c",
|
|
|
|
},
|
2022-02-01 23:39:09 +00:00
|
|
|
PeerMap: map[string]api.PinInfoShort{
|
2019-02-27 17:04:35 +00:00
|
|
|
pid: {
|
2017-02-08 17:04:08 +00:00
|
|
|
Status: api.TrackerStatusPinError,
|
2016-12-23 18:35:37 +00:00
|
|
|
TS: time.Now(),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
}
|
2021-07-04 21:40:15 +00:00
|
|
|
// If there is no filter match, we will not return that status and we
|
|
|
|
// will not have an entry for that peer in the peerMap. In turn, when
|
|
|
|
// a single peer, we will not have an entry for the cid at all.
|
|
|
|
for _, gpi := range gPinInfos {
|
|
|
|
for id, pi := range gpi.PeerMap {
|
2022-03-22 09:56:16 +00:00
|
|
|
if !filter.Match(pi.Status) {
|
2021-07-04 21:40:15 +00:00
|
|
|
delete(gpi.PeerMap, id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for _, gpi := range gPinInfos {
|
|
|
|
if len(gpi.PeerMap) > 0 {
|
2022-03-22 09:56:16 +00:00
|
|
|
out <- gpi
|
2021-07-04 21:40:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockCluster) StatusAllLocal(ctx context.Context, in <-chan api.TrackerStatus, out chan<- api.PinInfo) error {
|
2019-05-04 20:36:10 +00:00
|
|
|
return (&mockPinTracker{}).StatusAll(ctx, in, out)
|
2017-12-01 11:56:26 +00:00
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockCluster) Status(ctx context.Context, in api.Cid, out *api.GlobalPinInfo) error {
|
2019-02-27 20:09:31 +00:00
|
|
|
if in.Equals(ErrorCid) {
|
2017-02-09 15:29:17 +00:00
|
|
|
return ErrBadCid
|
2016-12-23 18:35:37 +00:00
|
|
|
}
|
2022-03-11 15:41:48 +00:00
|
|
|
ma, _ := api.NewMultiaddr("/ip4/1.2.3.4/ipfs/" + PeerID3.String())
|
|
|
|
|
2017-02-08 17:04:08 +00:00
|
|
|
*out = api.GlobalPinInfo{
|
2022-03-11 15:41:48 +00:00
|
|
|
Cid: in,
|
|
|
|
Name: "test",
|
|
|
|
Allocations: nil,
|
|
|
|
Origins: nil,
|
|
|
|
Metadata: map[string]string{
|
|
|
|
"meta": "data",
|
|
|
|
},
|
|
|
|
|
2022-02-01 23:39:09 +00:00
|
|
|
PeerMap: map[string]api.PinInfoShort{
|
2020-04-14 17:58:00 +00:00
|
|
|
peer.Encode(PeerID1): {
|
2022-03-11 15:41:48 +00:00
|
|
|
PeerName: PeerName3,
|
|
|
|
IPFS: PeerID3,
|
|
|
|
IPFSAddresses: []api.Multiaddr{ma},
|
|
|
|
Status: api.TrackerStatusPinned,
|
|
|
|
TS: time.Now(),
|
2016-12-23 18:35:37 +00:00
|
|
|
},
|
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
}
|
2016-12-23 18:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockCluster) StatusLocal(ctx context.Context, in api.Cid, out *api.PinInfo) error {
|
2019-05-04 20:36:10 +00:00
|
|
|
return (&mockPinTracker{}).Status(ctx, in, out)
|
2017-12-01 11:56:26 +00:00
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockCluster) RecoverAll(ctx context.Context, in <-chan struct{}, out chan<- api.GlobalPinInfo) error {
|
|
|
|
f := make(chan api.TrackerStatus, 1)
|
|
|
|
f <- api.TrackerStatusUndefined
|
|
|
|
close(f)
|
|
|
|
return mock.StatusAll(ctx, f, out)
|
2019-08-21 05:49:07 +00:00
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockCluster) RecoverAllLocal(ctx context.Context, in <-chan struct{}, out chan<- api.PinInfo) error {
|
2019-05-04 20:36:10 +00:00
|
|
|
return (&mockPinTracker{}).RecoverAll(ctx, in, out)
|
2017-12-01 11:56:26 +00:00
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockCluster) Recover(ctx context.Context, in api.Cid, out *api.GlobalPinInfo) error {
|
2018-03-13 14:32:56 +00:00
|
|
|
return mock.Status(ctx, in, out)
|
2017-01-25 18:38:23 +00:00
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockCluster) RecoverLocal(ctx context.Context, in api.Cid, out *api.PinInfo) error {
|
2019-05-04 20:36:10 +00:00
|
|
|
return (&mockPinTracker{}).Recover(ctx, in, out)
|
2017-12-01 11:56:26 +00:00
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockCluster) BlockAllocate(ctx context.Context, in api.Pin, out *[]peer.ID) error {
|
2018-07-20 11:56:59 +00:00
|
|
|
if in.ReplicationFactorMin > 1 {
|
2018-07-24 12:21:29 +00:00
|
|
|
return errors.New("replMin too high: can only mock-allocate to 1")
|
2018-07-20 11:56:59 +00:00
|
|
|
}
|
2019-08-13 15:26:02 +00:00
|
|
|
*out = []peer.ID{""} // allocate to local peer
|
2018-07-20 11:56:59 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-10-22 05:40:32 +00:00
|
|
|
func (mock *mockCluster) RepoGC(ctx context.Context, in struct{}, out *api.GlobalRepoGC) error {
|
2022-03-19 01:52:46 +00:00
|
|
|
localrepoGC := api.RepoGC{}
|
|
|
|
_ = mock.RepoGCLocal(ctx, struct{}{}, &localrepoGC)
|
2019-10-22 05:40:32 +00:00
|
|
|
*out = api.GlobalRepoGC{
|
2022-03-19 01:52:46 +00:00
|
|
|
PeerMap: map[string]api.RepoGC{
|
2020-04-14 17:58:00 +00:00
|
|
|
peer.Encode(PeerID1): localrepoGC,
|
2019-10-22 05:40:32 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (mock *mockCluster) RepoGCLocal(ctx context.Context, in struct{}, out *api.RepoGC) error {
|
|
|
|
*out = api.RepoGC{
|
|
|
|
Peer: PeerID1,
|
|
|
|
Keys: []api.IPFSRepoGC{
|
|
|
|
{
|
|
|
|
Key: Cid1,
|
|
|
|
},
|
2019-12-06 12:08:57 +00:00
|
|
|
{
|
|
|
|
Key: Cid2,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Key: Cid3,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Key: Cid4,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
Error: ErrLinkNotFound.Error(),
|
|
|
|
},
|
2019-10-22 05:40:32 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-09-13 12:12:36 +00:00
|
|
|
func (mock *mockCluster) SendInformerMetrics(ctx context.Context, in struct{}, out *struct{}) error {
|
2018-08-07 09:49:31 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-01-13 21:09:21 +00:00
|
|
|
func (mock *mockCluster) Alerts(ctx context.Context, in struct{}, out *[]api.Alert) error {
|
|
|
|
*out = []api.Alert{
|
2022-06-15 10:16:05 +00:00
|
|
|
{
|
2021-01-13 21:09:21 +00:00
|
|
|
Metric: api.Metric{
|
|
|
|
Name: "ping",
|
|
|
|
Peer: PeerID2,
|
|
|
|
Expire: time.Now().Add(-30 * time.Second).UnixNano(),
|
|
|
|
Valid: true,
|
|
|
|
ReceivedAt: time.Now().Add(-60 * time.Second).UnixNano(),
|
|
|
|
},
|
|
|
|
TriggeredAt: time.Now(),
|
2019-12-23 07:12:38 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-11 13:01:15 +00:00
|
|
|
func (mock *mockCluster) IPFSID(ctx context.Context, in peer.ID, out *api.IPFSID) error {
|
2022-03-10 12:42:43 +00:00
|
|
|
var id api.ID
|
2022-03-11 13:01:15 +00:00
|
|
|
_ = mock.ID(ctx, struct{}{}, &id)
|
2022-03-10 12:42:43 +00:00
|
|
|
*out = id.IPFS
|
2022-01-28 17:21:11 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-12-01 11:56:26 +00:00
|
|
|
/* Tracker methods */
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockPinTracker) Track(ctx context.Context, in api.Pin, out *struct{}) error {
|
2017-12-01 11:56:26 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockPinTracker) Untrack(ctx context.Context, in api.Pin, out *struct{}) error {
|
2017-12-01 11:56:26 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockPinTracker) StatusAll(ctx context.Context, in <-chan api.TrackerStatus, out chan<- api.PinInfo) error {
|
|
|
|
defer close(out)
|
|
|
|
filter := <-in
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
pinInfos := []api.PinInfo{
|
2017-12-01 11:56:26 +00:00
|
|
|
{
|
2020-05-15 22:32:28 +00:00
|
|
|
Cid: Cid1,
|
|
|
|
Peer: PeerID1,
|
|
|
|
PinInfoShort: api.PinInfoShort{
|
|
|
|
Status: api.TrackerStatusPinned,
|
|
|
|
TS: time.Now(),
|
|
|
|
},
|
2017-12-01 11:56:26 +00:00
|
|
|
},
|
|
|
|
{
|
2020-05-15 22:32:28 +00:00
|
|
|
Cid: Cid3,
|
|
|
|
Peer: PeerID1,
|
|
|
|
PinInfoShort: api.PinInfoShort{
|
|
|
|
Status: api.TrackerStatusPinError,
|
|
|
|
TS: time.Now(),
|
|
|
|
},
|
2017-12-01 11:56:26 +00:00
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
}
|
2021-07-04 21:40:15 +00:00
|
|
|
for _, pi := range pinInfos {
|
2022-03-22 09:56:16 +00:00
|
|
|
if filter.Match(pi.Status) {
|
|
|
|
out <- pi
|
2021-07-04 21:40:15 +00:00
|
|
|
}
|
|
|
|
}
|
2017-12-01 11:56:26 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockPinTracker) Status(ctx context.Context, in api.Cid, out *api.PinInfo) error {
|
2019-02-27 20:09:31 +00:00
|
|
|
if in.Equals(ErrorCid) {
|
2017-12-01 11:56:26 +00:00
|
|
|
return ErrBadCid
|
|
|
|
}
|
|
|
|
|
2017-11-30 00:53:31 +00:00
|
|
|
*out = api.PinInfo{
|
2020-05-15 22:32:28 +00:00
|
|
|
Cid: in,
|
|
|
|
Peer: PeerID2,
|
|
|
|
PinInfoShort: api.PinInfoShort{
|
|
|
|
Status: api.TrackerStatusPinned,
|
|
|
|
TS: time.Now(),
|
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
}
|
2017-11-30 00:53:31 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockPinTracker) RecoverAll(ctx context.Context, in <-chan struct{}, out chan<- api.PinInfo) error {
|
|
|
|
close(out)
|
2017-11-30 00:53:31 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockPinTracker) Recover(ctx context.Context, in api.Cid, out *api.PinInfo) error {
|
2017-12-01 11:56:26 +00:00
|
|
|
*out = api.PinInfo{
|
2020-05-15 22:32:28 +00:00
|
|
|
Cid: in,
|
|
|
|
Peer: PeerID1,
|
|
|
|
PinInfoShort: api.PinInfoShort{
|
|
|
|
Status: api.TrackerStatusPinned,
|
|
|
|
TS: time.Now(),
|
|
|
|
},
|
2019-02-27 17:04:35 +00:00
|
|
|
}
|
2017-01-23 11:08:04 +00:00
|
|
|
return nil
|
|
|
|
}
|
2017-02-13 15:46:53 +00:00
|
|
|
|
2022-05-05 09:19:57 +00:00
|
|
|
func (mock *mockPinTracker) PinQueueSize(ctx context.Context, in struct{}, out *int64) error {
|
|
|
|
*out = 10
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2018-05-07 12:22:06 +00:00
|
|
|
/* PeerMonitor methods */
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
// LatestMetrics runs PeerMonitor.LatestMetrics().
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockPeerMonitor) LatestMetrics(ctx context.Context, in string, out *[]api.Metric) error {
|
|
|
|
m := api.Metric{
|
2018-05-07 12:22:06 +00:00
|
|
|
Name: "test",
|
2019-02-27 20:19:10 +00:00
|
|
|
Peer: PeerID1,
|
2018-05-07 12:22:06 +00:00
|
|
|
Value: "0",
|
|
|
|
Valid: true,
|
|
|
|
}
|
|
|
|
m.SetTTL(2 * time.Second)
|
2022-03-19 01:52:46 +00:00
|
|
|
last := []api.Metric{m}
|
2018-05-07 12:22:06 +00:00
|
|
|
*out = last
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-10-24 14:37:26 +00:00
|
|
|
// MetricNames runs PeerMonitor.MetricNames().
|
|
|
|
func (mock *mockPeerMonitor) MetricNames(ctx context.Context, in struct{}, out *[]string) error {
|
|
|
|
k := []string{"ping", "freespace"}
|
|
|
|
*out = k
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-03-14 15:10:45 +00:00
|
|
|
/* IPFSConnector methods */
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockIPFSConnector) Pin(ctx context.Context, in api.Pin, out *struct{}) error {
|
2019-12-13 11:03:01 +00:00
|
|
|
switch in.Cid {
|
|
|
|
case SlowCid1:
|
|
|
|
time.Sleep(2 * time.Second)
|
|
|
|
}
|
2017-03-14 15:10:45 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockIPFSConnector) Unpin(ctx context.Context, in api.Pin, out *struct{}) error {
|
2019-12-13 11:03:01 +00:00
|
|
|
switch in.Cid {
|
|
|
|
case SlowCid1:
|
|
|
|
time.Sleep(2 * time.Second)
|
|
|
|
}
|
2017-03-14 15:10:45 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-19 01:52:46 +00:00
|
|
|
func (mock *mockIPFSConnector) PinLsCid(ctx context.Context, in api.Pin, out *api.IPFSPinStatus) error {
|
2020-04-20 14:21:27 +00:00
|
|
|
if in.Cid.Equals(Cid1) || in.Cid.Equals(Cid3) {
|
2017-03-14 15:10:45 +00:00
|
|
|
*out = api.IPFSPinStatusRecursive
|
|
|
|
} else {
|
|
|
|
*out = api.IPFSPinStatusUnpinned
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-03-22 09:56:16 +00:00
|
|
|
func (mock *mockIPFSConnector) PinLs(ctx context.Context, in <-chan []string, out chan<- api.IPFSPinInfo) error {
|
|
|
|
out <- api.IPFSPinInfo{Cid: api.Cid(Cid1), Type: api.IPFSPinStatusRecursive}
|
|
|
|
out <- api.IPFSPinInfo{Cid: api.Cid(Cid3), Type: api.IPFSPinStatusRecursive}
|
|
|
|
close(out)
|
2017-03-13 18:35:29 +00:00
|
|
|
return nil
|
|
|
|
}
|
2017-03-23 18:34:33 +00:00
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockIPFSConnector) SwarmPeers(ctx context.Context, in struct{}, out *[]peer.ID) error {
|
2019-02-27 20:19:10 +00:00
|
|
|
*out = []peer.ID{PeerID2, PeerID3}
|
2018-01-18 02:49:35 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockIPFSConnector) ConfigKey(ctx context.Context, in string, out *interface{}) error {
|
2017-03-27 13:07:12 +00:00
|
|
|
switch in {
|
|
|
|
case "Datastore/StorageMax":
|
|
|
|
*out = "100KB"
|
|
|
|
default:
|
|
|
|
return errors.New("configuration key not found")
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockIPFSConnector) RepoStat(ctx context.Context, in struct{}, out *api.IPFSRepoStat) error {
|
2018-08-20 18:43:27 +00:00
|
|
|
// since we have two pins. Assume each is 1000B.
|
|
|
|
stat := api.IPFSRepoStat{
|
|
|
|
StorageMax: 100000,
|
|
|
|
RepoSize: 2000,
|
|
|
|
}
|
|
|
|
*out = stat
|
2017-08-04 19:35:30 +00:00
|
|
|
return nil
|
|
|
|
}
|
2017-10-23 11:46:37 +00:00
|
|
|
|
Adders: stream blocks to destinations
This commit fixes #810 and adds block streaming to the final destinations when
adding. This should add major performance gains when adding data to clusters.
Before, everytime cluster issued a block, it was broadcasted individually to
all destinations (new libp2p stream), where it was block/put to IPFS (a single
block/put http roundtrip per block).
Now, blocks are streamed all the way from the adder module to the ipfs daemon,
by making every block as it arrives a single part in a multipart block/put
request.
Before, block-broadcast needed to wait for all destinations to finish in order
to process the next block. Now, buffers allow some destinations to be faster
than others while sending and receiving blocks.
Before, if a block put request failed to be broadcasted everywhere, an error
would happen at that moment.
Now, we keep streaming until the end and only then report any errors. The
operation succeeds as long as at least one stream finished successfully.
Errors block/putting to IPFS will not abort streams. Instead, subsequent
blocks are retried with a new request, although the method will return an
error when the stream finishes if there were errors at any point.
2022-03-24 01:17:10 +00:00
|
|
|
func (mock *mockIPFSConnector) BlockStream(ctx context.Context, in <-chan api.NodeWithMeta, out chan<- struct{}) error {
|
|
|
|
close(out)
|
2018-04-25 20:35:37 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2022-04-07 11:53:30 +00:00
|
|
|
func (mock *mockIPFSConnector) Resolve(ctx context.Context, in string, out *api.Cid) error {
|
2019-04-29 14:36:40 +00:00
|
|
|
switch in {
|
|
|
|
case ErrorCid.String(), "/ipfs/" + ErrorCid.String():
|
|
|
|
*out = ErrorCid
|
|
|
|
default:
|
|
|
|
*out = Cid2
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockConsensus) AddPeer(ctx context.Context, in peer.ID, out *struct{}) error {
|
2017-10-23 11:46:37 +00:00
|
|
|
return errors.New("mock rpc cannot redirect")
|
|
|
|
}
|
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockConsensus) RmPeer(ctx context.Context, in peer.ID, out *struct{}) error {
|
2017-10-23 11:46:37 +00:00
|
|
|
return errors.New("mock rpc cannot redirect")
|
|
|
|
}
|
2017-11-14 11:26:42 +00:00
|
|
|
|
2019-05-04 20:36:10 +00:00
|
|
|
func (mock *mockConsensus) Peers(ctx context.Context, in struct{}, out *[]peer.ID) error {
|
2019-02-27 20:19:10 +00:00
|
|
|
*out = []peer.ID{PeerID1, PeerID2, PeerID3}
|
2017-11-14 11:26:42 +00:00
|
|
|
return nil
|
|
|
|
}
|