X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-agent.git;a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=d316c20220eaf8aadba53e46c44c9dafac8e170a;hp=966c231b6cf431916081a1cb073d7469e0c3025b;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hpb=4d843d2bde236ec23810d0904dfb8aebbc53a37b

diff --git a/lib/agent/projects.go b/lib/agent/projects.go
index 966c231..d316c20 100644
--- a/lib/agent/projects.go
+++ b/lib/agent/projects.go
@@ -1,14 +1,36 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * 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"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
 	"github.com/franciscocpg/reflectme"
-	"github.com/iotbzh/xds-agent/lib/apiv1"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
 	"github.com/syncthing/syncthing/lib/sync"
 )
 
@@ -33,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 {
@@ -45,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
@@ -54,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
 			}
@@ -102,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()
 
@@ -110,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)
@@ -120,14 +148,32 @@ func (p *Projects) GetProjectArrUnsafe() []apiv1.ProjectConfig {
 }
 
 // Add adds a new folder
-func (p *Projects) Add(newF apiv1.ProjectConfig, fromSid string) (*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, fromSid); err != nil {
+	if err := p.events.Emit(xaapiv1.EVTProjectAdd, *prj, fromSid); err != nil {
 		p.Log.Warningf("Cannot notify project deletion: %v", err)
 	}
 
@@ -135,7 +181,7 @@ func (p *Projects) Add(newF apiv1.ProjectConfig, fromSid string) (*apiv1.Project
 }
 
 // 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()
@@ -167,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 {
@@ -175,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.Setup(newF); err != nil {
-			newF.Status = apiv1.StatusErrorConfig
+			newF.Status = xaapiv1.StatusErrorConfig
 			log.Printf("ERROR Updating project: %v\n", err)
 			return newPrj, err
 		}
@@ -207,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)
@@ -218,13 +264,13 @@ func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial b
 }
 
 // Delete deletes a specific folder
-func (p *Projects) Delete(id, fromSid 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")
@@ -239,7 +285,7 @@ func (p *Projects) Delete(id, fromSid string) (apiv1.ProjectConfig, error) {
 	delete(p.projects, id)
 
 	// Notify client with event
-	if err := p.events.Emit(apiv1.EVTProjectDelete, *prj, fromSid); err != nil {
+	if err := p.events.Emit(xaapiv1.EVTProjectDelete, *prj, fromSid); err != nil {
 		p.Log.Warningf("Cannot notify project deletion: %v", err)
 	}
 
@@ -265,7 +311,7 @@ func (p *Projects) IsProjectInSync(id string) (bool, error) {
 }
 
 // Update Update some field of a project
-func (p *Projects) Update(id string, prj apiv1.ProjectConfig, fromSid string) (*apiv1.ProjectConfig, error) {
+func (p *Projects) Update(id string, prj xaapiv1.ProjectConfig, fromSid string) (*xaapiv1.ProjectConfig, error) {
 
 	pjMutex.Lock()
 	defer pjMutex.Unlock()
@@ -276,12 +322,12 @@ func (p *Projects) Update(id string, prj apiv1.ProjectConfig, fromSid string) (*
 	}
 
 	// Copy current in a new object to change nothing in case of an error rises
-	newFld := apiv1.ProjectConfig{}
+	newFld := xaapiv1.ProjectConfig{}
 	reflectme.Copy((*fc).GetProject(), &newFld)
 
 	// Only update some fields
 	dirty := false
-	for _, fieldName := range apiv1.ProjectConfigUpdatableFields {
+	for _, fieldName := range xaapiv1.ProjectConfigUpdatableFields {
 		valNew, err := reflectme.GetField(prj, fieldName)
 		if err == nil {
 			valCur, err := reflectme.GetField(newFld, fieldName)
@@ -305,7 +351,7 @@ func (p *Projects) Update(id string, prj apiv1.ProjectConfig, fromSid string) (*
 	}
 
 	// Notify client with event
-	if err := p.events.Emit(apiv1.EVTProjectChange, *upPrj, fromSid); err != nil {
+	if err := p.events.Emit(xaapiv1.EVTProjectChange, *upPrj, fromSid); err != nil {
 		p.Log.Warningf("Cannot notify project change: %v", err)
 	}
 	return upPrj, err