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, 48 insertions, 51 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ec95b48..2dfc5d6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,53 +1,50 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-	// Specify GOPATH here to override the one that is set as environment variable. The inferred GOPATH from workspace root overrides this, if go.inferGopath is set to true.
-	"go.gopath": "${workspaceRoot}/../../../../../..",
-
-	// The number of spaces a tab is equal to. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
-	"editor.tabSize": 4,
-	// Insert spaces when pressing Tab. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
-	"editor.insertSpaces": true,
-
-	// When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.
-	"editor.detectIndentation": true,
-
-	// Configure glob patterns for excluding files and folders.
-	"files.exclude": {
-		"**/.tmp": true,
-		".git": true,
-		"glide.lock": true,
-		"vendor": true,
-		"debug": true,
-		"bin": true,
-		"tools": true
-	},
-	// Words to add to dictionary for a workspace.
-	"cSpell.words": [
-		"apiv",
-		"iosk",
-		"zhouhui",
-		"ldflags",
-		"socketio",
-		"xdsconfig",
-		"sdkid",
-		"godotenv",
-		"crosssdk",
-		"prjs",
-		"xaapiv",
-		"urfave",
-		"sebd",
-		"golib",
-		"joho",
-		"XDSAGENT",
-		"reflectme",
-		"franciscocpg",
-		"gerrit",
-		"EVTSDK",
-		"tgts",
-		"sigs",
-		"rdfs",
-		"goselect",
-		"creack",
-		"Sillyf"
-	]
-}
+  // Specify GOPATH here to override the one that is set as environment variable. The inferred GOPATH from workspace root overrides this, if go.inferGopath is set to true.
+  "go.gopath": "${workspaceRoot}/../../../../../..",
+  // The number of spaces a tab is equal to. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
+  "editor.tabSize": 4,
+  // Insert spaces when pressing Tab. This setting is overriden based on the file contents when `editor.detectIndentation` is on.
+  "editor.insertSpaces": true,
+  // When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.
+  "editor.detectIndentation": true,
+  // Configure glob patterns for excluding files and folders.
+  "files.exclude": {
+    "**/.tmp": true,
+    ".git": true,
+    "glide.lock": true,
+    "vendor": true,
+    "debug": true,
+    "bin": true,
+    "tools": true
+  },
+  // Words to add to dictionary for a workspace.
+  "cSpell.words": [
+    "apiv",
+    "iosk",
+    "zhouhui",
+    "ldflags",
+    "socketio",
+    "xdsconfig",
+    "sdkid",
+    "godotenv",
+    "crosssdk",
+    "prjs",
+    "xaapiv",
+    "urfave",
+    "sebd",
+    "golib",
+    "joho",
+    "XDSAGENT",
+    "reflectme",
+    "franciscocpg",
+    "gerrit",
+    "EVTSDK",
+    "tgts",
+    "sigs",
+    "rdfs",
+    "goselect",
+    "creack",
+    "Sillyf"
+  ]
+}
\ No newline at end of file