Commit Graph

1655 Commits

Author SHA1 Message Date
Hector Sanjuan
7ca3dc292a Fix #269: Add IPFS() method to api/rest/client
The IPFS() methods returns an ipfs Shell pointing to the ipfs-cluster
proxy endpoint. The location can be customized (via ProxyAddr configuration
option) or it is assumed to be the same as the PeerAddr/APIAddr, with
a different port (the default).

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-26 15:23:14 +02:00
Hector Sanjuan
a4adce6592
Merge pull request #349 from ipfs/feat/restapi-libp2p
Feat #305: Libp2p support for REST API
2018-03-26 14:22:39 +02:00
Adrian Lanzafame
364a134eb5 Use go-fs-lock pkg
License: MIT
Signed-off-by: Adrian Lanzafame <adrianlanzafame92@gmail.com>
2018-03-26 19:28:47 +10:00
Hector Sanjuan
2cea3d2b07
Merge pull request #357 from racin/master
Documentation: Can't get peers to connect without /ipfs/ before <id>.
2018-03-22 01:28:26 +01:00
Racin Nygaard
3a3abfc31e Documentation: Can't get peers to connect without /ipfs/ before <id>.
This is also reflected in the other documentations.

License: MIT
Signed-off-by: racin <mail@racin.no>
2018-03-22 01:08:04 +01:00
Hector Sanjuan
8e7ca5a682 rest/config: remove dup https options
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-21 16:16:24 +01:00
Hector Sanjuan
8d8bcf6ce5
Merge pull request #355 from ipfs/doc/readme-go-version
Readme: specify that we want Go1.9+
2018-03-21 15:46:32 +01:00
Hector Sanjuan
75c82ab0c9
Merge pull request #353 from ipfs/feat/error-msgs-bootstrap
Improve errors for bootstraps
2018-03-21 11:58:27 +01:00
Hector Sanjuan
4ea873c297 api/rest/client: run endpoint tests in parallel
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-21 09:51:20 +01:00
Hector Sanjuan
72ee994b8f
Readme: specify that we want Go1.9+ 2018-03-21 09:33:12 +01:00
Hector Sanjuan
62bdbaa9f3 Use iff iff it is necessary
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-21 00:34:57 +01:00
Hector Sanjuan
6777122abf rest/libp2p-http: address @zenground0 comments
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-20 19:51:57 +01:00
Hector Sanjuan
09f4c9fce3 rest/libp2p-http: address lanzafame's review
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-20 19:35:42 +01:00
Hector Sanjuan
a6acb72a2c Improve errors for bootstraps
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-20 14:27:49 +01:00
Hector Sanjuan
23d2db15e7 ipfs-cluster-ctl: fix sharness
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 19:37:52 +01:00
Hector Sanjuan
02bde2650e api/rest: refactorings in config.go (codeclimate)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 14:55:36 +01:00
Hector Sanjuan
a9a58a50a0 Config: provide utility to parse duration arguments. Use it.
Should reduce complexity (codeclimate).

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 14:22:11 +01:00
Hector Sanjuan
b989e1726d api/rest: refactor run() (codeclimate)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:53:07 +01:00
Hector Sanjuan
e5ac535c44 api/rest: refactor LoadJSON (codeclimate)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:48:46 +01:00
Hector Sanjuan
5cd048a65d api: move some util functions to util.go (codeclimate file lines)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:43:14 +01:00
Hector Sanjuan
a73d7e6f7e Relocate multiaddrJoin and multiaddrSplit to api/types.h
So they can serve as multi-module helpers without having circular deps.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:37:32 +01:00
Hector Sanjuan
2227e5e25f rest/client: refactor transport setup (codeclimate)
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:23:38 +01:00
Hector Sanjuan
f74c7b2c6e Feat #305: Golinting
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-16 13:08:11 +01:00
Hector Sanjuan
de07a9dd70
Merge pull request #344 from ipfs/feat/wrong-secrets
Fix #167: Useful messages when consensus doesn't start
2018-03-16 11:41:05 +01:00
Hector Sanjuan
73581b0471 ipfs-cluster-ctl: Allow libp2p multiaddress as --host. Use libp2p in that case.
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 17:15:23 +01:00
Hector Sanjuan
3eee5d0ddb cluster-service: re-use cluster libp2p host for rest API by default
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 17:14:22 +01:00
Hector Sanjuan
4bed9d0076 api/rest/client: add private networks support.
Also, re-use some convinient functions provided by pnet.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 17:14:22 +01:00
Hector Sanjuan
bbe2407531 rest/client: add support for libp2p-tunneled http.
This adds support for libp2p-tunneled http to the rest api component.

If PeerAddr is specified in the configuration, then we will create a
libp2p host and communicate with the API using that.

Tests run now in both http and libp2p mode.

Note: pnet support not included, but coming up

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 17:14:22 +01:00
Hector Sanjuan
fb4bda8880 restapi: Expose the http endpoints on libp2p
This commits allows restapi to serve/tunnel http on a libp2p stream.

NewWitHost(...) allows to provide a libp2p host during initialization
which is then used to obtain a listener with go-libp2p-gostream.

Alternatively, if the configuration provides an ID, PrivateKey and Libp2pListenAddr,
a host is created directly by us and used to get the listener.

The protocol tag used is provided by the p2phttp library which will
be used by the client.

All tests now run against the libp2p node too.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 17:14:22 +01:00
Hector Sanjuan
3b715041ac RestAPI: support libp2p host parameters in configuration
This adds support for parameters to create a libp2p host
in the REST API configuration: ID, PrivateKey and ListenMultiaddr.

These parameters default to nil/empty and are ommited in the default
configuration. They are only supposed to be used when the user wants
the REST API to use a different libp2p host than a provided one (upcoming
changes).

Pnet protector not supported yet in this case. Underlying basic auth
should cover that front. Will implement if someone has a usecase.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 00:04:54 +01:00
Hector Sanjuan
5956dce69f Create cluster Host in ipfs-cluster-service.
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 00:04:54 +01:00
Hector Sanjuan
07a66851cb consensus/raft: use new host constructor in tests
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 00:04:54 +01:00
Hector Sanjuan
41b17bf477 Cluster: add libp2p host parameter to constructor.
NewCluster() now takes an optional Host parameter.
The rationale is to allow to re-use an existing libp2p Host
when creating the cluster.

The NewClusterHost method now allows to create a host
with the options used by cluster.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-15 00:04:54 +01:00
Hector Sanjuan
836d552fbb Fix go4-lock name in package.json
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-13 23:52:45 +01:00
Hector Sanjuan
1abeff62c7
Merge pull request #345 from ipfs/update/libp2p
Update libp2p and deps to correct versions
2018-03-13 17:01:01 +01:00
Hector Sanjuan
a746255719 Fix tests
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-13 16:30:47 +01:00
Hector Sanjuan
c231fe8060 Update libp2p and deps to correct versions
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-13 15:32:56 +01:00
Hector Sanjuan
b56888e5bb
Merge pull request #334 from ipfs/fix/client/timeout
rest/client: double default timeout
2018-03-13 10:49:37 +01:00
Hector Sanjuan
4f9fccde72 Addressing feedback
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-13 10:37:47 +01:00
Hector Sanjuan
740f314976 Fix #167: Useful messages when consensus doesn't start
This will display a few hints when consensus fails to start.
If consensus doesn't start (normally WaitForLeader times out),
it's because of libp2p not being able to reach other peers.

This sometimes also means that the wrong protector key (secret)
is being used, even though libp2p does not give us clear
indications.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
2018-03-12 22:54:59 +01:00
Wyatt Daviau
05b64481b9
Merge pull request #342 from ipfs/feat/recursive-pins
Feat/recursive pins
2018-03-12 14:14:59 -04:00
Hector Sanjuan
6278640d20
Merge pull request #341 from ipfs/feat/pin-priority-peers
ToPin call and priority pinning
2018-03-12 17:46:51 +01:00
Wyatt Daviau
b0e8452020 fix errors
License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-12 11:33:46 -04:00
Wyatt Daviau
d7d2dca9cd fix errors
License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-12 11:06:42 -04:00
Wyatt Daviau
bdc373de61 Migration to state specifying recursive attribute
License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-12 11:06:42 -04:00
Wyatt Daviau
1b7b9185e2 support for recursive pins
extension to api types
modifications to ipfsconnector

License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-12 11:06:42 -04:00
Adrian Lanzafame
7715eff0f6 rest/client: ipfs-cluster-ctl: double default timeout
Change the rest/client's and ipfs-cluster-ctl's default
timeout from 60 to 120.

License: MIT
Signed-off-by: Adrian Lanzafame <adrianlanzafame92@gmail.com>
2018-03-10 11:20:56 +10:00
Hector Sanjuan
c276c31ad6
Merge pull request #331 from ipfs/feat/pin-refs
Feat #326: Adds "refs -r" pinning method support + multiple pin workers
2018-03-10 01:28:09 +01:00
Wyatt Daviau
e2c4b6f5a9 consolidate Pin and PinTo
License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-09 17:16:20 -05:00
Wyatt Daviau
0a34f3382b ToPin call and priority pinning
License: MIT
Signed-off-by: Wyatt Daviau <wdaviau@cs.stanford.edu>
2018-03-09 17:13:35 -05:00