ovh · yesnault · Feb 11, 2019 · Jan 21, 2019 · Jan 23, 2019 · Jan 23, 2019
@@ -23,7 +23,6 @@ func application() *cobra.Command {
 		cli.NewCommand(applicationCreateCmd, applicationCreateRun, nil, withAllCommandModifiers()...),
 		cli.NewDeleteCommand(applicationDeleteCmd, applicationDeleteRun, nil, withAllCommandModifiers()...),
 		applicationKey(),
-		applicationGroup(),
 		applicationVariable(),
 		cli.NewCommand(applicationExportCmd, applicationExportRun, nil, withAllCommandModifiers()...),
 		cli.NewCommand(applicationImportCmd, applicationImportRun, nil, withAllCommandModifiers()...),
@@ -151,12 +150,6 @@ var applicationExportCmd = cli.Command{
 		{Name: _ApplicationName},
 	},
 	Flags: []cli.Flag{
-		{
-			Type:    cli.FlagBool,
-			Name:    "with-permissions",
-			Usage:   "Export permissions",
-			Default: "false",
-		},
 		{
 			Type:    cli.FlagString,
 			Name:    "format",
@@ -167,7 +160,7 @@ var applicationExportCmd = cli.Command{
 }
 
 func applicationExportRun(c cli.Values) error {
-	btes, err := client.ApplicationExport(c.GetString(_ProjectKey), c.GetString(_ApplicationName), c.GetBool("with-permissions"), c.GetString("format"))
+	btes, err := client.ApplicationExport(c.GetString(_ProjectKey), c.GetString(_ApplicationName), c.GetString("format"))
 	if err != nil {
 		return err
 	}

@@ -26,7 +26,6 @@ func environment() *cobra.Command {
 		cli.NewDeleteCommand(environmentDeleteCmd, environmentDeleteRun, nil, withAllCommandModifiers()...),
 		environmentKey(),
 		environmentVariable(),
-		environmentGroup(),
 		cli.NewCommand(environmentExportCmd, environmentExportRun, nil, withAllCommandModifiers()...),
 		cli.NewCommand(environmentImportCmd, environmentImportRun, nil, withAllCommandModifiers()...),
 	})
@@ -136,12 +135,6 @@ var environmentExportCmd = cli.Command{
 		{Name: "environment-name"},
 	},
 	Flags: []cli.Flag{
-		{
-			Type:    cli.FlagBool,
-			Name:    "with-permissions",
-			Usage:   "Export permissions",
-			Default: "false",
-		},
 		{
 			Type:    cli.FlagString,
 			Name:    "format",
@@ -152,7 +145,7 @@ var environmentExportCmd = cli.Command{
 }
 
 func environmentExportRun(c cli.Values) error {
-	btes, err := client.EnvironmentExport(c.GetString(_ProjectKey), c.GetString("environment-name"), c.GetBool("with-permissions"), c.GetString("format"))
+	btes, err := client.EnvironmentExport(c.GetString(_ProjectKey), c.GetString("environment-name"), c.GetString("format"))
 	if err != nil {
 		return err
 	}

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/spf13/cobra"
 
@@ -21,6 +22,8 @@ func group() *cobra.Command {
 		cli.NewCommand(groupCreateCmd, groupCreateRun, nil),
 		cli.NewCommand(groupRenameCmd, groupRenameRun, nil),
 		cli.NewDeleteCommand(groupDeleteCmd, groupDeleteRun, nil),
+		cli.NewCommand(groupGrantCmd, groupGrantRun, nil),
+		cli.NewCommand(groupRevokeCmd, groupRevokeRun, nil),
 		groupUser(),
 	})
 }
@@ -100,3 +103,104 @@ func groupDeleteRun(v cli.Values) error {
 
 	return err
 }
+
+var groupGrantCmd = cli.Command{
+	Name:    "grant",
+	Short:   "Grant a CDS group in a project or workflow",
+	Aliases: []string{"add", "insert"},
+	Ctx: []cli.Arg{
+		{Name: _ProjectKey},
+	},
+	Args: []cli.Arg{
+		{Name: "group-name"},
+		{
+			Name: "permission",
+			IsValid: func(arg string) bool {
+				perm, err := strconv.Atoi(arg)
+				if err != nil {
+					return false
+				}
+				switch perm {
+				case 4, 5, 7:
+					return true
+				default:
+					return false
+				}
+			},
+		},
+	},
+	Flags: []cli.Flag{
+		{
+			Name:      "workflow",
+			ShortHand: "n",
+			Usage:     "Workflow name",
+		},
+		{
+			Name:      "only-project",
+			ShortHand: "p",
+			Usage:     "Indicate if the group must be added only on project or also on all workflows in project",
+			Type:      cli.FlagBool,
+		},
+	},
+}
+
+func groupGrantRun(v cli.Values) error {
+	groupName := v.GetString("group-name")
+	// Don't check error (already done in isValid function)
+	permission, _ := v.GetInt64("permission")
+	project := v.GetString(_ProjectKey)
+	workflow := v.GetString("workflow")
+
+	if workflow != "" {
+		if err := client.WorkflowGroupAdd(project, workflow, groupName, int(permission)); err != nil {
+			return sdk.WrapError(err, "cannot add group %s workflow %s/%s", groupName, project, workflow)
+		}
+		fmt.Printf("Group '%s' added on workflow '%s/%s' with success\n", groupName, project, workflow)
+	} else {
+		if err := client.ProjectGroupAdd(project, groupName, int(permission), v.GetBool("only-project")); err != nil {
+			return sdk.WrapError(err, "cannot add group %s on project %s", groupName, project)
+		}
+		fmt.Printf("Group '%s' added on project '%s' with success\n", groupName, project)
+	}
+
+	return nil
+}
+
+var groupRevokeCmd = cli.Command{
+	Name:    "revoke",
+	Short:   "Revoke a CDS group in a project or workflow",
+	Aliases: []string{"remove", "delete", "rm", "del"},
+	Ctx: []cli.Arg{
+		{Name: _ProjectKey},
+	},
+	Args: []cli.Arg{
+		{Name: "group-name"},
+	},
+	Flags: []cli.Flag{
+		{
+			Name:      "workflow",
+			ShortHand: "n",
+			Usage:     "Workflow name",
+		},
+	},
+}
+
+func groupRevokeRun(v cli.Values) error {
+	groupName := v.GetString("group-name")
+	project := v.GetString(_ProjectKey)
+	workflow := v.GetString("workflow")
+
+	if workflow != "" {
+		if err := client.WorkflowGroupDelete(project, workflow, groupName); err != nil {
+			return sdk.WrapError(err, "cannot delete group %s in workflow %s/%s", groupName, project, workflow)
+		}
+		fmt.Printf("Group '%s' deleted on workflow '%s/%s' with success\n", groupName, project, workflow)
+	} else {
+		if err := client.ProjectGroupDelete(project, groupName); err != nil {
+			return sdk.WrapError(err, "cannot delete group %s on project %s", groupName, project)
+		}
+		fmt.Printf("Group '%s' deleted on project '%s' with success\n", groupName, project)
+	}
+
+	return nil
+}
@@ -24,7 +24,6 @@ func pipeline() *cobra.Command {
 		cli.NewDeleteCommand(pipelineDeleteCmd, pipelineDeleteRun, nil, withAllCommandModifiers()...),
 		cli.NewCommand(pipelineExportCmd, pipelineExportRun, nil, withAllCommandModifiers()...),
 		cli.NewCommand(pipelineImportCmd, pipelineImportRun, nil, withAllCommandModifiers()...),
-		pipelineGroup(),
 	})
 }
 
@@ -65,22 +64,11 @@ var pipelineExportCmd = cli.Command{
 			},
 			Default: "yml",
 		},
-		{
-			Name:  "with-permission",
-			Usage: "true or false",
-			IsValid: func(s string) bool {
-				if s != "true" && s != "false" {
-					return false
-				}
-				return true
-			},
-			Type: cli.FlagBool,
-		},
 	},
 }
 
 func pipelineExportRun(v cli.Values) error {
-	btes, err := client.PipelineExport(v.GetString(_ProjectKey), v.GetString("pipeline-name"), v.GetBool("with-permission"), v.GetString("format"))
+	btes, err := client.PipelineExport(v.GetString(_ProjectKey), v.GetString("pipeline-name"), v.GetString("format"))
 	if err != nil {
 		return err
 	}