Fixed /exec input stream and /signal.

[src/xds/xds-agent.git] / lib / agent / apiv1.go

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 3fd9990..1051f2a 100644 (file)
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -8,7 +8,7 @@ import (
        "github.com/iotbzh/xds-agent/lib/xdsconfig"
 )
 
-const apiBaseUrl = "/api/v1"
+const apiBaseURL = "/api/v1"
 
 // APIService .
 type APIService struct {
@@ -21,7 +21,7 @@ type APIService struct {
 func NewAPIV1(ctx *Context) *APIService {
        s := &APIService{
                Context:     ctx,
-               apiRouter:   ctx.webServer.router.Group(apiBaseUrl),
+               apiRouter:   ctx.webServer.router.Group(apiBaseURL),
                serverIndex: 0,
        }
 
@@ -33,10 +33,11 @@ func NewAPIV1(ctx *Context) *APIService {
        s.apiRouter.GET("/browse", s.browseFS)
 
        s.apiRouter.GET("/projects", s.getProjects)
-       s.apiRouter.GET("/project/:id", s.getProject)
-       s.apiRouter.POST("/project", s.addProject)
-       s.apiRouter.POST("/project/sync/:id", s.syncProject)
-       s.apiRouter.DELETE("/project/:id", s.delProject)
+       s.apiRouter.GET("/projects/:id", s.getProject)
+       s.apiRouter.PUT("/projects/:id", s.updateProject)
+       s.apiRouter.POST("/projects", s.addProject)
+       s.apiRouter.POST("/projects/sync/:id", s.syncProject)
+       s.apiRouter.DELETE("/projects/:id", s.delProject)
 
        s.apiRouter.POST("/exec", s.execCmd)
        s.apiRouter.POST("/exec/:id", s.execCmd)
@@ -80,10 +81,10 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro
 
                // Create a new server object
                if cfg.APIBaseURL == "" {
-                       cfg.APIBaseURL = apiBaseUrl
+                       cfg.APIBaseURL = apiBaseURL
                }
                if cfg.APIPartialURL == "" {
-                       cfg.APIPartialURL = "/server/" + strconv.Itoa(s.serverIndex)
+                       cfg.APIPartialURL = "/servers/" + strconv.Itoa(s.serverIndex)
                        s.serverIndex = s.serverIndex + 1
                }