Fixed default xds-agent port number and env var (XDS_AGENT_URL)

[src/xds/xds-server.git] / lib / xdsserver / apiv1-folders.go

diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go
index fe11e52..009d2ce 100644 (file)
--- a/lib/xdsserver/apiv1-folders.go
+++ b/lib/xdsserver/apiv1-folders.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "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 xdsserver
 
 import (
@@ -57,11 +74,13 @@ func (s *APIService) addFolder(c *gin.Context) {
                        return
                }
                fd.WriteString("# XDS project settings\n")
-               fd.WriteString("export XDS_SERVER_URL=" + c.Request.Host + "\n")
+               fd.WriteString("export XDS_AGENT_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
+                       if len(sdks) > 0 {
+                               newFld.DefaultSdk = sdks[0].ID
+                       }
                }
                fd.WriteString("export XDS_SDK_ID=" + newFld.DefaultSdk + "\n")
                fd.Close()