X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1-folders.go;h=8d96634ebf661168819581ee40f2462b3e7af8df;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=fe11e52a7aea801e3677290ef3f0f34c84b5afd2;hpb=2f7828d01f4c4ca2909f95f098627cd5475ed225;p=src%2Fxds%2Fxds-server.git diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go index fe11e52..8d96634 100644 --- a/lib/xdsserver/apiv1-folders.go +++ b/lib/xdsserver/apiv1-folders.go @@ -1,12 +1,28 @@ +/* + * 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 xdsserver import ( "net/http" - "os" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getFolders returns all folders configuration @@ -46,27 +62,6 @@ func (s *APIService) addFolder(c *gin.Context) { 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) }