Fixed meta tags in path to avoid conflict with spec syntax

[src/xds/xds-cli.git] / utils.go

diff --git a/utils.go b/utils.go
index b47cd04..393ee2a 100644 (file)
--- a/utils.go
+++ b/utils.go
@@ -21,6 +21,7 @@ package main
 import (
        "encoding/json"
        "fmt"
+       "sort"
        "strconv"
        "strings"
 
@@ -90,6 +91,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 +106,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
@@ -109,7 +123,15 @@ 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")
+       return GetIDName(ctx, "id")
+}
+
+// GetIDName Return a string ID set with --XXX option or as simple parameter
+func GetIDName(ctx *cli.Context, idName string) string {
+       if idName == "" {
+               return ""
+       }
+       id := ctx.String(idName)
        idArgs := ctx.Args().First()
        if id == "" && idArgs != "" {
                id = idArgs
@@ -125,3 +147,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)
+}