Update .gitreview file

[src/xds/xds-cli.git] / cmd-sdks.go

diff --git a/cmd-sdks.go b/cmd-sdks.go
index bc9df15..0005215 100644 (file)
--- a/cmd-sdks.go
+++ b/cmd-sdks.go
@@ -22,6 +22,7 @@ import (
        "fmt"
        "os"
        "regexp"
+       "sort"
 
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "github.com/urfave/cli"
@@ -141,7 +142,7 @@ func sdksList(ctx *cli.Context) error {
 }
 
 func sdksGet(ctx *cli.Context) error {
-       id := GetID(ctx)
+       id := GetID(ctx, "XDS_SDK_ID")
        if id == "" {
                return cli.NewExitError("id parameter or option must be set", 1)
        }
@@ -186,7 +187,8 @@ func _displaySdks(sdks []xaapiv1.SDK, verbose bool, all bool, filter string) {
                        fmt.Fprintln(writer, "Version\t"+s.Version)
                        fmt.Fprintln(writer, "Status\t"+s.Status)
                        fmt.Fprintln(writer, "Path\t"+s.Path)
-                       fmt.Fprintln(writer, "Url\t"+s.URL)
+                       fmt.Fprintln(writer, "Url\t"+formatURL(s.URL))
+                       fmt.Fprintln(writer, "Image Url\t"+formatURL(s.ImageURL))
 
                } else {
                        if first {
@@ -204,6 +206,14 @@ func _displaySdks(sdks []xaapiv1.SDK, verbose bool, all bool, filter string) {
        writer.Flush()
 }
 
+// Sort SDKs by ID
+type _SdkByID []xaapiv1.SDK
+
+func (s _SdkByID) Len() int           { return len(s) }
+func (s _SdkByID) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+func (s _SdkByID) Less(i, j int) bool { return s[i].ID < s[j].ID }
+
+// _sdksListGet Get the list of existing sdks
 func _sdksListGet(sdks *[]xaapiv1.SDK) error {
        url := XdsServerComputeURL("/sdks")
        if err := HTTPCli.Get(url, &sdks); err != nil {
@@ -211,11 +221,13 @@ func _sdksListGet(sdks *[]xaapiv1.SDK) error {
        }
        Log.Debugf("Result of %s: %v", url, sdks)
 
+       sort.Sort(_SdkByID(*sdks))
+
        return nil
 }
 
 func sdksInstall(ctx *cli.Context) error {
-       id := GetID(ctx)
+       id := GetID(ctx, "XDS_SDK_ID")
        file := ctx.String("file")
        force := ctx.Bool("force")
        shortOut := ctx.Bool("short")
@@ -231,7 +243,7 @@ func sdksInstall(ctx *cli.Context) error {
        }
        exitChan := make(chan exitResult, 1)
 
-       IOsk.On("disconnection", func(err error) {
+       IOSkClient.On("disconnection", func(err error) {
                Log.Debugf("WS disconnection event with err: %v\n", err)
                errMsg := ""
                if err != nil {
@@ -240,7 +252,7 @@ func sdksInstall(ctx *cli.Context) error {
                exitChan <- exitResult{errMsg, 2}
        })
 
-       IOsk.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
+       IOSkClient.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
                sdkEvt, _ := ev.DecodeSDKMgtMsg()
 
                if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
@@ -248,11 +260,11 @@ func sdksInstall(ctx *cli.Context) error {
                        return
                }
 
-               if !shortOut && sdkEvt.Stdout != "" {
-                       fmt.Printf("%s", sdkEvt.Stdout)
+               if !shortOut && len(sdkEvt.Stdout) > 0 {
+                       os.Stdout.Write([]byte(sdkEvt.Stdout))
                }
-               if !shortOut && sdkEvt.Stderr != "" {
-                       fmt.Fprintf(os.Stderr, "%s", sdkEvt.Stderr)
+               if !shortOut && len(sdkEvt.Stderr) > 0 {
+                       os.Stderr.Write([]byte(sdkEvt.Stderr))
                }
 
                if sdkEvt.Exited {
@@ -260,7 +272,7 @@ func sdksInstall(ctx *cli.Context) error {
                }
        })
 
-       IOsk.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+       IOSkClient.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
                sdk, _ := ev.DecodeSDKEvent()
                Log.Debugf("EVTSDKStateChange: %v", sdk)
        })
@@ -294,6 +306,10 @@ func sdksInstall(ctx *cli.Context) error {
 
        // Wait exit
        select {
+       case res := <-IOSkClient.ServerDiscoChan:
+               Log.Debugf("XDS Server disconnected %v", res)
+               return cli.NewExitError(res.error, res.code)
+
        case res := <-exitChan:
                if res.code == 0 {
                        Log.Debugln("Exit successfully")
@@ -311,7 +327,7 @@ func sdksInstall(ctx *cli.Context) error {
 }
 
 func sdksUnInstall(ctx *cli.Context) error {
-       id := GetID(ctx)
+       id := GetID(ctx, "XDS_SDK_ID")
        if id == "" {
                return cli.NewExitError("id parameter or option must be set", 1)
        }
@@ -335,7 +351,7 @@ func sdksUnInstall(ctx *cli.Context) error {
 }
 
 func sdksAbort(ctx *cli.Context) error {
-       id := GetID(ctx)
+       id := GetID(ctx, "XDS_SDK_ID")
        if id == "" {
                return cli.NewExitError("id parameter or option must be set", 1)
        }
@@ -350,3 +366,10 @@ func sdksAbort(ctx *cli.Context) error {
        Log.Debugf("Result of %s: %v", url, newSdk)
        return nil
 }
+
+func formatURL(u string) string {
+       if u == "" {
+               return "-"
+       }
+       return u
+}