Merge pull request #43 from intility/feat/users

Add command to get users

Author: Callum0x50

internal/ux/table.go

@@ -1,6 +1,9 @@
 package ux
 
-import "strings"
+import (
+	"strings"
+	"unicode/utf8"
+)
 
 type Table struct {
 	Header []string
@@ -55,19 +58,22 @@ func (t *Table) calculateColumnWidths() map[int]int {
 	// calculate the longest string in each column
 	for i, row := range t.Rows {
 		for j, cell := range row {
-			if len(cell) > colWidths[j] {
-				colWidths[j] = len(cell)
+			cellWidth := utf8.RuneCountInString(cell)
+			if cellWidth > colWidths[j] {
+				colWidths[j] = cellWidth
 			}
 
-			if len(t.Header[j]) > colWidths[j] {
-				colWidths[j] = len(t.Header[j])
+			headerWidth := utf8.RuneCountInString(t.Header[j])
+			if headerWidth > colWidths[j] {
+				colWidths[j] = headerWidth
 			}
 		}
 
 		if i == 0 {
 			for j, header := range t.Header {
-				if len(header) > colWidths[j] {
-					colWidths[j] = len(header)
+				headerWidth := utf8.RuneCountInString(header)
+				if headerWidth > colWidths[j] {
+					colWidths[j] = headerWidth
 				}
 			}
 		}
@@ -85,15 +91,17 @@ func (t *Table) String() string {
 	// print padded cells
 	for i, header := range t.Header {
 		s += header + " "
-		s += strings.Repeat(" ", longestInCol[i]-len(header)) + "\t"
+		headerWidth := utf8.RuneCountInString(header)
+		s += strings.Repeat(" ", longestInCol[i]-headerWidth) + "\t"
 	}
 
 	s += "\n"
 
 	for _, row := range t.Rows {
 		for i, cell := range row {
 			s += cell + " "
-			s += strings.Repeat(" ", longestInCol[i]-len(cell)) + "\t"
+			cellWidth := utf8.RuneCountInString(cell)
+			s += strings.Repeat(" ", longestInCol[i]-cellWidth) + "\t"
 		}
 
 		s += "\n"

pkg/client/client.go

@@ -41,11 +41,16 @@ type TeamsClient interface {
 	GetTeamMembers(ctx context.Context, teamId string) ([]TeamMember, error)
 }
 
+type UserClient interface {
+	ListUsers(ctx context.Context) ([]User, error)
+}
+
 type Client interface {
 	ClusterClient
 	IntegrationClient
 	MeClient
 	TeamsClient
+	UserClient
 }
 
 type RestClientOption func(*RestClient)

pkg/client/user.go

@@ -0,0 +1,28 @@
+package client
+
+import (
+	"context"
+	"fmt"
+)
+
+type User struct {
+	ID    string   `json:"id"`
+	Name  string   `json:"name"`
+	UPN   string   `json:"upn"`
+	Roles []string `json:"roles"`
+}
+
+func (c *RestClient) ListUsers(ctx context.Context) ([]User, error) {
+	var users []User
+
+	req, err := c.createAuthenticatedRequest(ctx, "GET", c.baseURI+"/api/v1/users", nil)
+	if err != nil {
+		return users, err
+	}
+
+	if err = doRequest(c.httpClient, req, &users); err != nil {
+		return users, fmt.Errorf("request failed: %w", err)
+	}
+
+	return users, nil
+}

pkg/commands/user/list.go

@@ -0,0 +1,112 @@
+package user
+
+import (
+	"encoding/json"
+	"io"
+	"slices"
+	"sort"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v3"
+
+	"github.com/intility/indev/internal/redact"
+	"github.com/intility/indev/internal/telemetry"
+	"github.com/intility/indev/internal/ux"
+	"github.com/intility/indev/pkg/client"
+	"github.com/intility/indev/pkg/clientset"
+	"github.com/intility/indev/pkg/outputformat"
+)
+
+func NewListCommand(set clientset.ClientSet) *cobra.Command {
+	output := outputformat.Format("")
+	cmd := &cobra.Command{
+		Use:     "list",
+		Short:   "List all users",
+		Long:    `List all users in the Intility Developer Platform`,
+		PreRunE: set.EnsureSignedInPreHook,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, span := telemetry.StartSpan(cmd.Context(), "users.list")
+			defer span.End()
+
+			cmd.SilenceUsage = true
+
+			users, err := set.PlatformClient.ListUsers(ctx)
+			if err != nil {
+				return redact.Errorf("could not list users: %w", redact.Safe(err))
+			}
+
+			if len(users) == 0 {
+				ux.Fprint(cmd.OutOrStdout(), "No users found\n")
+				return nil
+			}
+
+			if err = printUsersList(cmd.OutOrStdout(), output, users); err != nil {
+				return redact.Errorf("could not print users list: %w", redact.Safe(err))
+			}
+
+			return nil
+		},
+	}
+
+	cmd.Flags().VarP(&output, "output", "o", "Output format (wide, json, yaml)")
+
+	return cmd
+}
+
+func printUsersList(writer io.Writer, format outputformat.Format, users []client.User) error {
+	var err error
+
+	sortUsersByOwnerThenName(users)
+
+	switch format {
+	case "wide":
+		table := ux.TableFromObjects(users, func(user client.User) []ux.Row {
+			return []ux.Row{
+				ux.NewRow("Id", user.ID),
+				ux.NewRow("Name", user.Name),
+				ux.NewRow("UPN", user.UPN),
+				ux.NewRow("Role", strings.Join(user.Roles, ",")),
+			}
+		})
+
+		ux.Fprint(writer, "%s", table.String())
+	case "json":
+		enc := json.NewEncoder(writer)
+		enc.SetIndent("", "  ")
+		err = enc.Encode(users)
+	case "yaml":
+		indent := 2
+		enc := yaml.NewEncoder(writer)
+		enc.SetIndent(indent)
+		err = enc.Encode(users)
+	default:
+		table := ux.TableFromObjects(users, func(user client.User) []ux.Row {
+			return []ux.Row{
+				ux.NewRow("Name", user.Name),
+				ux.NewRow("UPN", user.UPN),
+				ux.NewRow("Role", strings.Join(user.Roles, ",")),
+			}
+		})
+
+		ux.Fprint(writer, "%s", table.String())
+	}
+
+	if err != nil {
+		return redact.Errorf("output encoder failed: %w", redact.Safe(err))
+	}
+
+	return nil
+}
+
+func sortUsersByOwnerThenName(users []client.User) {
+	sort.Slice(users, func(i, j int) bool {
+		hasOwnerI := slices.Contains(users[i].Roles, "owner")
+		hasOwnerJ := slices.Contains(users[j].Roles, "owner")
+
+		if hasOwnerI != hasOwnerJ {
+			return hasOwnerI // Owners first
+		}
+		return users[i].Name < users[j].Name // Then by name
+	})
+}

pkg/rootcommand/rootcommand.go

@@ -12,6 +12,7 @@ import (
 	"github.com/intility/indev/pkg/commands/account"
 	"github.com/intility/indev/pkg/commands/cluster"
 	"github.com/intility/indev/pkg/commands/teams"
+	"github.com/intility/indev/pkg/commands/user"
 )
 
 func GetRootCommand() *cobra.Command {
@@ -34,6 +35,7 @@ func GetRootCommand() *cobra.Command {
 	rootCmd.AddCommand(getClusterCommand(clients))
 	rootCmd.AddCommand(getAccountCommand(clients))
 	rootCmd.AddCommand(getTeamsCommand(clients))
+	rootCmd.AddCommand(getUserCommand(clients))
 
 	return rootCmd
 }
@@ -96,6 +98,19 @@ func getTeamsCommand(set clientset.ClientSet) *cobra.Command {
 	return cmd
 }
 
+func getUserCommand(set clientset.ClientSet) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "user",
+		Short: "Manage Intility Developer Platform users",
+		Long:  "Manage Intility Developer Platform users",
+		Run:   showHelp,
+	}
+
+	cmd.AddCommand(user.NewListCommand(set))
+
+	return cmd
+}
+
 func showHelp(cmd *cobra.Command, args []string) {
 	_, span := telemetry.StartSpan(cmd.Context(), cmd.Use)
 	defer span.End()