X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmd-projects.go;h=fc4bc2272e3561c96221477aeadc4815b82d0afe;hb=75fbc67b5acf3258b604fc53ec096f46fc743270;hp=23e75c5b55a6c0641ccfabeaba8d7a3a0b3a4b2f;hpb=b6049d0b616812bc72d0549d88cc59f21d517b7c;p=src%2Fxds%2Fxds-cli.git

diff --git a/cmd-projects.go b/cmd-projects.go
index 23e75c5..fc4bc22 100644
--- a/cmd-projects.go
+++ b/cmd-projects.go
@@ -1,10 +1,28 @@
+/*
+ * Copyright (C) 2017-2018 "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"
 	"strings"
 
-	"github.com/iotbzh/xds-agent/lib/apiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 	"github.com/urfave/cli"
 )
 
@@ -45,8 +63,9 @@ func initCmdProjects(cmdDef *[]cli.Command) {
 				Action: projectsGet,
 				Flags: []cli.Flag{
 					cli.StringFlag{
-						Name:  "id",
-						Usage: "project id",
+						Name:   "id",
+						Usage:  "project id",
+						EnvVar: "XDS_PROJECT_ID",
 					},
 				},
 			},
@@ -69,8 +88,13 @@ func initCmdProjects(cmdDef *[]cli.Command) {
 				Action:  projectsRemove,
 				Flags: []cli.Flag{
 					cli.StringFlag{
-						Name:  "id",
-						Usage: "project id",
+						Name:   "id",
+						Usage:  "project id",
+						EnvVar: "XDS_PROJECT_ID",
+					},
+					cli.BoolFlag{
+						Name:  "force, f",
+						Usage: "remove confirmation prompt before removal",
 					},
 				},
 			},
@@ -81,8 +105,9 @@ func initCmdProjects(cmdDef *[]cli.Command) {
 				Action:  projectsSync,
 				Flags: []cli.Flag{
 					cli.StringFlag{
-						Name:  "id",
-						Usage: "project id",
+						Name:   "id",
+						Usage:  "project id",
+						EnvVar: "XDS_PROJECT_ID",
 					},
 				},
 			},
@@ -92,7 +117,7 @@ func initCmdProjects(cmdDef *[]cli.Command) {
 
 func projectsList(ctx *cli.Context) error {
 	// Get projects list
-	prjs := []apiv1.ProjectConfig{}
+	prjs := []xaapiv1.ProjectConfig{}
 	if err := ProjectsListGet(&prjs); err != nil {
 		return cli.NewExitError(err.Error(), 1)
 	}
@@ -105,7 +130,7 @@ func projectsGet(ctx *cli.Context) error {
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
-	prjs := make([]apiv1.ProjectConfig, 1)
+	prjs := make([]xaapiv1.ProjectConfig, 1)
 	if err := HTTPCli.Get("/projects/"+id, &prjs[0]); err != nil {
 		return cli.NewExitError(err, 1)
 	}
@@ -113,7 +138,7 @@ func projectsGet(ctx *cli.Context) error {
 	return nil
 }
 
-func _displayProjects(prjs []apiv1.ProjectConfig, verbose bool) {
+func _displayProjects(prjs []xaapiv1.ProjectConfig, verbose bool) {
 	// Display result
 	first := true
 	writer := NewTableWriter()
@@ -126,7 +151,7 @@ func _displayProjects(prjs []apiv1.ProjectConfig, verbose bool) {
 			fmt.Fprintln(writer, "Label:\t", folder.Label)
 			fmt.Fprintln(writer, "Path type:\t", folder.Type)
 			fmt.Fprintln(writer, "Local Path:\t", folder.ClientPath)
-			if folder.Type != apiv1.TypeCloudSync {
+			if folder.Type != xaapiv1.TypeCloudSync {
 				fmt.Fprintln(writer, "Server Path:\t", folder.ServerPath)
 			}
 			fmt.Fprintln(writer, "Status:\t", folder.Status)
@@ -151,17 +176,17 @@ func _displayProjects(prjs []apiv1.ProjectConfig, verbose bool) {
 func projectsAdd(ctx *cli.Context) error {
 
 	// Decode project type
-	var ptype apiv1.ProjectType
+	var ptype xaapiv1.ProjectType
 	switch strings.ToLower(ctx.String("type")) {
 	case "pathmap", "pm":
-		ptype = apiv1.TypePathMap
+		ptype = xaapiv1.TypePathMap
 	case "cloudsync", "cs":
-		ptype = apiv1.TypeCloudSync
+		ptype = xaapiv1.TypeCloudSync
 	default:
 		return cli.NewExitError("Unknown project type", 1)
 	}
 
-	prj := apiv1.ProjectConfig{
+	prj := xaapiv1.ProjectConfig{
 		ServerID:   XdsServerIDGet(),
 		Label:      ctx.String("label"),
 		Type:       ptype,
@@ -170,7 +195,7 @@ func projectsAdd(ctx *cli.Context) error {
 	}
 
 	Log.Infof("POST /project %v", prj)
-	newPrj := apiv1.ProjectConfig{}
+	newPrj := xaapiv1.ProjectConfig{}
 	err := HTTPCli.Post("/projects", prj, &newPrj)
 	if err != nil {
 		return cli.NewExitError(err, 1)
@@ -182,12 +207,18 @@ func projectsAdd(ctx *cli.Context) error {
 }
 
 func projectsRemove(ctx *cli.Context) error {
-	var res apiv1.ProjectConfig
+	var res xaapiv1.ProjectConfig
 	id := GetID(ctx)
 	if id == "" {
 		return cli.NewExitError("id parameter or option must be set", 1)
 	}
 
+	if !ctx.Bool("force") {
+		if !Confirm("Do you permanently remove project id '" + id + "' [yes/No] ? ") {
+			return nil
+		}
+	}
+
 	if err := HTTPCli.Delete("/projects/"+id, &res); err != nil {
 		return cli.NewExitError(err, 1)
 	}