Add resource sorting by CPU allocation

cmoog · cmoog · commit 1f60e711ce33 · 2020-10-18T16:27:51.000-05:00
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -7,6 +7,9 @@ import (
 	"github.com/spf13/cobra/doc"
 )
 
+// verbose is a global flag for specifying that a command should give verbose output
+var verbose bool = false
+
 // Make constructs the "coder" root command
 func Make() *cobra.Command {
 	app := &cobra.Command{
@@ -28,6 +31,7 @@ func Make() *cobra.Command {
 		completionCmd,
 		genDocs(app),
 	)
+	app.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "show verbose output")
 	return app
 }
 
diff --git a/internal/cmd/resourcemanager.go b/internal/cmd/resourcemanager.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"sort"
 	"text/tabwriter"
 
 	"cdr.dev/coder-cli/coder-sdk"
@@ -14,60 +15,81 @@ func makeResourceCmd() *cobra.Command {
 		Use:   "resources",
 		Short: "manager Coder resources with platform-level context (users, organizations, environments)",
 	}
-	cmd.AddCommand(resourceTop)
+	cmd.AddCommand(resourceTop())
 	return cmd
 }
 
-var resourceTop = &cobra.Command{
-	Use: "top",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx := cmd.Context()
-
-		client, err := newClient()
-		if err != nil {
-			return err
-		}
-
-		envs, err := client.ListEnvironments(ctx)
-		if err != nil {
-			return err
-		}
-
-		userEnvs := make(map[string][]coder.Environment)
-		for _, e := range envs {
-			userEnvs[e.UserID] = append(userEnvs[e.UserID], e)
-		}
-
-		users, err := client.Users(ctx)
-		if err != nil {
-			return err
-		}
-
-		orgs := make(map[string]coder.Organization)
-		orglist, err := client.Organizations(ctx)
-		if err != nil {
-			return err
-		}
-		for _, o := range orglist {
-			orgs[o.ID] = o
-		}
-
-		tabwriter := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
-		for _, u := range users {
-			_, _ = fmt.Fprintf(tabwriter, "%s\t(%s)\t%s", u.Name, u.Email, aggregateEnvResources(userEnvs[u.ID]))
-			if len(userEnvs[u.ID]) > 0 {
-				_, _ = fmt.Fprintf(tabwriter, "\f")
+func resourceTop() *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "top",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx := cmd.Context()
+
+			client, err := newClient()
+			if err != nil {
+				return err
+			}
+
+			envs, err := client.ListEnvironments(ctx)
+			if err != nil {
+				return err
 			}
-			for _, env := range userEnvs[u.ID] {
-				_, _ = fmt.Fprintf(tabwriter, "\t")
-				_, _ = fmt.Fprintln(tabwriter, fmtEnvResources(env, orgs))
+
+			userEnvs := make(map[string][]coder.Environment)
+			for _, e := range envs {
+				userEnvs[e.UserID] = append(userEnvs[e.UserID], e)
 			}
-			fmt.Fprint(tabwriter, "\n")
-		}
-		_ = tabwriter.Flush()
 
-		return nil
-	},
+			users, err := client.Users(ctx)
+			if err != nil {
+				return err
+			}
+
+			orgs := make(map[string]coder.Organization)
+			orglist, err := client.Organizations(ctx)
+			if err != nil {
+				return err
+			}
+			for _, o := range orglist {
+				orgs[o.ID] = o
+			}
+
+			tabwriter := tabwriter.NewWriter(os.Stdout, 0, 0, 4, ' ', 0)
+			var userResources []aggregatedUser
+			for _, u := range users {
+				// truncate user names to ensure tabwriter doesn't push our entire table too far
+				u.Name = truncate(u.Name, 20, "...")
+				userResources = append(userResources, aggregatedUser{User: u, resources: aggregateEnvResources(userEnvs[u.ID])})
+			}
+			sort.Slice(userResources, func(i, j int) bool {
+				return userResources[i].cpuAllocation > userResources[j].cpuAllocation
+			})
+
+			for _, u := range userResources {
+				_, _ = fmt.Fprintf(tabwriter, "%s\t(%s)\t%s", u.Name, u.Email, u.resources)
+				if verbose {
+					if len(userEnvs[u.ID]) > 0 {
+						_, _ = fmt.Fprintf(tabwriter, "\f")
+					}
+					for _, env := range userEnvs[u.ID] {
+						_, _ = fmt.Fprintf(tabwriter, "\t")
+						_, _ = fmt.Fprintln(tabwriter, fmtEnvResources(env, orgs))
+					}
+				}
+				fmt.Fprint(tabwriter, "\n")
+			}
+			_ = tabwriter.Flush()
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+type aggregatedUser struct {
+	coder.User
+	resources
 }
 
 func resourcesFromEnv(env coder.Environment) resources {
@@ -104,3 +126,11 @@ type resources struct {
 func (a resources) String() string {
 	return fmt.Sprintf("[cpu: alloc=%.1fvCPU, util=%.1f]\t[mem: alloc=%.1fGB, util=%.1f]", a.cpuAllocation, a.cpuUtilization, a.memAllocation, a.memUtilization)
 }
+
+// truncate the given string and replace the removed chars with some replacement (ex: "...")
+func truncate(str string, max int, replace string) string {
+	if len(str) <= max {
+		return str
+	}
+	return str[:max+1] + replace
+}

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@ import (`
`7`	`7`	`"github.com/spf13/cobra/doc"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+// verbose is a global flag for specifying that a command should give verbose output`
	`11`	`+var verbose bool = false`
	`12`	`+`
`10`	`13`	`// Make constructs the "coder" root command`
`11`	`14`	`func Make() *cobra.Command {`
`12`	`15`	`app := &cobra.Command{`
`@@ -28,6 +31,7 @@ func Make() *cobra.Command {`
`28`	`31`	`completionCmd,`
`29`	`32`	`genDocs(app),`
`30`	`33`	`)`
	`34`	`+ app.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "show verbose output")`
`31`	`35`	`return app`
`32`	`36`	`}`
`33`	`37`