Added “role” flag to “sharing add”

Author: rykov

api/sharing.go

@@ -6,8 +6,12 @@ import (
 )
 
 // AddCollaborator invites a collaborator via username or email
-func (c *Client) AddCollaborator(cc context.Context, name string) error {
-	req := c.newRequest(cc, "PUT", "/collaborators/"+url.PathEscape(name), true)
+func (c *Client) AddCollaborator(cc context.Context, name, role string) error {
+	path := "/collaborators/" + url.PathEscape(name)
+	if role != "" {
+		path = path + "?role=" + url.QueryEscape(role)
+	}
+	req := c.newRequest(cc, "PUT", path, true)
 	return req.doJSON(nil)
 }
 

cli/sharing.go

@@ -67,6 +67,8 @@ func listMembers(cmd *cobra.Command, args []string) error {
 
 // NewCmdSharingAdd generates the Cobra command for "sharing:add"
 func NewCmdSharingAdd() *cobra.Command {
+	var roleFlag string
+
 	addCmd := &cobra.Command{
 		Use:   "add EMAIL",
 		Short: "Add a collaborator",
@@ -84,7 +86,7 @@ func NewCmdSharingAdd() *cobra.Command {
 
 			var multiErr *multierror.Error
 			for _, name := range args {
-				err := c.AddCollaborator(cc, name)
+				err := c.AddCollaborator(cc, name, roleFlag)
 
 				if err != nil {
 					multiErr = multierror.Append(multiErr, err)
@@ -99,12 +101,15 @@ func NewCmdSharingAdd() *cobra.Command {
 		},
 	}
 
+	// Flags and options
+	addCmd.Flags().StringVar(&roleFlag, "role", "", "Collaborator role")
+
 	return addCmd
 }
 
 // NewCmdSharingRemove generates the Cobra command for "sharing:add"
 func NewCmdSharingRemove() *cobra.Command {
-	addCmd := &cobra.Command{
+	rmCmd := &cobra.Command{
 		Use:   "remove EMAIL",
 		Short: "Remove a collaborator",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -136,7 +141,7 @@ func NewCmdSharingRemove() *cobra.Command {
 		},
 	}
 
-	return addCmd
+	return rmCmd
 }
 
 // Root for sharing/collaboration subcommands

cli/sharing_test.go

@@ -5,6 +5,7 @@ import (
 	"github.com/gemfury/cli/internal/ctx"
 	"github.com/gemfury/cli/internal/testutil"
 	"github.com/gemfury/cli/pkg/terminal"
+	"net/http"
 	"strings"
 	"testing"
 )
@@ -85,6 +86,41 @@ func TestSharingAddCommandSuccess(t *testing.T) {
 	}
 }
 
+func TestSharingAddWithRoleCommandSuccess(t *testing.T) {
+	auth := terminal.TestAuther("user", "abc123", nil)
+	term := terminal.NewForTest()
+
+	// Fire up test server
+	roleQuery := "unchanged-by-server"
+	path := "/collaborators/owner@example.com"
+	server := testutil.APIServerCustom(t, func(mux *http.ServeMux) {
+		mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+			if m := r.Method; m != "PUT" {
+				t.Errorf("Incorrect method: %q", m)
+			}
+			roleQuery = r.URL.Query().Get("role")
+			w.Write([]byte("{}"))
+		})
+	})
+	defer server.Close()
+
+	cc := cli.TestContext(term, auth)
+	flags := ctx.GlobalFlags(cc)
+	flags.Endpoint = server.URL
+
+	err := runCommandNoErr(cc, []string{"sharing", "add", "owner@example.com", "--role", "owner"})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	exp := "Invited \"owner@example.com\" as a collaborator\n"
+	if outStr := string(term.OutBytes()); !strings.HasSuffix(outStr, exp) {
+		t.Errorf("Expected output to include %q, got %q", exp, outStr)
+	} else if r := roleQuery; r != "owner" {
+		t.Errorf(`Expected role to be "owner", got %q`, r)
+	}
+}
+
 func TestSharingAddCommandUnauthorized(t *testing.T) {
 	path := "/collaborators/added@example.com"
 	server := testutil.APIServer(t, "PUT", path, "{}", 200)