Add folder update support and ClientData field.

[src/xds/xds-server.git] / lib / apiv1 / folders.go

diff --git a/lib/apiv1/folders.go b/lib/apiv1/folders.go
index b4d2ac0..073445c 100644 (file)
--- a/lib/apiv1/folders.go
+++ b/lib/apiv1/folders.go
@@ -2,76 +2,130 @@ package apiv1
 
 import (
        "net/http"
-       "strconv"
+       "os"
 
        "github.com/gin-gonic/gin"
-       "github.com/iotbzh/xds-server/lib/common"
-       "github.com/iotbzh/xds-server/lib/xdsconfig"
+       common "github.com/iotbzh/xds-common/golib"
+       "github.com/iotbzh/xds-server/lib/folder"
 )
 
 // getFolders returns all folders configuration
 func (s *APIService) getFolders(c *gin.Context) {
-       confMut.Lock()
-       defer confMut.Unlock()
-
-       c.JSON(http.StatusOK, s.cfg.Folders)
+       c.JSON(http.StatusOK, s.mfolders.GetConfigArr())
 }
 
 // getFolder returns a specific folder configuration
 func (s *APIService) getFolder(c *gin.Context) {
-       id, err := strconv.Atoi(c.Param("id"))
-       if err != nil || id < 0 || id > len(s.cfg.Folders) {
+       id, err := s.mfolders.ResolveID(c.Param("id"))
+       if err != nil {
+               common.APIError(c, err.Error())
+               return
+       }
+       f := s.mfolders.Get(id)
+       if f == nil {
                common.APIError(c, "Invalid id")
                return
        }
 
-       confMut.Lock()
-       defer confMut.Unlock()
-
-       c.JSON(http.StatusOK, s.cfg.Folders[id])
+       c.JSON(http.StatusOK, (*f).GetConfig())
 }
 
 // addFolder adds a new folder to server config
 func (s *APIService) addFolder(c *gin.Context) {
-       var cfgArg xdsconfig.FolderConfig
+       var cfgArg folder.FolderConfig
        if c.BindJSON(&cfgArg) != nil {
                common.APIError(c, "Invalid arguments")
                return
        }
 
-       confMut.Lock()
-       defer confMut.Unlock()
-
        s.log.Debugln("Add folder config: ", cfgArg)
 
-       newFld, err := s.mfolder.UpdateFolder(cfgArg)
+       newFld, err := s.mfolders.Add(cfgArg)
        if err != nil {
                common.APIError(c, err.Error())
                return
        }
 
+       // Create xds-project.conf file
+       // FIXME: move to folders.createUpdate func (but gin context needed)
+       fld := s.mfolders.Get(newFld.ID)
+       prjConfFile := (*fld).GetFullPath("xds-project.conf")
+       if !common.Exists(prjConfFile) {
+               fd, err := os.OpenFile(prjConfFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+               if err != nil {
+                       common.APIError(c, err.Error())
+                       return
+               }
+               fd.WriteString("# XDS project settings\n")
+               fd.WriteString("export XDS_SERVER_URL=" + c.Request.Host + "\n")
+               fd.WriteString("export XDS_PROJECT_ID=" + newFld.ID + "\n")
+               if newFld.DefaultSdk == "" {
+                       sdks := s.sdks.GetAll()
+                       newFld.DefaultSdk = sdks[0].ID
+               }
+               fd.WriteString("export XDS_SDK_ID=" + newFld.DefaultSdk + "\n")
+               fd.Close()
+       }
+
        c.JSON(http.StatusOK, newFld)
 }
 
+// syncFolder force synchronization of folder files
+func (s *APIService) syncFolder(c *gin.Context) {
+       id, err := s.mfolders.ResolveID(c.Param("id"))
+       if err != nil {
+               common.APIError(c, err.Error())
+               return
+       }
+       s.log.Debugln("Sync folder id: ", id)
+
+       err = s.mfolders.ForceSync(id)
+       if err != nil {
+               common.APIError(c, err.Error())
+               return
+       }
+
+       c.JSON(http.StatusOK, "")
+}
+
 // delFolder deletes folder from server config
 func (s *APIService) delFolder(c *gin.Context) {
-       id := c.Param("id")
-       if id == "" {
-               common.APIError(c, "Invalid id")
+       id, err := s.mfolders.ResolveID(c.Param("id"))
+       if err != nil {
+               common.APIError(c, err.Error())
                return
        }
 
-       confMut.Lock()
-       defer confMut.Unlock()
-
        s.log.Debugln("Delete folder id ", id)
 
-       var delEntry xdsconfig.FolderConfig
-       var err error
-       if delEntry, err = s.mfolder.DeleteFolder(id); err != nil {
+       delEntry, err := s.mfolders.Delete(id)
+       if err != nil {
                common.APIError(c, err.Error())
                return
        }
        c.JSON(http.StatusOK, delEntry)
+}
+
+// updateFolder update some field of a folder
+func (s *APIService) updateFolder(c *gin.Context) {
+       id, err := s.mfolders.ResolveID(c.Param("id"))
+       if err != nil {
+               common.APIError(c, err.Error())
+               return
+       }
 
+       s.log.Debugln("Update folder id ", id)
+
+       var cfgArg folder.FolderConfig
+       if c.BindJSON(&cfgArg) != nil {
+               common.APIError(c, "Invalid arguments")
+               return
+       }
+
+       upFld, err := s.mfolders.Update(id, cfgArg)
+       if err != nil {
+               common.APIError(c, err.Error())
+               return
+       }
+       c.JSON(http.StatusOK, upFld)
 }