Code Review
/
src
/
xds
/
xds-cli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add gitreview file for Kooky Koi branch
[src/xds/xds-cli.git]
/
cmd-sdks.go
diff --git
a/cmd-sdks.go
b/cmd-sdks.go
index
3fc596f
..
0005215
100644
(file)
--- a/
cmd-sdks.go
+++ b/
cmd-sdks.go
@@
-142,7
+142,7
@@
func sdksList(ctx *cli.Context) error {
}
func sdksGet(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)
}
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
@@
-187,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, "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 {
} else {
if first {
@@
-226,7
+227,7
@@
func _sdksListGet(sdks *[]xaapiv1.SDK) error {
}
func sdksInstall(ctx *cli.Context) error {
}
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")
file := ctx.String("file")
force := ctx.Bool("force")
shortOut := ctx.Bool("short")
@@
-242,7
+243,7
@@
func sdksInstall(ctx *cli.Context) error {
}
exitChan := make(chan exitResult, 1)
}
exitChan := make(chan exitResult, 1)
- IO
sk
.On("disconnection", func(err error) {
+ IO
SkClient
.On("disconnection", func(err error) {
Log.Debugf("WS disconnection event with err: %v\n", err)
errMsg := ""
if err != nil {
Log.Debugf("WS disconnection event with err: %v\n", err)
errMsg := ""
if err != nil {
@@
-251,7
+252,7
@@
func sdksInstall(ctx *cli.Context) error {
exitChan <- exitResult{errMsg, 2}
})
exitChan <- exitResult{errMsg, 2}
})
- IO
sk
.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
+ IO
SkClient
.On(xaapiv1.EVTSDKManagement, func(ev xaapiv1.EventMsg) {
sdkEvt, _ := ev.DecodeSDKMgtMsg()
if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
sdkEvt, _ := ev.DecodeSDKMgtMsg()
if sdkEvt.Action != xaapiv1.SdkMgtActionInstall {
@@
-259,11
+260,11
@@
func sdksInstall(ctx *cli.Context) error {
return
}
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 {
}
if sdkEvt.Exited {
@@
-271,7
+272,7
@@
func sdksInstall(ctx *cli.Context) error {
}
})
}
})
- IO
sk
.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
+ IO
SkClient
.On(xaapiv1.EVTSDKStateChange, func(ev xaapiv1.EventMsg) {
sdk, _ := ev.DecodeSDKEvent()
Log.Debugf("EVTSDKStateChange: %v", sdk)
})
sdk, _ := ev.DecodeSDKEvent()
Log.Debugf("EVTSDKStateChange: %v", sdk)
})
@@
-305,6
+306,10
@@
func sdksInstall(ctx *cli.Context) error {
// Wait exit
select {
// 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")
case res := <-exitChan:
if res.code == 0 {
Log.Debugln("Exit successfully")
@@
-322,7
+327,7
@@
func sdksInstall(ctx *cli.Context) error {
}
func sdksUnInstall(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)
}
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
@@
-346,7
+351,7
@@
func sdksUnInstall(ctx *cli.Context) error {
}
func sdksAbort(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)
}
if id == "" {
return cli.NewExitError("id parameter or option must be set", 1)
}
@@
-361,3
+366,10
@@
func sdksAbort(ctx *cli.Context) error {
Log.Debugf("Result of %s: %v", url, newSdk)
return nil
}
Log.Debugf("Result of %s: %v", url, newSdk)
return nil
}
+
+func formatURL(u string) string {
+ if u == "" {
+ return "-"
+ }
+ return u
+}