From 9a0c120497cfe3cfdca6dfd084e999b6ab915ce8 Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Mon, 4 Dec 2017 12:08:46 +0100
Subject: Update connection env vars XDS_AGENT_URL / XDS_SERVER_URL.

XDS_AGENT_URL env var must be used to setup connection with XDS agent running locally on developer host.

XDS_SERVER_URL env var may be set to overwrite default connection settings with XDS server.
---
 main.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index 81b9154..4cc05e6 100644
--- a/main.go
+++ b/main.go
@@ -90,7 +90,8 @@ func exitError(code syscall.Errno, f string, a ...interface{}) {
 
 // main
 func main() {
-	var uri, prjID, rPath, logLevel, logFile, sdkid, confFile, gdbNative string
+	var agentURL, serverURL string
+	var prjID, rPath, logLevel, logFile, sdkid, confFile, gdbNative string
 	var listProject bool
 	var err error
 
@@ -106,7 +107,7 @@ func main() {
 	log.Out = fdL
 	log.Level = logrus.DebugLevel
 
-	uri = "localhost:8000"
+	agentURL = "localhost:8000"
 	logLevel = defaultLogLevel
 
 	// Create a new App instance
@@ -165,10 +166,15 @@ func main() {
 			Usage:       "Cross Sdk ID to use to build project",
 			Destination: &sdkid,
 		},
+		EnvVar{
+			Name:        "XDS_AGENT_URL",
+			Usage:       "local XDS agent url",
+			Destination: &agentURL,
+		},
 		EnvVar{
 			Name:        "XDS_SERVER_URL",
-			Usage:       "remote XDS server url",
-			Destination: &uri,
+			Usage:       "overwrite remote XDS server url (default value set in xds-agent-config.json file)",
+			Destination: &serverURL,
 		},
 	}
 
@@ -295,7 +301,8 @@ endloop:
 			gdb = NewGdbNative(log, gdbArgs, env)
 		} else {
 			gdb = NewGdbXds(log, gdbArgs, env)
-			gdb.SetConfig("uri", uri)
+			gdb.SetConfig("agentURL", agentURL)
+			gdb.SetConfig("serverURL", serverURL)
 			gdb.SetConfig("prjID", prjID)
 			gdb.SetConfig("sdkID", sdkid)
 			gdb.SetConfig("rPath", rPath)
@@ -574,9 +581,9 @@ func loadConfigEnvFile(confFile, gdbCmdFile string) (map[string]string, string,
   All commented lines (#) in gdb command file that start with ':XDS-ENV:' prefix
   will be considered as XDS env commands. For example the 3 syntaxes below
   are supported:
-  # :XDS-ENV: XDS_PROJECT_ID=IW7B4EE-DBY4Z74_myProject
-  #:XDS-ENV:XDS_SDK_ID=poky-agl_aarch64_3.99.1+snapshot
-  # :XDS-ENV:  export XDS_SERVER_URL=localhost:8800
+  # :XDS-ENV: XDS_PROJECT_ID=4021617e-ced0-11e7-acd2-3c970e49ad9b
+  #:XDS-ENV:XDS_SDK_ID=06c0e95a-e215-3a5a-b373-f677c0dabd3b
+  # :XDS-ENV:  export XDS_AGENT_URL=localhost:8800
 */
 func extractEnvFromCmdFile(cmdFile string) (string, error) {
 	if !common.Exists(cmdFile) {
-- 
cgit 1.2.3-korg