X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=1d21931e1189359b486428917477a8acedc47f8f;hb=7c7d90a781082c6bd22d12a5e2451ca61a5198af;hp=39c120f4cccb1784306ad8971f1a423d5752eeb1;hpb=97ca1f277dc8b6973d6fa67add5593a9c395ce60;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/projects.go b/lib/agent/projects.go index 39c120f..1d21931 100644 --- a/lib/agent/projects.go +++ b/lib/agent/projects.go @@ -3,9 +3,13 @@ package agent import ( "fmt" "log" + "strings" "time" + "github.com/franciscocpg/reflectme" "github.com/iotbzh/xds-agent/lib/syncthing" + "github.com/iotbzh/xds-agent/lib/xaapiv1" + "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/syncthing/syncthing/lib/sync" ) @@ -14,16 +18,8 @@ type Projects struct { *Context SThg *st.SyncThing projects map[string]*IPROJECT - //SEB registerCB []RegisteredCB } -/* SEB -type RegisteredCB struct { - cb *EventCB - data *EventCBData -} -*/ - // Mutex to make add/delete atomic var pjMutex = sync.NewMutex() @@ -33,7 +29,6 @@ func NewProjects(ctx *Context, st *st.SyncThing) *Projects { Context: ctx, SThg: st, projects: make(map[string]*IPROJECT), - //registerCB: []RegisteredCB{}, } } @@ -51,26 +46,19 @@ func (p *Projects) Init(server *XdsServer) error { if svr.Disabled { continue } - xFlds := []FolderConfig{} - if err := svr.HTTPGet("/folders", &xFlds); err != nil { + xFlds := []xsapiv1.FolderConfig{} + if err := svr.GetFolders(&xFlds); err != nil { errMsg += fmt.Sprintf("Cannot retrieve folders config of XDS server ID %s : %v \n", svr.ID, err.Error()) continue } - p.Log.Debugf("Server %s, %d projects detected", svr.ID[:8], len(xFlds)) + p.Log.Debugf("Connected to XDS Server %s, %d projects detected", svr.ID, len(xFlds)) for _, prj := range xFlds { newP := svr.FolderToProject(prj) - if /*nPrj*/ _, err := p.createUpdate(newP, false, true); err != nil { + if _, err := p.createUpdate(newP, false, true); err != nil { errMsg += "Error while creating project id " + prj.ID + ": " + err.Error() + "\n " continue } - - /* FIXME emit EVTProjectChange event ? - if err := p.events.Emit(EVTProjectChange, *nPrj); err != nil { - p.Log.Warningf("Cannot notify project change: %v", err) - } - */ } - } p.Log.Infof("Number of loaded Projects: %d", len(p.projects)) @@ -81,6 +69,27 @@ func (p *Projects) Init(server *XdsServer) error { return nil } +// ResolveID Complete a Project ID (helper for user that can use partial ID value) +func (p *Projects) ResolveID(id string) (string, error) { + if id == "" { + return "", nil + } + + match := []string{} + for iid := range p.projects { + 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 id") + } + return id, fmt.Errorf("Multiple IDs found with provided prefix: " + id) +} + // Get returns the folder config or nil if not existing func (p *Projects) Get(id string) *IPROJECT { if id == "" { @@ -94,7 +103,7 @@ func (p *Projects) Get(id string) *IPROJECT { } // GetProjectArr returns the config of all folders as an array -func (p *Projects) GetProjectArr() []ProjectConfig { +func (p *Projects) GetProjectArr() []xaapiv1.ProjectConfig { pjMutex.Lock() defer pjMutex.Unlock() @@ -102,8 +111,8 @@ func (p *Projects) GetProjectArr() []ProjectConfig { } // GetProjectArrUnsafe Same as GetProjectArr without mutex protection -func (p *Projects) GetProjectArrUnsafe() []ProjectConfig { - conf := []ProjectConfig{} +func (p *Projects) GetProjectArrUnsafe() []xaapiv1.ProjectConfig { + conf := []xaapiv1.ProjectConfig{} for _, v := range p.projects { prj := (*v).GetProject() conf = append(conf, *prj) @@ -112,14 +121,14 @@ func (p *Projects) GetProjectArrUnsafe() []ProjectConfig { } // Add adds a new folder -func (p *Projects) Add(newF ProjectConfig) (*ProjectConfig, error) { +func (p *Projects) Add(newF xaapiv1.ProjectConfig, fromSid string) (*xaapiv1.ProjectConfig, error) { prj, err := p.createUpdate(newF, true, false) if err != nil { return prj, err } // Notify client with event - if err := p.events.Emit(EVTProjectAdd, *prj); err != nil { + if err := p.events.Emit(xaapiv1.EVTProjectAdd, *prj, fromSid); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) } @@ -127,7 +136,7 @@ func (p *Projects) Add(newF ProjectConfig) (*ProjectConfig, error) { } // CreateUpdate creates or update a folder -func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) (*ProjectConfig, error) { +func (p *Projects) createUpdate(newF xaapiv1.ProjectConfig, create bool, initial bool) (*xaapiv1.ProjectConfig, error) { var err error pjMutex.Lock() @@ -159,32 +168,35 @@ func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) ( var fld IPROJECT switch newF.Type { // SYNCTHING - case TypeCloudSync: + case xaapiv1.TypeCloudSync: if p.SThg != nil { - /*SEB fld = f.SThg.NewFolderST(f.Conf)*/ fld = NewProjectST(p.Context, svr) } else { return nil, fmt.Errorf("Cloud Sync project not supported") } // PATH MAP - case TypePathMap: + case xaapiv1.TypePathMap: fld = NewProjectPathMap(p.Context, svr) default: return nil, fmt.Errorf("Unsupported folder type") } - var newPrj *ProjectConfig + var newPrj *xaapiv1.ProjectConfig if create { // Add project on server if newPrj, err = fld.Add(newF); err != nil { - newF.Status = StatusErrorConfig - log.Printf("ERROR Adding folder: %v\n", err) + newF.Status = xaapiv1.StatusErrorConfig + log.Printf("ERROR Adding project: %v\n", err) return newPrj, err } } else { // Just update project config - newPrj = fld.SetProject(newF) + if newPrj, err = fld.Setup(newF); err != nil { + newF.Status = xaapiv1.StatusErrorConfig + log.Printf("ERROR Updating project: %v\n", err) + return newPrj, err + } } // Sanity check @@ -207,16 +219,16 @@ func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) ( } // Delete deletes a specific folder -func (p *Projects) Delete(id string) (ProjectConfig, error) { +func (p *Projects) Delete(id, fromSid string) (xaapiv1.ProjectConfig, error) { var err error pjMutex.Lock() defer pjMutex.Unlock() - fld := ProjectConfig{} + fld := xaapiv1.ProjectConfig{} fc, exist := p.projects[id] if !exist { - return fld, fmt.Errorf("unknown id") + return fld, fmt.Errorf("Unknown id") } prj := (*fc).GetProject() @@ -228,7 +240,7 @@ func (p *Projects) Delete(id string) (ProjectConfig, error) { delete(p.projects, id) // Notify client with event - if err := p.events.Emit(EVTProjectDelete, *prj); err != nil { + if err := p.events.Emit(xaapiv1.EVTProjectDelete, *prj, fromSid); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) } @@ -252,3 +264,50 @@ func (p *Projects) IsProjectInSync(id string) (bool, error) { } return (*fc).IsInSync() } + +// Update Update some field of a project +func (p *Projects) Update(id string, prj xaapiv1.ProjectConfig, fromSid string) (*xaapiv1.ProjectConfig, error) { + + pjMutex.Lock() + defer pjMutex.Unlock() + + fc, exist := p.projects[id] + if !exist { + return nil, fmt.Errorf("Unknown id") + } + + // Copy current in a new object to change nothing in case of an error rises + newFld := xaapiv1.ProjectConfig{} + reflectme.Copy((*fc).GetProject(), &newFld) + + // Only update some fields + dirty := false + for _, fieldName := range xaapiv1.ProjectConfigUpdatableFields { + valNew, err := reflectme.GetField(prj, fieldName) + if err == nil { + valCur, err := reflectme.GetField(newFld, fieldName) + if err == nil && valNew != valCur { + err = reflectme.SetField(&newFld, fieldName, valNew) + if err != nil { + return nil, err + } + dirty = true + } + } + } + + if !dirty { + return &newFld, nil + } + + upPrj, err := (*fc).Update(newFld) + if err != nil { + return nil, err + } + + // Notify client with event + if err := p.events.Emit(xaapiv1.EVTProjectChange, *upPrj, fromSid); err != nil { + p.Log.Warningf("Cannot notify project change: %v", err) + } + return upPrj, err +}