feat(cli): organization membership (#567)

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

Author: migmartri

app/cli/cmd/organization.go

@@ -35,6 +35,7 @@ func newOrganizationCmd() *cobra.Command {
 		newOrganizationDescribeCmd(),
 		newOrganizationInvitationCmd(),
 		newOrganizationAPITokenCmd(),
+		newOrganizationMemberCmd(),
 	)
 	return cmd
 }

app/cli/cmd/organization_leave.go

@@ -24,8 +24,8 @@ import (
 )
 
 // Get the membership entry associated to the current user for the given organization
-func membershipFromOrg(orgID string) (*action.MembershipItem, error) {
-	memberships, err := action.NewMembershipList(actionOpts).Run()
+func membershipFromOrg(ctx context.Context, orgID string) (*action.MembershipItem, error) {
+	memberships, err := action.NewMembershipList(actionOpts).ListOrgs(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("listing memberships: %w", err)
 	}
@@ -45,8 +45,9 @@ func newOrganizationLeaveCmd() *cobra.Command {
 		Use:   "leave",
 		Short: "leave an organization",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
 			// To find the membership ID, we need to iterate and filter by org
-			membership, err := membershipFromOrg(orgID)
+			membership, err := membershipFromOrg(ctx, orgID)
 			if err != nil {
 				return fmt.Errorf("getting membership: %w", err)
 			} else if membership == nil {
@@ -61,7 +62,7 @@ func newOrganizationLeaveCmd() *cobra.Command {
 			}
 
 			// Membership deletion
-			if err := action.NewMembershipDelete(actionOpts).Run(context.Background(), membership.ID); err != nil {
+			if err := action.NewMembershipLeave(actionOpts).Run(ctx, membership.ID); err != nil {
 				return fmt.Errorf("deleting membership: %w", err)
 			}
 

app/cli/cmd/organization_list.go

@@ -30,7 +30,7 @@ func newOrganizationList() *cobra.Command {
 		Aliases: []string{"ls"},
 		Short:   "List the organizations this user has access to",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			res, err := action.NewMembershipList(actionOpts).Run()
+			res, err := action.NewMembershipList(actionOpts).ListOrgs(cmd.Context())
 			if err != nil {
 				return err
 			}

app/cli/cmd/organization_member.go

@@ -0,0 +1,36 @@
+//
+// Copyright 2024 The Chainloop Authors.
+//
+// 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 cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func newOrganizationMemberCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "member",
+		Short: "Organization members management",
+	}
+
+	cmd.AddCommand(
+		newOrganizationMemberList(),
+		newOrganizationMemberUpdateCmd(),
+		newOrganizationMemberDeleteCmd(),
+		newOrganizationInvitationCmd(),
+	)
+
+	return cmd
+}

app/cli/cmd/organization_member_delete.go

@@ -0,0 +1,76 @@
+//
+// Copyright 2024 The Chainloop Authors.
+//
+// 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 cmd
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/spf13/cobra"
+)
+
+// Get the membership entry associated to the current user for the given organization
+func loadMembershipCurrentOrg(ctx context.Context, membershipID string) (*action.MembershipItem, error) {
+	memberships, err := action.NewMembershipList(actionOpts).ListMembers(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("listing memberships: %w", err)
+	}
+
+	for _, m := range memberships {
+		if m.ID == membershipID {
+			return m, nil
+		}
+	}
+
+	return nil, fmt.Errorf("membership %s not found", membershipID)
+}
+
+func newOrganizationMemberDeleteCmd() *cobra.Command {
+	var membershipID string
+
+	cmd := &cobra.Command{
+		Use:   "delete",
+		Short: "Remove a member from the current organization",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+			m, err := loadMembershipCurrentOrg(ctx, membershipID)
+			if err != nil {
+				return fmt.Errorf("getting membership: %w", err)
+			}
+
+			fmt.Printf("You are about to remove the user %q from the organization %q\n", m.User.Email, m.Org.Name)
+
+			// Ask for confirmation
+			if err := confirmDeletion(); err != nil {
+				return err
+			}
+
+			if err := action.NewMembershipDelete(actionOpts).Run(ctx, membershipID); err != nil {
+				return err
+			}
+
+			logger.Info().Msg("Member deleted")
+			return nil
+		},
+	}
+
+	cmd.Flags().StringVar(&membershipID, "id", "", "Membership ID")
+	err := cmd.MarkFlagRequired("id")
+	cobra.CheckErr(err)
+
+	return cmd
+}

app/cli/cmd/organization_member_list.go

@@ -0,0 +1,61 @@
+//
+// Copyright 2024 The Chainloop Authors.
+//
+// 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 cmd
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/jedib0t/go-pretty/v6/table"
+	"github.com/spf13/cobra"
+)
+
+func newOrganizationMemberList() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "list",
+		Aliases: []string{"ls"},
+		Short:   "List the members of the current organization",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			res, err := action.NewMembershipList(actionOpts).ListMembers(cmd.Context())
+			if err != nil {
+				return err
+			}
+
+			return encodeOutput(res, orgMembershipsTableOutput)
+		},
+	}
+
+	return cmd
+}
+
+func orgMembershipsTableOutput(items []*action.MembershipItem) error {
+	if len(items) == 0 {
+		fmt.Println("you have no access to any organization yet")
+		return nil
+	}
+
+	t := newTableWriter()
+	t.AppendHeader(table.Row{"ID", "Email", "Role", "Joined At"})
+
+	for _, i := range items {
+		t.AppendRow(table.Row{i.ID, i.User.Email, i.Role, i.CreatedAt.Format(time.RFC822)})
+		t.AppendSeparator()
+	}
+
+	t.Render()
+	return nil
+}

app/cli/cmd/organization_member_update.go

@@ -0,0 +1,61 @@
+//
+// Copyright 2024 The Chainloop Authors.
+//
+// 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 cmd
+
+import (
+	"fmt"
+
+	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
+	"github.com/spf13/cobra"
+)
+
+func newOrganizationMemberUpdateCmd() *cobra.Command {
+	var membershipID, role string
+
+	cmd := &cobra.Command{
+		Use:   "update",
+		Short: "Update a member of the 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.NewMembershipUpdate(actionOpts).ChangeRole(cmd.Context(), membershipID, role)
+			if err != nil {
+				return err
+			}
+
+			return encodeOutput([]*action.MembershipItem{res}, orgMembershipsTableOutput)
+		},
+	}
+
+	cmd.Flags().StringVar(&membershipID, "id", "", "Membership ID")
+	err := cmd.MarkFlagRequired("id")
+	cobra.CheckErr(err)
+
+	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_set.go

@@ -29,15 +29,16 @@ func newOrganizationSet() *cobra.Command {
 		Use:   "set",
 		Short: "Set the current organization associated with this user",
 		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
 			// To find the membership ID, we need to iterate and filter by org
-			membership, err := membershipFromOrg(orgID)
+			membership, err := membershipFromOrg(ctx, orgID)
 			if err != nil {
 				return fmt.Errorf("getting membership: %w", err)
 			} else if membership == nil {
 				return fmt.Errorf("organization %s not found", orgID)
 			}
 
-			m, err := action.NewMembershipSet(actionOpts).Run(membership.ID)
+			m, err := action.NewMembershipSet(actionOpts).Run(ctx, membership.ID)
 			if err != nil {
 				return err
 			}

app/cli/internal/action/membership_delete.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package action
 
 import (
 	"context"
-	"fmt"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 )
@@ -31,9 +30,9 @@ func NewMembershipDelete(cfg *ActionsOpts) *MembershipDelete {
 }
 
 func (action *MembershipDelete) Run(ctx context.Context, membershipID string) error {
-	client := pb.NewUserServiceClient(action.cfg.CPConnection)
-	if _, err := client.DeleteMembership(ctx, &pb.DeleteMembershipRequest{MembershipId: membershipID}); err != nil {
-		return fmt.Errorf("deleting membership: %w", err)
+	client := pb.NewOrganizationServiceClient(action.cfg.CPConnection)
+	if _, err := client.DeleteMembership(ctx, &pb.OrganizationServiceDeleteMembershipRequest{MembershipId: membershipID}); err != nil {
+		return err
 	}
 
 	return nil

app/cli/internal/action/membership_leave.go

@@ -0,0 +1,39 @@
+//
+// Copyright 2023 The Chainloop Authors.
+//
+// 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 action
+
+import (
+	"context"
+
+	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
+)
+
+type MembershipLeave struct {
+	cfg *ActionsOpts
+}
+
+func NewMembershipLeave(cfg *ActionsOpts) *MembershipLeave {
+	return &MembershipLeave{cfg}
+}
+
+func (action *MembershipLeave) Run(ctx context.Context, membershipID string) error {
+	client := pb.NewUserServiceClient(action.cfg.CPConnection)
+	if _, err := client.DeleteMembership(ctx, &pb.DeleteMembershipRequest{MembershipId: membershipID}); err != nil {
+		return err
+	}
+
+	return nil
+}