Use go module as dependency tool instead of glide

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

diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go
index 346bdb9..40ee57b 100644 (file)
--- a/lib/agent/xdsserver.go
+++ b/lib/agent/xdsserver.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,11 +26,11 @@ import (
        "sync"
        "time"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
-       "github.com/iotbzh/xds-agent/lib/xaapiv1"
-       "github.com/iotbzh/xds-agent/lib/xdsconfig"
-       common "github.com/iotbzh/xds-common/golib"
-       "github.com/iotbzh/xds-server/lib/xsapiv1"
        uuid "github.com/satori/go.uuid"
        sio_client "github.com/sebd71/go-socket.io-client"
 )
@@ -39,6 +39,7 @@ import (
 type XdsServer struct {
        *Context
        ID           string
+       URLIndex     string
        BaseURL      string
        APIURL       string
        PartialURL   string
@@ -83,6 +84,7 @@ func NewXdsServer(ctx *Context, conf xdsconfig.XDSServerConf) *XdsServer {
        return &XdsServer{
                Context:    ctx,
                ID:         _IDTempoPrefix + uuid.NewV1().String(),
+               URLIndex:   conf.URLIndex,
                BaseURL:    conf.URL,
                APIURL:     conf.APIBaseURL + conf.APIPartialURL,
                PartialURL: conf.APIPartialURL,
@@ -155,6 +157,19 @@ func (xs *XdsServer) SetLoggerOutput(out io.Writer) {
        xs.logOut = out
 }
 
+// GetConfig return the current server config
+func (xs *XdsServer) GetConfig() xaapiv1.ServerCfg {
+       return xaapiv1.ServerCfg{
+               ID:         xs.ID,
+               URL:        xs.BaseURL,
+               APIURL:     xs.APIURL,
+               PartialURL: xs.PartialURL,
+               ConnRetry:  xs.ConnRetry,
+               Connected:  xs.Connected,
+               Disabled:   xs.Disabled,
+       }
+}
+
 // SendCommand Send a command to XDS Server
 func (xs *XdsServer) SendCommand(cmd string, body []byte, res interface{}) error {
        url := cmd
@@ -208,6 +223,22 @@ func (xs *XdsServer) CommandSignal(args *xsapiv1.ExecSignalArgs, res *xsapiv1.Ex
        return xs.client.Post("/signal", args, res)
 }
 
+// CommandTgtTerminalGet Send GET request to retrieve info of a target terminals
+func (xs *XdsServer) CommandTgtTerminalGet(targetID, termID string, res *xsapiv1.TerminalConfig) error {
+       return xs.client.Get("/targets/"+targetID+"/terminals/"+termID, res)
+}
+
+// CommandTgtTerminalOpen Send POST request to open a target terminal
+func (xs *XdsServer) CommandTgtTerminalOpen(targetID string, termID string, res *xsapiv1.TerminalConfig) error {
+       var empty interface{}
+       return xs.client.Post("/targets/"+targetID+"/terminals/"+termID+"/open", &empty, res)
+}
+
+// CommandTgtTerminalSignal Send POST request to send a signal to a target terminal
+func (xs *XdsServer) CommandTgtTerminalSignal(args *xsapiv1.TerminalSignalArgs, res *xsapiv1.TerminalConfig) error {
+       return xs.client.Post("/signal", args, res)
+}
+
 // SetAPIRouterGroup .
 func (xs *XdsServer) SetAPIRouterGroup(r *gin.RouterGroup) {
        xs.apiRouter = r
@@ -287,6 +318,58 @@ func (xs *XdsServer) PassthroughPost(url string) {
                        xs._Disconnected()
                }
                common.APIError(c, err.Error())
+               return
+       })
+}
+
+// PassthroughPut Used to declare a route that sends directly a PUT request to XDS Server
+func (xs *XdsServer) PassthroughPut(url string) {
+       if xs.apiRouter == nil {
+               xs.Log.Errorf("apiRouter not set !")
+               return
+       }
+
+       xs.apiRouter.PUT(url, func(c *gin.Context) {
+               var err error
+               var data interface{}
+
+               // Get raw body
+               body, err := c.GetRawData()
+               if err != nil {
+                       common.APIError(c, err.Error())
+                       return
+               }
+
+               // 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 Put request
+               response, err := xs.client.HTTPPutWithRes(nURL, string(body))
+               if err != nil {
+                       goto httpError
+               }
+               if response.StatusCode != 200 {
+                       err = fmt.Errorf(response.Status)
+                       return
+               }
+               err = json.Unmarshal(xs.client.ResponseToBArray(response), &data)
+               if err != nil {
+                       goto httpError
+               }
+
+               c.JSON(http.StatusOK, data)
+               return
+
+               /* Handle error case */
+       httpError:
+               if strings.Contains(err.Error(), "connection refused") {
+                       xs._Disconnected()
+               }
+               common.APIError(c, err.Error())
+               return
        })
 }
 
@@ -330,6 +413,7 @@ func (xs *XdsServer) PassthroughDelete(url string) {
                        xs._Disconnected()
                }
                common.APIError(c, err.Error())
+               return
        })
 }
 
@@ -617,7 +701,7 @@ func (xs *XdsServer) _SocketConnect() error {
        })
 
        iosk.On("disconnection", func(err error) {
-               xs.Log.Infof("IO.socket disconnection server %s", xs.ID)
+               xs.Log.Infof("IO.socket disconnection server %s (APIURL %s)", xs.ID, xs.APIURL)
                if xs.CBOnDisconnect != nil {
                        xs.CBOnDisconnect(err)
                }
@@ -660,6 +744,9 @@ func (xs *XdsServer) _SocketConnect() error {
 // _Disconnected Set XDS Server as disconnected
 func (xs *XdsServer) _Disconnected() error {
        // Clear all register events as socket is closed
+       xs.sockEventsLock.Lock()
+       defer xs.sockEventsLock.Unlock()
+
        for k := range xs.sockEvents {
                delete(xs.sockEvents, k)
        }