pinning: add integration tests with go-pinning-service-http-client

Signed-off-by: Sander Pick <sanderpick@gmail.com>

Author: sanderpick

api/apitest/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   threads:
-    image: textile/go-threads:534a6d0
+    image: textile/go-threads:1ef50f7
     environment:
       - THREADS_APIADDR=/ip4/0.0.0.0/tcp/5000
       - THREADS_APIPROXYADDR=/ip4/0.0.0.0/tcp/5050
@@ -11,7 +11,7 @@ services:
       - "127.0.0.1:4002:5000"
       - "127.0.0.1:4052:5050"
   ipfs:
-    image: ipfs/go-ipfs:v0.8.0
+    image: textile/go-ipfs:v0.8.0-m1
     environment:
       - IPFS_PROFILE=test
     ports:

api/client/client.go

@@ -69,7 +69,7 @@ func NewClient(addr string, opts ...grpc.DialOption) (*Client, error) {
 	return &Client{
 		c:      pb.NewAPIServiceClient(conn),
 		conn:   conn,
-		target: "did:key:foo", // @todo: Fix me
+		target: "did:key:foo", // @todo: Get target from thread services
 	}, nil
 }
 

api/service.go

@@ -234,7 +234,7 @@ func (s *Service) PushPaths(server pb.APIService_PushPathsServer) error {
 		select {
 		case res := <-out:
 			if err := server.Send(&pb.PushPathsResponse{
-				Path:   res.Path.String(),
+				Path:   res.Path,
 				Cid:    res.Cid.String(),
 				Size:   res.Size,
 				Pinned: res.Pinned,

gateway/pinning.go

@@ -1,8 +1,10 @@
 package gateway
 
 import (
+	"context"
 	"errors"
 	"net/http"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/textileio/go-buckets/pinning"
@@ -32,7 +34,9 @@ func (g *Gateway) listPins(c *gin.Context, key string) {
 		return
 	}
 
-	pins, err := g.ps.ListPins(thread, key, oapiQueryToQuery(query), token)
+	ctx, cancel := context.WithTimeout(context.Background(), handlerTimeout)
+	defer cancel()
+	pins, err := g.ps.ListPins(ctx, thread, key, oapiQueryToQuery(query), token)
 	if err != nil {
 		newFailure(c, http.StatusBadRequest, err)
 		return
@@ -45,12 +49,32 @@ func (g *Gateway) listPins(c *gin.Context, key string) {
 	c.JSON(http.StatusOK, res)
 }
 
+// @todo: Validate Cids
 func oapiQueryToQuery(q openapi.Query) queue.Query {
 	var (
+		status        []openapi.Status
 		before, after string
 		limit         int
 		meta          map[string]string
 	)
+	if len(q.Status) != 0 {
+		for _, p := range strings.Split(q.Status, ",") {
+			var s openapi.Status
+			switch p {
+			case "queued":
+				s = openapi.QUEUED
+			case "pinning":
+				s = openapi.PINNING
+			case "pinned":
+				s = openapi.PINNED
+			case "failed":
+				s = openapi.FAILED
+			default:
+				continue
+			}
+			status = append(status, s)
+		}
+	}
 	if q.Before != nil {
 		before = queue.NewIDFromTime(*q.Before)
 	}
@@ -67,7 +91,7 @@ func oapiQueryToQuery(q openapi.Query) queue.Query {
 		Cid:    q.Cid,
 		Name:   q.Name,
 		Match:  q.Match,
-		Status: q.Status,
+		Status: status,
 		Before: before,
 		After:  after,
 		Limit:  limit,
@@ -97,7 +121,9 @@ func (g *Gateway) addPin(c *gin.Context, key string) {
 		return
 	}
 
-	status, err := g.ps.AddPin(thread, key, pin, token)
+	ctx, cancel := context.WithTimeout(context.Background(), handlerTimeout)
+	defer cancel()
+	status, err := g.ps.AddPin(ctx, thread, key, pin, token)
 	if err != nil {
 		newFailure(c, http.StatusBadRequest, err)
 		return
@@ -122,7 +148,9 @@ func (g *Gateway) getPin(c *gin.Context, key, id string) {
 		return
 	}
 
-	status, err := g.ps.GetPin(thread, key, id, token)
+	ctx, cancel := context.WithTimeout(context.Background(), handlerTimeout)
+	defer cancel()
+	status, err := g.ps.GetPin(ctx, thread, key, id, token)
 	if errors.Is(pinning.ErrPinNotFound, err) {
 		newFailure(c, http.StatusNotFound, err)
 		return
@@ -156,7 +184,9 @@ func (g *Gateway) replacePin(c *gin.Context, key, id string) {
 		return
 	}
 
-	status, err := g.ps.ReplacePin(thread, key, id, pin, token)
+	ctx, cancel := context.WithTimeout(context.Background(), handlerTimeout)
+	defer cancel()
+	status, err := g.ps.ReplacePin(ctx, thread, key, id, pin, token)
 	if errors.Is(pinning.ErrPinNotFound, err) {
 		newFailure(c, http.StatusNotFound, err)
 		return
@@ -184,7 +214,9 @@ func (g *Gateway) removePin(c *gin.Context, key, id string) {
 		return
 	}
 
-	if err := g.ps.RemovePin(thread, key, id, token); errors.Is(pinning.ErrPinNotFound, err) {
+	ctx, cancel := context.WithTimeout(context.Background(), handlerTimeout)
+	defer cancel()
+	if err := g.ps.RemovePin(ctx, thread, key, id, token); errors.Is(pinning.ErrPinNotFound, err) {
 		newFailure(c, http.StatusNotFound, err)
 		return
 	} else if err != nil {