X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=0bd5315261bf57c842c74552cd9ac85b48decb51;hb=4695ce02620407a5074125eaa5b257dd0e73758a;hp=f089882f2f65fa0018971fdd4cd6e310366278ef;hpb=a58e296c780f3f9f3a8f71a27cef0d202b13674b;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/projects.go b/lib/agent/projects.go index f089882..0bd5315 100644 --- a/lib/agent/projects.go +++ b/lib/agent/projects.go @@ -1,13 +1,36 @@ +/* + * Copyright (C) 2017-2018 "IoT.bzh" + * Author Sebastien Douheret + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package agent import ( "fmt" "log" + "os" + "path/filepath" "strings" "time" - "github.com/iotbzh/xds-agent/lib/apiv1" - "github.com/iotbzh/xds-agent/lib/syncthing" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" + + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "github.com/franciscocpg/reflectme" "github.com/syncthing/syncthing/lib/sync" ) @@ -32,6 +55,7 @@ func NewProjects(ctx *Context, st *st.SyncThing) *Projects { // Init Load Projects configuration func (p *Projects) Init(server *XdsServer) error { + svrList := make(map[string]*XdsServer) // If server not set, load for all servers if server == nil { @@ -44,7 +68,7 @@ func (p *Projects) Init(server *XdsServer) error { if svr.Disabled { continue } - xFlds := []XdsFolderConfig{} + 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 @@ -53,6 +77,11 @@ func (p *Projects) Init(server *XdsServer) error { for _, prj := range xFlds { newP := svr.FolderToProject(prj) if _, err := p.createUpdate(newP, false, true); err != nil { + // Don't consider that as an error (allow support config without CloudSync support) + if p.Context.SThg == nil && strings.Contains(err.Error(), "Server doesn't support project type CloudSync") { + continue + } + errMsg += "Error while creating project id " + prj.ID + ": " + err.Error() + "\n " continue } @@ -101,7 +130,7 @@ func (p *Projects) Get(id string) *IPROJECT { } // GetProjectArr returns the config of all folders as an array -func (p *Projects) GetProjectArr() []apiv1.ProjectConfig { +func (p *Projects) GetProjectArr() []xaapiv1.ProjectConfig { pjMutex.Lock() defer pjMutex.Unlock() @@ -109,8 +138,8 @@ func (p *Projects) GetProjectArr() []apiv1.ProjectConfig { } // GetProjectArrUnsafe Same as GetProjectArr without mutex protection -func (p *Projects) GetProjectArrUnsafe() []apiv1.ProjectConfig { - conf := []apiv1.ProjectConfig{} +func (p *Projects) GetProjectArrUnsafe() []xaapiv1.ProjectConfig { + conf := []xaapiv1.ProjectConfig{} for _, v := range p.projects { prj := (*v).GetProject() conf = append(conf, *prj) @@ -119,14 +148,32 @@ func (p *Projects) GetProjectArrUnsafe() []apiv1.ProjectConfig { } // Add adds a new folder -func (p *Projects) Add(newF apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) { - prj, err := p.createUpdate(newF, true, false) +func (p *Projects) Add(newP xaapiv1.ProjectConfig, fromSid, requestURL string) (*xaapiv1.ProjectConfig, error) { + prj, err := p.createUpdate(newP, true, false) if err != nil { return prj, err } + // Create xds-project.conf file + prjConfFile := filepath.Join(prj.ClientPath, "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 { + return prj, fmt.Errorf("Cannot create xds-project.conf: %v", err.Error()) + } + fd.WriteString("# XDS project settings\n") + fd.WriteString("export XDS_AGENT_URL=" + requestURL + "\n") + fd.WriteString("export XDS_PROJECT_ID=" + prj.ID + "\n") + if prj.DefaultSdk != "" { + fd.WriteString("export XDS_SDK_ID=" + prj.DefaultSdk + "\n") + } else { + fd.WriteString("#export XDS_SDK_ID=???\n") + } + fd.Close() + } + // Notify client with event - if err := p.events.Emit(apiv1.EVTProjectAdd, *prj); err != nil { + if err := p.events.Emit(xaapiv1.EVTProjectAdd, *prj, fromSid); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) } @@ -134,7 +181,7 @@ func (p *Projects) Add(newF apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) { } // CreateUpdate creates or update a folder -func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial bool) (*apiv1.ProjectConfig, error) { +func (p *Projects) createUpdate(newF xaapiv1.ProjectConfig, create bool, initial bool) (*xaapiv1.ProjectConfig, error) { var err error pjMutex.Lock() @@ -166,7 +213,7 @@ func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial b var fld IPROJECT switch newF.Type { // SYNCTHING - case apiv1.TypeCloudSync: + case xaapiv1.TypeCloudSync: if p.SThg != nil { fld = NewProjectST(p.Context, svr) } else { @@ -174,24 +221,24 @@ func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial b } // PATH MAP - case apiv1.TypePathMap: + case xaapiv1.TypePathMap: fld = NewProjectPathMap(p.Context, svr) default: return nil, fmt.Errorf("Unsupported folder type") } - var newPrj *apiv1.ProjectConfig + var newPrj *xaapiv1.ProjectConfig if create { // Add project on server if newPrj, err = fld.Add(newF); err != nil { - newF.Status = apiv1.StatusErrorConfig + newF.Status = xaapiv1.StatusErrorConfig log.Printf("ERROR Adding project: %v\n", err) return newPrj, err } } else { // Just update project config - if newPrj, err = fld.UpdateProject(newF); err != nil { - newF.Status = apiv1.StatusErrorConfig + if newPrj, err = fld.Setup(newF); err != nil { + newF.Status = xaapiv1.StatusErrorConfig log.Printf("ERROR Updating project: %v\n", err) return newPrj, err } @@ -206,7 +253,7 @@ func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial b // Add to folders list p.projects[newPrj.ID] = &fld - // Force sync after creation + // Force sync to get an initial sync status // (need to defer to be sure that WS events will arrive after HTTP creation reply) go func() { time.Sleep(time.Millisecond * 500) @@ -217,13 +264,13 @@ func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial b } // Delete deletes a specific folder -func (p *Projects) Delete(id string) (apiv1.ProjectConfig, error) { +func (p *Projects) Delete(id, fromSid string) (xaapiv1.ProjectConfig, error) { var err error pjMutex.Lock() defer pjMutex.Unlock() - fld := apiv1.ProjectConfig{} + fld := xaapiv1.ProjectConfig{} fc, exist := p.projects[id] if !exist { return fld, fmt.Errorf("Unknown id") @@ -238,7 +285,7 @@ func (p *Projects) Delete(id string) (apiv1.ProjectConfig, error) { delete(p.projects, id) // Notify client with event - if err := p.events.Emit(apiv1.EVTProjectDelete, *prj); err != nil { + if err := p.events.Emit(xaapiv1.EVTProjectDelete, *prj, fromSid); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) } @@ -262,3 +309,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 +}