Make id option overwrite XDS_xxx_ID env var

The behavior must be the same when XDS_SDK_ID is defined and user
set -id option or simply give an id without setting "--id" string
option.
IOW all following commands must give the exact same result  (get info
of sdk 9d69):
./bin/xds-cli sdks get -id 9d69
./bin/xds-cli sdks get 9d69
XDS_SDK_ID=9d69 ./bin/xds-cli sdks get
XDS_SDK_ID=1234 ./bin/xds-cli sdks get -id 9d69
XDS_SDK_ID=12345 ./bin/xds-cli sdks get 9d69

Change-Id: Idbd3f052df8172d56de98f827743b43d70d37393
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 3 insertions, 3 deletions

diff --git a/cmd-target.go b/cmd-target.go
index 33b757d..6140755 100644
--- a/cmd-target.go
+++ b/cmd-target.go
@@ -165,7 +165,7 @@ func targetsList(ctx *cli.Context) error {
 }
 
 func targetsGet(ctx *cli.Context) error {
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_TARGET_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -254,7 +254,7 @@ func targetsAdd(ctx *cli.Context) error {
 
 func targetsRemove(ctx *cli.Context) error {
 	var res xaapiv1.TargetConfig
-	id := GetID(ctx)
+	id := GetID(ctx, "XDS_TARGET_ID")
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
@@ -543,7 +543,7 @@ func GetTargetAndTerminalIDs(ctx *cli.Context, useFirstFree bool) (*xaapiv1.Targ
 	}
 
 	// Allow to create a new terminal when only target id is set
-	idArg = GetIDName(ctx, "id")
+	idArg = GetIDName(ctx, "id", "XDS_TARGET_ID")
 	if idArg == "" {
 		return nil, nil, fmt.Errorf("id or termId argument must be set")
 	}