component move back to plugins

quchwe · Sep 8, 2016 · 5d421a1 · 5d421a1
1 parent 0e74395
commit 5d421a1
Show file tree

Hide file tree

Showing 50 changed files with 247 additions and 315 deletions.
diff --git a/src/api/api.go b/src/api/api.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/Dataman-Cloud/rolex/src/dockerclient"
-	"github.com/Dataman-Cloud/rolex/src/util/config"
+	"github.com/Dataman-Cloud/rolex/src/utils/config"
 )
 
 type Api struct {

diff --git a/src/api/container.go b/src/api/container.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
 	"github.com/Dataman-Cloud/rolex/src/dockerclient/model"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 
 	docker "github.com/Dataman-Cloud/go-dockerclient"
 	log "github.com/Sirupsen/logrus"
@@ -59,23 +59,23 @@ func (api *Api) ListContainers(ctx *gin.Context) {
 	all, err := strconv.ParseBool(ctx.DefaultQuery("all", "true"))
 	if err != nil {
 		log.Error("Parse param all of list container got error: ", err)
-		rerror := dmerror.NewError(CodeListContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
 
 	size, err := strconv.ParseBool(ctx.DefaultQuery("size", "false"))
 	if err != nil {
 		log.Error("Parse param size of list container got error: ", err)
-		rerror := dmerror.NewError(CodeListContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
 
 	limitValue, err := strconv.ParseInt(ctx.DefaultQuery("limit", "0"), 10, 64)
 	if err != nil {
 		log.Error("Parse param all of limit container got error: ", err)
-		rerror := dmerror.NewError(CodeListContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -85,7 +85,7 @@ func (api *Api) ListContainers(ctx *gin.Context) {
 	queryFilters := ctx.DefaultQuery("filters", "{}")
 	if err := json.Unmarshal([]byte(queryFilters), &filters); err != nil {
 		log.Error("Unmarshal list container filters got error: ", err)
-		rerror := dmerror.NewError(CodeListContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -115,7 +115,7 @@ func (api *Api) PatchContainer(ctx *gin.Context) {
 	rolexContext, _ := ctx.Get("rolexContext")
 	var containerRequest ContainerRequest
 	if err := ctx.BindJSON(&containerRequest); err != nil {
-		rerror := dmerror.NewError(CodePatchContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodePatchContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -143,7 +143,7 @@ func (api *Api) PatchContainer(ctx *gin.Context) {
 	case "resizetty":
 		err = api.GetDockerClient().ResizeContainerTTY(rolexContext.(context.Context), cId, containerRequest.Height, containerRequest.Width)
 	default:
-		err = dmerror.NewError(CodePatchContainerMethodUndefined, containerRequest.Method)
+		err = rolexerror.NewError(CodePatchContainerMethodUndefined, containerRequest.Method)
 	}
 
 	if err != nil {
@@ -160,7 +160,7 @@ func (api *Api) DeleteContainer(ctx *gin.Context) {
 	rolexContext, _ := ctx.Get("rolexContext")
 	var containerRequest ContainerRequest
 	if err := ctx.BindJSON(&containerRequest); err != nil {
-		rerror := dmerror.NewError(CodeDeleteContainerParamError, err.Error())
+		rerror := rolexerror.NewError(CodeDeleteContainerParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -175,7 +175,7 @@ func (api *Api) DeleteContainer(ctx *gin.Context) {
 		opts := docker.KillContainerOptions{ID: cId}
 		err = api.GetDockerClient().KillContainer(rolexContext.(context.Context), opts)
 	} else {
-		err = dmerror.NewError(CodeDeleteContainerMethodUndefined, containerRequest.Method)
+		err = rolexerror.NewError(CodeDeleteContainerMethodUndefined, containerRequest.Method)
 	}
 
 	if err != nil {

diff --git a/src/api/image.go b/src/api/image.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 
 	docker "github.com/Dataman-Cloud/go-dockerclient"
 	log "github.com/Sirupsen/logrus"
@@ -23,15 +23,15 @@ func (api *Api) ListImages(ctx *gin.Context) {
 	all, err := strconv.ParseBool(ctx.DefaultQuery("all", "false"))
 	if err != nil {
 		log.Error("Parse param all of list images got error: ", err)
-		rerror := dmerror.NewError(CodeListImageParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListImageParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
 
 	digests, err := strconv.ParseBool(ctx.DefaultQuery("digests", "true"))
 	if err != nil {
 		log.Error("Parse param digests of list images got error: ", err)
-		rerror := dmerror.NewError(CodeListImageParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListImageParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -40,7 +40,7 @@ func (api *Api) ListImages(ctx *gin.Context) {
 	queryFilters := ctx.DefaultQuery("filters", "{}")
 	if err := json.Unmarshal([]byte(queryFilters), &filters); err != nil {
 		log.Error("Unmarshal list images filters got error: ", err)
-		rerror := dmerror.NewError(CodeListImageParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListImageParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}

diff --git a/src/api/middlewares/listintercept.go b/src/api/middlewares/listintercept.go
@@ -3,7 +3,7 @@ package middlewares
 import (
 	"strconv"
 
-	"github.com/Dataman-Cloud/go-component/utils/model"
+	"github.com/Dataman-Cloud/rolex/src/utils/model"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/src/api/misc.go b/src/api/misc.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 	"github.com/Dataman-Cloud/rolex/src/version"
 
 	log "github.com/Sirupsen/logrus"
@@ -40,7 +40,7 @@ func (api *Api) RolexConfig(ctx *gin.Context) {
 
 	if err != nil {
 		log.Errorf("InspectSwarm got error: %s", err.Error())
-		rerror := dmerror.NewError(CodeGetConfigError, err.Error())
+		rerror := rolexerror.NewError(CodeGetConfigError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}

diff --git a/src/api/network.go b/src/api/network.go
@@ -3,8 +3,8 @@ package api
 import (
 	"encoding/json"
 
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 
 	docker "github.com/Dataman-Cloud/go-dockerclient"
 	log "github.com/Sirupsen/logrus"
@@ -35,7 +35,7 @@ func (api *Api) ConnectNetwork(ctx *gin.Context) {
 
 	if err := ctx.BindJSON(&connectNetworkRequest); err != nil {
 		log.Errorf("connect network request body parse json error: %v", err)
-		rerror := dmerror.NewError(CodeConnectNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeConnectNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -48,7 +48,7 @@ func (api *Api) ConnectNetwork(ctx *gin.Context) {
 	case NETWORK_DISCONNECT:
 		err = api.GetDockerClient().DisconnectNetwork(networkID, connectNetworkRequest.NetworkOptions)
 	default:
-		err = dmerror.NewError(CodeConnectNetworkMethodError, connectNetworkRequest.Method)
+		err = rolexerror.NewError(CodeConnectNetworkMethodError, connectNetworkRequest.Method)
 	}
 
 	if err != nil {
@@ -66,7 +66,7 @@ func (api *Api) CreateNetwork(ctx *gin.Context) {
 
 	if err := ctx.BindJSON(&netWorkOption); err != nil {
 		log.Error("create network request body parse json error: ", err)
-		rerror := dmerror.NewError(CodeCreateNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeCreateNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -86,7 +86,7 @@ func (api *Api) InspectNetwork(ctx *gin.Context) {
 	network, err := api.GetDockerClient().InspectNetwork(ctx.Param("network_id"))
 	if err != nil {
 		log.Error("inspect network error: ", err)
-		rerror := dmerror.NewError(CodeInspectNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeInspectNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -101,7 +101,7 @@ func (api *Api) ListNetworks(ctx *gin.Context) {
 	fp := ctx.DefaultQuery("filters", "{\"driver\": {\"overlay\": true}}")
 	if err := json.Unmarshal([]byte(fp), &filter); err != nil {
 		log.Error("list network request body parse json error: ", err)
-		rerror := dmerror.NewError(CodeListNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -132,7 +132,7 @@ func (api *Api) ConnectNodeNetwork(ctx *gin.Context) {
 	var connectNetworkRequest ConnectNetworkRequest
 	if err := ctx.BindJSON(&connectNetworkRequest); err != nil {
 		log.Errorf("connect network request body parse json error: %v", err)
-		rerror := dmerror.NewError(CodeConnectNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeConnectNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -147,7 +147,7 @@ func (api *Api) ConnectNodeNetwork(ctx *gin.Context) {
 	case NETWORK_DISCONNECT:
 		err = api.GetDockerClient().DisconnectNodeNetwork(rolexContext.(context.Context), networkID, connectNetworkRequest.NetworkOptions)
 	default:
-		err = dmerror.NewError(CodeConnectNetworkMethodError, method)
+		err = rolexerror.NewError(CodeConnectNetworkMethodError, method)
 	}
 
 	if err != nil {
@@ -183,7 +183,7 @@ func (api *Api) ListNodeNetworks(ctx *gin.Context) {
 	fp := ctx.DefaultQuery("filters", "{}")
 	if err := json.Unmarshal([]byte(fp), &filters); err != nil {
 		log.Error("list network request body parse json error: ", err)
-		rerror := dmerror.NewError(CodeListNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeListNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}
@@ -205,7 +205,7 @@ func (api *Api) CreateNodeNetwork(ctx *gin.Context) {
 
 	if err := ctx.BindJSON(&netWorkOption); err != nil {
 		log.Error("create node network request body parse json error: ", err)
-		rerror := dmerror.NewError(CodeCreateNetworkParamError, err.Error())
+		rerror := rolexerror.NewError(CodeCreateNetworkParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}

diff --git a/src/api/node.go b/src/api/node.go
@@ -3,9 +3,9 @@ package api
 import (
 	"encoding/json"
 
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
 	"github.com/Dataman-Cloud/rolex/src/model"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/engine-api/types"
@@ -81,7 +81,7 @@ func (api *Api) UpdateNode(ctx *gin.Context) {
 			log.Errorf("Unexpected type at by type %v. Expected %s but received %s.",
 				jsonErr.Offset, jsonErr.Type, jsonErr.Value)
 		}
-		rerror := dmerror.NewError(CodeUpdateNodeParamError, err.Error())
+		rerror := rolexerror.NewError(CodeUpdateNodeParamError, err.Error())
 		dmgin.HttpErrorResponse(ctx, rerror)
 		return
 	}

diff --git a/src/api/registryauth.go b/src/api/registryauth.go
@@ -3,8 +3,8 @@ package api
 import (
 	"github.com/Dataman-Cloud/go-component/auth"
 	rauth "github.com/Dataman-Cloud/go-component/registryauth"
-	"github.com/Dataman-Cloud/go-component/utils/dmerror"
-	"github.com/Dataman-Cloud/go-component/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/dmgin"
+	"github.com/Dataman-Cloud/rolex/src/utils/rolexerror"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
@@ -21,14 +21,14 @@ func (api *Api) Create(ctx *gin.Context) {
 	account, ok := ctx.Get("account")
 	if !ok {
 		log.Error("get registryAuths invalid user")
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
 		return
 	}
 
 	var registryAuth rauth.RegistryAuth
 	if err := ctx.BindJSON(&registryAuth); err != nil {
 		log.Errorf("create registryAuth param error: %v", err)
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeCreateRegistryAuthParamError, err.Error()))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeCreateRegistryAuthParamError, err.Error()))
 		return
 	}
 
@@ -39,7 +39,7 @@ func (api *Api) Create(ctx *gin.Context) {
 	}
 
 	if len(rs) > 0 {
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeGetRegistryAuthExistError, "registryAuth exists"))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeGetRegistryAuthExistError, "registryAuth exists"))
 		return
 	}
 
@@ -57,7 +57,7 @@ func (api *Api) List(ctx *gin.Context) {
 	account, ok := ctx.Get("account")
 	if !ok {
 		log.Error("get registryAuths invalid user")
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
 		return
 	}
 
@@ -75,14 +75,14 @@ func (api *Api) Delete(ctx *gin.Context) {
 	account, ok := ctx.Get("account")
 	if !ok {
 		log.Error("delete registryAuth invalid user")
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeRegistryAuthInvalidUserError, "invalid user"))
 		return
 	}
 
 	name := ctx.Param("rauth_name")
 	if name == "" {
 		log.Errorf("get registryAuth name invalid")
-		dmgin.HttpErrorResponse(ctx, dmerror.NewError(CodeDeleteRegistryAuthParamError, "registryAuth name invalid"))
+		dmgin.HttpErrorResponse(ctx, rolexerror.NewError(CodeDeleteRegistryAuthParamError, "registryAuth name invalid"))
 		return
 	}
 

diff --git a/src/api/router.go b/src/api/router.go
@@ -14,7 +14,7 @@ import (
 	"github.com/Dataman-Cloud/rolex/src/api/middlewares"
 	"github.com/Dataman-Cloud/rolex/src/plugins"
 	"github.com/Dataman-Cloud/rolex/src/plugins/apiplugin"
-	"github.com/Dataman-Cloud/rolex/src/util/log"
+	"github.com/Dataman-Cloud/rolex/src/utils/log"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"