Only update Server URL when it's necessary.

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

diff --git a/cmd-sdks.go b/cmd-sdks.go
index 8568b3a..e6ae1cf 100644 (file)
--- a/cmd-sdks.go
+++ b/cmd-sdks.go
@@ -1,10 +1,28 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package main
 
 import (
        "fmt"
        "strconv"
 
-       "github.com/iotbzh/xds-agent/lib/apiv1"
+       "github.com/iotbzh/xds-agent/lib/xaapiv1"
        "github.com/urfave/cli"
 )
 
@@ -27,8 +45,9 @@ func initCmdSdks(cmdDef *[]cli.Command) {
                                Action: sdksGet,
                                Flags: []cli.Flag{
                                        cli.StringFlag{
-                                               Name:  "id",
-                                               Usage: "sdk id",
+                                               Name:   "id",
+                                               Usage:  "sdk id",
+                                               EnvVar: "XDS_SDK_ID",
                                        },
                                },
                        },
@@ -51,8 +70,9 @@ func initCmdSdks(cmdDef *[]cli.Command) {
                                Action:  sdksRemove,
                                Flags: []cli.Flag{
                                        cli.StringFlag{
-                                               Name:  "id",
-                                               Usage: "sdk id",
+                                               Name:   "id",
+                                               Usage:  "sdk id",
+                                               EnvVar: "XDS_SDK_ID",
                                        },
                                },
                        },
@@ -62,7 +82,7 @@ func initCmdSdks(cmdDef *[]cli.Command) {
 
 func sdksList(ctx *cli.Context) error {
        // Get SDKs list
-       sdks := []apiv1.SDK{}
+       sdks := []xaapiv1.SDK{}
        if err := sdksListGet(&sdks); err != nil {
                return cli.NewExitError(err.Error(), 1)
        }
@@ -75,16 +95,16 @@ func sdksGet(ctx *cli.Context) error {
        if id == "" {
                return cli.NewExitError("id parameter or option must be set", 1)
        }
-       sdks := apiv1.SDK{}
-       url := "server/" + strconv.Itoa(XdsServerIndexGet()) + "/sdks/" + id
+       sdks := xaapiv1.SDK{}
+       url := "servers/" + strconv.Itoa(XdsServerIndexGet()) + "/sdks/" + id
        if err := HTTPCli.Get(url, &sdks); err != nil {
                return cli.NewExitError(err.Error(), 1)
        }
-       _displaySdks([]apiv1.SDK{sdks}, true)
+       _displaySdks([]xaapiv1.SDK{sdks}, true)
        return nil
 }
 
-func _displaySdks(sdks []apiv1.SDK, verbose bool) {
+func _displaySdks(sdks []xaapiv1.SDK, verbose bool) {
        // Display result
        first := true
        writer := NewTableWriter()
@@ -112,8 +132,8 @@ func _displaySdks(sdks []apiv1.SDK, verbose bool) {
        writer.Flush()
 }
 
-func sdksListGet(sdks *[]apiv1.SDK) error {
-       url := "server/" + strconv.Itoa(XdsServerIndexGet()) + "/sdks"
+func sdksListGet(sdks *[]xaapiv1.SDK) error {
+       url := "servers/" + strconv.Itoa(XdsServerIndexGet()) + "/sdks"
        if err := HTTPCli.Get(url, &sdks); err != nil {
                return err
        }