Code Review
/
src
/
xds
/
xds-agent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
e904bbb
)
Fixed parameter processing for passthrough api.
author
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Mon, 6 Nov 2017 13:54:12 +0000
(14:54 +0100)
committer
Sebastien Douheret
<sebastien.douheret@iot.bzh>
Mon, 6 Nov 2017 13:54:12 +0000
(14:54 +0100)
lib/agent/xdsserver.go
patch
|
blob
|
history
diff --git
a/lib/agent/xdsserver.go
b/lib/agent/xdsserver.go
index
5851a07
..
37604b5
100644
(file)
--- a/
lib/agent/xdsserver.go
+++ b/
lib/agent/xdsserver.go
@@
-251,7
+251,13
@@
func (xs *XdsServer) PassthroughGet(url string) {
xs.apiRouter.GET(url, func(c *gin.Context) {
var data interface{}
xs.apiRouter.GET(url, func(c *gin.Context) {
var data interface{}
- if err := xs._HTTPGet(url, &data); err != nil {
+ // Take care of param (eg. id in /projects/:id)
+ nURL := url
+ if strings.Contains(url, ":") {
+ nURL = strings.TrimPrefix(c.Request.URL.Path, xs.APIURL)
+ }
+ // Send Get request
+ if err := xs._HTTPGet(nURL, &data); err != nil {
if strings.Contains(err.Error(), "connection refused") {
xs.Connected = false
xs._NotifyState()
if strings.Contains(err.Error(), "connection refused") {
xs.Connected = false
xs._NotifyState()
@@
-279,7
+285,13
@@
func (xs *XdsServer) PassthroughPost(url string) {
return
}
return
}
- response, err := xs._HTTPPost(url, bodyReq[:n])
+ // Take care of param (eg. id in /projects/:id)
+ nURL := url
+ if strings.Contains(url, ":") {
+ nURL = strings.TrimPrefix(c.Request.URL.Path, xs.APIURL)
+ }
+ // Send Post request
+ response, err := xs._HTTPPost(nURL, bodyReq[:n])
if err != nil {
common.APIError(c, err.Error())
return
if err != nil {
common.APIError(c, err.Error())
return