X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fapiv1.go;h=36e5a547c5efdd286c239e24a3dd2f1134d0c860;hb=4d843d2bde236ec23810d0904dfb8aebbc53a37b;hp=77b05baeaa966ebbb8c10d7d5c0912c9b22a4fd7;hpb=2d90eac319979dba64371258b30e61e77a15db7d;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go index 77b05ba..36e5a54 100644 --- 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,7 +81,7 @@ 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) @@ -95,8 +96,9 @@ func (s *APIService) AddXdsServer(cfg xdsconfig.XDSServerConf) (*XdsServer, erro // Passthrough routes (handle by XDS Server) grp := s.apiRouter.Group(svr.PartialURL) svr.SetAPIRouterGroup(grp) - svr.PassthroughGet("/sdks") - svr.PassthroughGet("/sdk/:id") + + // Declare passthrough routes + s.sdksPassthroughInit(svr) } // Established connection