feat(controlplane): set role during invitation (#556)

Signed-off-by: Miguel Martinez Trivino <[email protected]>

Author: migmartri

app/cli/cmd/organization_invitation_create.go

@@ -17,19 +17,32 @@ package cmd
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
 	"github.com/spf13/cobra"
 )
 
 func newOrganizationInvitationCreateCmd() *cobra.Command {
-	var receiverEmail string
+	var receiverEmail, role string
+
 	cmd := &cobra.Command{
 		Use:   "create",
 		Short: "Invite a User to an Organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			var found bool
+			for _, r := range action.AvailableRoles {
+				if string(r) == role {
+					found = true
+					break
+				}
+			}
+			if !found {
+				return fmt.Errorf("role %q is not available. Available roles are %s", role, action.AvailableRoles)
+			}
+
 			res, err := action.NewOrgInvitationCreate(actionOpts).Run(
-				context.Background(), receiverEmail)
+				context.Background(), receiverEmail, role)
 			if err != nil {
 				return err
 			}
@@ -40,6 +53,8 @@ func newOrganizationInvitationCreateCmd() *cobra.Command {
 
 	cmd.Flags().StringVar(&receiverEmail, "receiver", "", "Email of the user to invite")
 	err := cmd.MarkFlagRequired("receiver")
+
+	cmd.Flags().StringVar(&role, "role", string(action.RoleViewer), fmt.Sprintf("Role of the user in the organization, available %s", action.AvailableRoles))
 	cobra.CheckErr(err)
 
 	return cmd

app/cli/cmd/organization_invitation_list_sent.go

@@ -50,10 +50,10 @@ func orgInvitationTableOutput(items []*action.OrgInvitationItem) error {
 	}
 
 	t := newTableWriter()
-	t.AppendHeader(table.Row{"ID", "Receiver Email", "Status", "Created At"})
+	t.AppendHeader(table.Row{"ID", "Receiver Email", "Role", "Status", "Created At"})
 
 	for _, i := range items {
-		t.AppendRow(table.Row{i.ID, i.ReceiverEmail, i.Status, i.CreatedAt.Format(time.RFC822)})
+		t.AppendRow(table.Row{i.ID, i.ReceiverEmail, i.Role, i.Status, i.CreatedAt.Format(time.RFC822)})
 		t.AppendSeparator()
 	}
 

app/cli/internal/action/membership_list.go

@@ -17,6 +17,7 @@ package action
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
@@ -37,7 +38,7 @@ type MembershipItem struct {
 	CreatedAt *time.Time `json:"joinedAt"`
 	UpdatedAt *time.Time `json:"updatedAt"`
 	Org       *OrgItem
-	Role      string `json:"role"`
+	Role      Role `json:"role"`
 }
 
 func NewMembershipList(cfg *ActionsOpts) *MembershipList {
@@ -72,22 +73,60 @@ func pbMembershipItemToAction(in *pb.OrgMembershipItem) *MembershipItem {
 		return nil
 	}
 
-	var role string
-	switch in.Role {
-	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_ADMIN:
-		role = "admin"
-	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_VIEWER:
-		role = "viewer"
-	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_OWNER:
-		role = "owner"
-	}
-
 	return &MembershipItem{
 		ID:        in.GetId(),
 		CreatedAt: toTimePtr(in.GetCreatedAt().AsTime()),
 		UpdatedAt: toTimePtr(in.GetCreatedAt().AsTime()),
 		Org:       pbOrgItemToAction(in.Org),
 		Current:   in.Current,
-		Role:      role,
+		Role:      pbRoleToString(in.Role),
+	}
+}
+
+type Role string
+
+const (
+	RoleAdmin  Role = "admin"
+	RoleOwner  Role = "owner"
+	RoleViewer Role = "viewer"
+)
+
+type Roles []Role
+
+var AvailableRoles = Roles{
+	RoleAdmin,
+	RoleOwner,
+	RoleViewer,
+}
+
+func (roles Roles) String() string {
+	result := make([]string, 0, len(roles))
+	for _, role := range roles {
+		result = append(result, string(role))
+	}
+	return strings.Join(result, ", ")
+}
+
+func pbRoleToString(role pb.MembershipRole) Role {
+	switch role {
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_ADMIN:
+		return RoleAdmin
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_VIEWER:
+		return RoleViewer
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_OWNER:
+		return RoleOwner
+	}
+	return ""
+}
+
+func stringToPbRole(role Role) pb.MembershipRole {
+	switch role {
+	case RoleAdmin:
+		return pb.MembershipRole_MEMBERSHIP_ROLE_ORG_ADMIN
+	case RoleViewer:
+		return pb.MembershipRole_MEMBERSHIP_ROLE_ORG_VIEWER
+	case RoleOwner:
+		return pb.MembershipRole_MEMBERSHIP_ROLE_ORG_OWNER
 	}
+	return pb.MembershipRole_MEMBERSHIP_ROLE_UNSPECIFIED
 }

app/cli/internal/action/org_invitation_create.go

@@ -29,10 +29,11 @@ func NewOrgInvitationCreate(cfg *ActionsOpts) *OrgInvitationCreate {
 	return &OrgInvitationCreate{cfg}
 }
 
-func (action *OrgInvitationCreate) Run(ctx context.Context, receiver string) (*OrgInvitationItem, error) {
+func (action *OrgInvitationCreate) Run(ctx context.Context, receiver, role string) (*OrgInvitationItem, error) {
 	client := pb.NewOrgInvitationServiceClient(action.cfg.CPConnection)
 	resp, err := client.Create(ctx, &pb.OrgInvitationServiceCreateRequest{
 		ReceiverEmail: receiver,
+		Role:          stringToPbRole(Role(role)),
 	})
 
 	if err != nil {

app/cli/internal/action/org_invitation_list_sent.go

@@ -33,6 +33,7 @@ type OrgInvitationItem struct {
 	Sender        *UserItem  `json:"sender"`
 	Status        string     `json:"status"`
 	CreatedAt     *time.Time `json:"createdAt"`
+	Role          Role       `json:"role"`
 }
 
 func NewOrgInvitationListSent(cfg *ActionsOpts) *OrgInvitationListSent {
@@ -66,5 +67,6 @@ func pbOrgInvitationItemToAction(in *pb.OrgInvitationItem) *OrgInvitationItem {
 		Sender:        pbUserItemToAction(in.Sender),
 		CreatedAt:     toTimePtr(in.CreatedAt.AsTime()),
 		Status:        in.Status,
+		Role:          pbRoleToString(in.Role),
 	}
 }