some api changes

pkg/api/v1/server/handler.go

@@ -62,7 +62,7 @@ func lbHandler(ctx *types.Context) {
 		if err != nil {
 			ctx.Log.Error(err, "error reading loadbalancer", "cluster", cl, "name", n)
 			if err == cluster.ErrKeyNotFound {
-				ctx.Err(types.ErrNotFound)
+				ctx.Err(types.ErrLBNotFound)
 				return
 			}
 			ctx.Err(types.ErrISE)
@@ -139,7 +139,7 @@ func lbHandler(ctx *types.Context) {
 			return
 		}
 		if !ctx.Data.DB.LBExists(name) {
-			ctx.Err(types.ErrNotFound)
+			ctx.Err(types.ErrLBNotFound)
 			return
 		}
 		cidr, err := ctx.Data.DB.GetCIDR(name)
@@ -175,6 +175,10 @@ func lbList(lbs map[string][]byte) (m map[string]json.RawMessage) {
 func lbClusterHandler(ctx *types.Context) {
 	cl := ctx.Var("cluster")
 	m, err := ctx.Data.DB.GetLBs(cl)
+	if err == cluster.ErrPrefixNotFound {
+		ctx.Err(types.ErrClusterNotFound)
+		return
+	}
 	if err != nil {
 		ctx.Log.Error(err, "error reading loadbalancers", "cluster", cl)
 		ctx.Err(types.ErrISE)
@@ -214,6 +218,10 @@ func lbClusterHandler(ctx *types.Context) {
 }
 func lbListHandler(ctx *types.Context) {
 	m, err := ctx.Data.DB.GetLBs("")
+	if err == cluster.ErrPrefixNotFound {
+		ctx.Err(types.ErrLBsNotFound)
+		return
+	}
 	if err != nil {
 		ctx.Log.Error(err, "error reading loadbalancer clusters")
 		ctx.Err(types.ErrISE)

pkg/api/v1/server/routes.go

@@ -2,29 +2,33 @@ package server
 
 import (
 	"git.giftfish.de/ston1th/haproxy-lb/pkg/api/types"
-	schemav1 "git.giftfish.de/ston1th/haproxy-lb/pkg/api/v1/schema"
+	"git.giftfish.de/ston1th/haproxy-lb/pkg/api/v1/schema"
 )
 
-const v1 = "/" + schemav1.Version
+const (
+	healthz       = "/healthz"
+	lbcluster     = schema.LBPath + "/{cluster:[a-zA-Z0-9-]+$}"
+	lbclustername = schema.LBPath + "/{cluster:[a-zA-Z0-9-]+}/{name:[a-zA-Z0-9-_]+$}"
+)
 
 var Routes = []types.Route{
 	{
-		"/healthz",
+		healthz,
 		healthzHandler,
 		[]string{"GET"},
 	},
 	{
-		v1 + "/lb",
+		schema.LBPath,
 		authHandler(lbListHandler),
 		[]string{"GET"},
 	},
 	{
-		v1 + "/lb/{cluster:[a-zA-Z0-9-]+$}",
+		lbcluster,
 		authHandler(lbClusterHandler),
 		[]string{"GET", "DELETE"},
 	},
 	{
-		v1 + "/lb/{cluster:[a-zA-Z0-9-]+}/{name:[a-zA-Z0-9-_]+$}",
+		lbclustername,
 		authHandler(lbHandler),
 		[]string{"GET", "POST", "DELETE"},
 	},