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
Added target and terminal support
[src/xds/xds-cli.git]
/
utils.go
diff --git
a/utils.go
b/utils.go
index
afa0942
..
0ca6471
100644
(file)
--- a/
utils.go
+++ b/
utils.go
@@
-123,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 {
// 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
idArgs := ctx.Args().First()
if id == "" && idArgs != "" {
id = idArgs
@@
-139,3
+147,8
@@
func Confirm(question string) bool {
ans := strings.ToLower(strings.TrimSpace(answer))
return (ans == "y" || ans == "yes")
}
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.Contains(refID, ID)
+}