Fixed SDK ID resolution for /exec api.

[src/xds/xds-server.git] / lib / crosssdk / sdks.go

diff --git a/lib/crosssdk/sdks.go b/lib/crosssdk/sdks.go
index abfef82..a3da184 100644 (file)
--- a/lib/crosssdk/sdks.go
+++ b/lib/crosssdk/sdks.go
@@ -1,25 +1,29 @@
 package crosssdk
 
 import (
+       "fmt"
        "path"
        "path/filepath"
+       "strings"
        "sync"
 
        "github.com/Sirupsen/logrus"
-       "github.com/iotbzh/xds-server/lib/common"
+       common "github.com/iotbzh/xds-common/golib"
        "github.com/iotbzh/xds-server/lib/xdsconfig"
 )
 
 // SDKs List of installed SDK
 type SDKs struct {
-       Sdks []SDK
+       Sdks map[string]*SDK
 
        mutex sync.Mutex
 }
 
 // Init creates a new instance of Syncthing
 func Init(cfg *xdsconfig.Config, log *logrus.Logger) (*SDKs, error) {
-       s := SDKs{}
+       s := SDKs{
+               Sdks: make(map[string]*SDK),
+       }
 
        // Retrieve installed sdks
        sdkRD := cfg.FileConf.SdkRootDir
@@ -36,12 +40,15 @@ func Init(cfg *xdsconfig.Config, log *logrus.Logger) (*SDKs, error) {
                defer s.mutex.Unlock()
 
                for _, d := range dirs {
+                       if !common.IsDir(d) {
+                               continue
+                       }
                        sdk, err := NewCrossSDK(d)
                        if err != nil {
                                log.Debugf("Error while processing SDK dir=%s, err=%s", d, err.Error())
                                continue
                        }
-                       s.Sdks = append(s.Sdks, *sdk)
+                       s.Sdks[sdk.ID] = sdk
                }
        }
 
@@ -50,44 +57,70 @@ func Init(cfg *xdsconfig.Config, log *logrus.Logger) (*SDKs, error) {
        return &s, nil
 }
 
-// GetAll returns all existing SDKs
-func (s *SDKs) GetAll() []SDK {
-       s.mutex.Lock()
-       defer s.mutex.Unlock()
-       res := s.Sdks
-       return res
+// ResolveID Complete an SDK ID (helper for user that can use partial ID value)
+func (s *SDKs) ResolveID(id string) (string, error) {
+       if id == "" {
+               return "", nil
+       }
+
+       match := []string{}
+       for iid := range s.Sdks {
+               if strings.HasPrefix(iid, id) {
+                       match = append(match, iid)
+               }
+       }
+
+       if len(match) == 1 {
+               return match[0], nil
+       } else if len(match) == 0 {
+               return id, fmt.Errorf("Unknown sdk id")
+       }
+       return id, fmt.Errorf("Multiple sdk IDs found with provided prefix: " + id)
 }
 
 // Get returns an SDK from id
-func (s *SDKs) Get(id int) SDK {
+func (s *SDKs) Get(id string) *SDK {
        s.mutex.Lock()
        defer s.mutex.Unlock()
 
-       if id < 0 || id > len(s.Sdks) {
-               return SDK{}
+       sc, exist := s.Sdks[id]
+       if !exist {
+               return nil
+       }
+       return sc
+}
+
+// GetAll returns all existing SDKs
+func (s *SDKs) GetAll() []SDK {
+       s.mutex.Lock()
+       defer s.mutex.Unlock()
+       res := []SDK{}
+       for _, v := range s.Sdks {
+               res = append(res, *v)
        }
-       res := s.Sdks[id]
        return res
 }
 
 // GetEnvCmd returns the command used to initialized the environment for an SDK
-func (s *SDKs) GetEnvCmd(id string, defaultID string) string {
+func (s *SDKs) GetEnvCmd(id string, defaultID string) []string {
        if id == "" && defaultID == "" {
                // no env cmd
-               return ""
+               return []string{}
        }
 
        s.mutex.Lock()
        defer s.mutex.Unlock()
-       defaultEnv := ""
-       for _, sdk := range s.Sdks {
-               if sdk.ID == id {
+
+       if iid, err := s.ResolveID(id); err == nil {
+               if sdk, exist := s.Sdks[iid]; exist {
                        return sdk.GetEnvCmd()
                }
-               if sdk.ID == defaultID {
-                       defaultEnv = sdk.GetEnvCmd()
-               }
        }
+
+       if sdk, exist := s.Sdks[defaultID]; defaultID != "" && exist {
+               return sdk.GetEnvCmd()
+       }
+
        // Return default env that may be empty
-       return defaultEnv
+       return []string{}
 }