X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-cli.git;a=blobdiff_plain;f=utils.go;h=dc5cb57a29563893751abf45d4453f07a2bbc0aa;hp=3d01346f57481a0e4089a44044250e21cbcb3587;hb=3b5e82b55433fd49cfe0cd0349756e0c2e9a9c12;hpb=f2b2c900fcc8f02a5e532794772ed5359618c3cc

diff --git a/utils.go b/utils.go
index 3d01346..dc5cb57 100644
--- a/utils.go
+++ b/utils.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,13 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+	"sort"
 	"strconv"
 	"strings"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 	"github.com/franciscocpg/reflectme"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
 	"github.com/urfave/cli"
 )
 
@@ -90,6 +92,13 @@ func XdsServerComputeURL(endURL string) string {
 	return "servers/" + strconv.Itoa(XdsServerIndexGet()) + endURL
 }
 
+// Sort projects by Label
+type _PrjByLabel []xaapiv1.ProjectConfig
+
+func (s _PrjByLabel) Len() int           { return len(s) }
+func (s _PrjByLabel) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s _PrjByLabel) Less(i, j int) bool { return s[i].Label < s[j].Label }
+
 // ProjectsListGet Get the list of existing projects
 func ProjectsListGet(prjs *[]xaapiv1.ProjectConfig) error {
 	var data []byte
@@ -98,7 +107,13 @@ func ProjectsListGet(prjs *[]xaapiv1.ProjectConfig) error {
 	}
 	Log.Debugf("Result of /projects: %v", string(data[:]))
 
-	return json.Unmarshal(data, &prjs)
+	if err := json.Unmarshal(data, &prjs); err != nil {
+		return err
+	}
+
+	sort.Sort(_PrjByLabel(*prjs))
+
+	return nil
 }
 
 // LogPost Helper to log a POST request
@@ -108,10 +123,27 @@ func LogPost(format string, data interface{}) {
 }
 
 // GetID Return a string ID set with --id option or as simple parameter
-func GetID(ctx *cli.Context) string {
-	id := ctx.String("id")
+func GetID(ctx *cli.Context, idEnvVarName string) string {
+	return GetIDName(ctx, "id", idEnvVarName)
+}
+
+// GetIDName Return a string ID set with --XXX option or as simple parameter
+func GetIDName(ctx *cli.Context, idName, idEnvVarName string) string {
+	if idName == "" {
+		return ""
+	}
+
+	// Get id set using option --id
+	id := ctx.String(idName)
+
+	// Check if id has been set using env variable
+	envSdkid, _ := os.LookupEnv(idEnvVarName)
+
+	// Support as 1st arg without --id option string (for example xds-cli sdk install 123456)
 	idArgs := ctx.Args().First()
-	if id == "" && idArgs != "" {
+
+	// Set or overwrite id using first arg (knowing that 1st is overwrite env variable)
+	if (id == "" && idArgs != "") || (envSdkid != "" && idArgs != "") {
 		id = idArgs
 	}
 	return id
@@ -125,3 +157,8 @@ func Confirm(question string) bool {
 	ans := strings.ToLower(strings.TrimSpace(answer))
 	return (ans == "y" || ans == "yes")
 }
+
+// compareID Compare an ID to a reference ID
+func compareID(refID, ID string) bool {
+	return refID != "" && ID != "" && strings.HasPrefix(refID, ID)
+}