Add KVS HTTP handlers

CHANGES.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Add KVS HTTP handlers #46
+
 ### Changed
 
 

cmd/blast-kvs/delete.go

@@ -24,7 +24,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func delete(c *cli.Context) error {
+func execDelete(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	key := c.String("key")

cmd/blast-kvs/get.go

@@ -24,7 +24,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func get(c *cli.Context) error {
+func execGet(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	key := c.String("key")

cmd/blast-kvs/join.go

@@ -24,7 +24,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func join(c *cli.Context) error {
+func execJoin(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	id := c.Args().Get(0)

cmd/blast-kvs/leave.go

@@ -24,7 +24,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func leave(c *cli.Context) error {
+func execLeave(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	id := c.Args().Get(0)

cmd/blast-kvs/main.go

@@ -123,7 +123,7 @@ func main() {
 					Usage: "Compress a HTTP access log",
 				},
 			},
-			Action: start,
+			Action: execStart,
 		},
 		{
 			Name:  "join",
@@ -136,7 +136,7 @@ func main() {
 				},
 			},
 			ArgsUsage: "[id] [addr]",
-			Action:    join,
+			Action:    execJoin,
 		},
 		{
 			Name:  "leave",
@@ -149,7 +149,7 @@ func main() {
 				},
 			},
 			ArgsUsage: "[id]",
-			Action:    leave,
+			Action:    execLeave,
 		},
 		{
 			Name:  "snapshot",
@@ -161,7 +161,7 @@ func main() {
 					Usage: "address to connect to",
 				},
 			},
-			Action: snapshot,
+			Action: execSnapshot,
 		},
 		{
 			Name:  "get",
@@ -178,7 +178,7 @@ func main() {
 					Usage: "key",
 				},
 			},
-			Action: get,
+			Action: execGet,
 		},
 		{
 			Name:  "put",
@@ -196,7 +196,7 @@ func main() {
 				},
 			},
 			ArgsUsage: "[value]",
-			Action:    put,
+			Action:    execPut,
 		},
 		{
 			Name:  "delete",
@@ -213,7 +213,7 @@ func main() {
 					Usage: "key",
 				},
 			},
-			Action: delete,
+			Action: execDelete,
 		},
 	}
 

cmd/blast-kvs/put.go

@@ -18,21 +18,27 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/mosuka/blast/kvs"
 	pbkvs "github.com/mosuka/blast/protobuf/kvs"
 	"github.com/urfave/cli"
 )
 
-func put(c *cli.Context) error {
+func execPut(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	key := c.String("key")
 	if key == "" {
 		err := errors.New("key argument must be set")
 		return err
+	} else if key[:1] != "/" {
+		err := errors.New("key argument must start \"/\"")
+		return err
 	}
 
+	key, err := filepath.Abs(key)
+
 	value := c.Args().Get(0)
 	if value == "" {
 		err := errors.New("value argument must be set")

cmd/blast-kvs/snapshot.go

@@ -22,7 +22,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func snapshot(c *cli.Context) error {
+func execSnapshot(c *cli.Context) error {
 	grpcAddr := c.String("grpc-addr")
 
 	client, err := kvs.NewGRPCClient(grpcAddr)

cmd/blast-kvs/start.go

@@ -26,7 +26,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func start(c *cli.Context) error {
+func execStart(c *cli.Context) error {
 	nodeId := c.String("node-id")
 	bindAddr := c.String("bind-addr")
 	grpcAddr := c.String("grpc-addr")

kvs/grpc_client.go

@@ -16,13 +16,17 @@ package kvs
 
 import (
 	"context"
+	"errors"
 	"log"
 	"math"
 
 	"github.com/golang/protobuf/ptypes/empty"
+	blasterrors "github.com/mosuka/blast/errors"
 	"github.com/mosuka/blast/protobuf/kvs"
 	"github.com/mosuka/blast/protobuf/raft"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 type GRPCClient struct {
@@ -90,7 +94,9 @@ func (c *GRPCClient) Leave(req *raft.Node, opts ...grpc.CallOption) error {
 func (c *GRPCClient) Snapshot(opts ...grpc.CallOption) error {
 	_, err := c.client.Snapshot(c.ctx, &empty.Empty{})
 	if err != nil {
-		return err
+		st, _ := status.FromError(err)
+
+		return errors.New(st.Message())
 	}
 
 	return nil
@@ -99,7 +105,14 @@ func (c *GRPCClient) Snapshot(opts ...grpc.CallOption) error {
 func (c *GRPCClient) Get(req *kvs.KeyValuePair, opts ...grpc.CallOption) (*kvs.KeyValuePair, error) {
 	resp, err := c.client.Get(c.ctx, req, opts...)
 	if err != nil {
-		return nil, err
+		st, _ := status.FromError(err)
+
+		switch st.Code() {
+		case codes.NotFound:
+			return nil, blasterrors.ErrNotFound
+		default:
+			return nil, errors.New(st.Message())
+		}
 	}
 
 	return resp, nil
@@ -108,7 +121,9 @@ func (c *GRPCClient) Get(req *kvs.KeyValuePair, opts ...grpc.CallOption) (*kvs.K
 func (c *GRPCClient) Put(req *kvs.KeyValuePair, opts ...grpc.CallOption) error {
 	_, err := c.client.Put(c.ctx, req, opts...)
 	if err != nil {
-		return err
+		st, _ := status.FromError(err)
+
+		return errors.New(st.Message())
 	}
 
 	return nil
@@ -117,7 +132,9 @@ func (c *GRPCClient) Put(req *kvs.KeyValuePair, opts ...grpc.CallOption) error {
 func (c *GRPCClient) Delete(req *kvs.KeyValuePair, opts ...grpc.CallOption) error {
 	_, err := c.client.Delete(c.ctx, req, opts...)
 	if err != nil {
-		return err
+		st, _ := status.FromError(err)
+
+		return errors.New(st.Message())
 	}
 
 	return nil