Merge pull request #350 from manifoldco/colorize-machine-state

Colorize machine state

Author: ianlivingstone

cmd/machines.go

@@ -11,10 +11,10 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/juju/ansiterm"
 	"github.com/manifoldco/go-base32"
 	"github.com/manifoldco/go-base64"
 	"github.com/urfave/cli"
-	"github.com/juju/ansiterm"
 
 	"github.com/manifoldco/torus-cli/api"
 	"github.com/manifoldco/torus-cli/apitypes"
@@ -282,7 +282,7 @@ func viewMachineCmd(ctx *cli.Context) error {
 
 	// Created profile
 	creator := profileMap[*machineBody.CreatedBy]
-	createdBy := creator.Body.Username + " (" + creator.Body.Name + ")"
+	createdBy := creator.Body.Name + " (" + ui.Faint(creator.Body.Username) + ")"
 	createdOn := machineBody.Created.Format(time.RFC3339)
 
 	// Destroyed profile
@@ -291,7 +291,7 @@ func viewMachineCmd(ctx *cli.Context) error {
 	if machineBody.State == primitive.MachineDestroyedState {
 		destroyer := profileMap[*machineBody.DestroyedBy]
 		destroyedOn = machineBody.Destroyed.Format(time.RFC3339)
-		destroyedBy = destroyer.Body.Username + " (" + destroyer.Body.Name + ")"
+		destroyedBy = destroyer.Body.Name + " (" + ui.Faint(destroyer.Body.Name) + ")"
 	}
 
 	// Membership info
@@ -309,29 +309,24 @@ func viewMachineCmd(ctx *cli.Context) error {
 
 	fmt.Println("")
 	w1 := tabwriter.NewWriter(os.Stdout, 0, 0, 8, ' ', 0)
-	fmt.Fprintf(w1, "ID:\t%s\n", machine.ID)
-	fmt.Fprintf(w1, "Name:\t%s\n", machineBody.Name)
-	fmt.Fprintf(w1, "Role:\t%s\n", roleOutput)
-	fmt.Fprintf(w1, "State:\t%s\n", machineBody.State)
-	fmt.Fprintf(w1, "Created By:\t%s\n", createdBy)
-	fmt.Fprintf(w1, "Created On:\t%s\n", createdOn)
-	fmt.Fprintf(w1, "Destroyed By:\t%s\n", destroyedBy)
-	fmt.Fprintf(w1, "Destroyed On:\t%s\n", destroyedOn)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("ID"), machine.ID)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Name"), ui.Faint(machineBody.Name))
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Role"), roleOutput)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("State"), colorizeMachineState(machineBody.State))
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Created By"), createdBy)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Created On"), createdOn)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Destroyed By"), destroyedBy)
+	fmt.Fprintf(w1, "%s:\t%s\n", ui.Bold("Destroyed On"), destroyedOn)
 	w1.Flush()
 	fmt.Println("")
 
 	w2 := ansiterm.NewTabWriter(os.Stdout, 2, 0, 3, ' ', 0)
 	fmt.Fprintf(w2, "%s\t%s\t%s\t%s\n", ui.Bold("Token ID"), ui.Bold("State"), ui.Bold("Created By"), ui.Bold("Created On"))
 	for _, token := range machineSegment.Tokens {
 		tokenID := token.Token.ID
-		var state string
-		if token.Token.Body.State == "active" {
-			state = ui.Color(ui.Green, token.Token.Body.State)
-		} else {
-			state = ui.Color(ui.Red, token.Token.Body.State)
-		}
+		state := colorizeMachineState(token.Token.Body.State)
 		creator := profileMap[*token.Token.Body.CreatedBy]
-		createdBy := creator.Body.Username + " (" + creator.Body.Name + ")"
+		createdBy := creator.Body.Name + " (" + ui.Faint(creator.Body.Username) + ")"
 		createdOn := token.Token.Body.Created.Format(time.RFC3339)
 		fmt.Fprintf(w2, "%s\t%s\t%s\t%s\n", tokenID, state, createdBy, createdOn)
 	}
@@ -342,6 +337,17 @@ func viewMachineCmd(ctx *cli.Context) error {
 	return nil
 }
 
+func colorizeMachineState(state string) string {
+	switch state {
+	case "active":
+		return ui.Color(ui.Green, state)
+	case "destroyed":
+		return ui.Color(ui.Red, state)
+	default:
+		return state
+	}
+}
+
 func listMachinesCmd(ctx *cli.Context) error {
 	cfg, err := config.LoadConfig()
 	if err != nil {
@@ -417,13 +423,9 @@ func listMachinesCmd(ctx *cli.Context) error {
 				roleName = role.Name
 			}
 		}
-		var state string
-		if m.State == "active" {
-			state = ui.Color(ui.Green, m.State)
-		} else {
-			state = ui.Color(ui.Red, m.State)
-		}
-		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", mID, m.Name, state, roleName, m.Created.Format(time.RFC3339))
+
+		state := colorizeMachineState(state)
+		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", mID, ui.Faint(m.Name), state, roleName, m.Created.Format(time.RFC3339))
 	}
 	w.Flush()
 	fmt.Println("")
@@ -650,9 +652,9 @@ func createMachine(ctx *cli.Context) error {
 	w := tabwriter.NewWriter(os.Stdout, 2, 0, 1, ' ', 0)
 
 	tokenID := machine.Tokens[0].Token.ID
-	fmt.Fprintf(w, "Machine ID:\t%s\n", machine.Machine.ID)
-	fmt.Fprintf(w, "Machine Token ID:\t%s\n", tokenID)
-	fmt.Fprintf(w, "Machine Token Secret:\t%s\n", tokenSecret)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine ID"), machine.Machine.ID)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine Token ID"), tokenID)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine Token Secret"), tokenSecret)
 
 	w.Flush()
 	hints.Display(hints.Allow, hints.Deny)

cmd/profile.go

@@ -11,6 +11,7 @@ import (
 	"github.com/manifoldco/torus-cli/apitypes"
 	"github.com/manifoldco/torus-cli/config"
 	"github.com/manifoldco/torus-cli/errs"
+	"github.com/manifoldco/torus-cli/ui"
 
 	"github.com/urfave/cli"
 )
@@ -57,13 +58,13 @@ func profileView(ctx *cli.Context) error {
 
 	w := tabwriter.NewWriter(os.Stdout, 2, 0, 1, ' ', 0)
 	if session.Type() == apitypes.MachineSession {
-		fmt.Fprintf(w, "Machine ID:\t%s\n", session.ID())
-		fmt.Fprintf(w, "Machine Token ID:\t%s\n", session.AuthID())
-		fmt.Fprintf(w, "Machine Name:\t%s\n", session.Username())
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine ID"), session.ID())
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine Token ID"), session.AuthID())
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Machine Name"), ui.Faint(session.Username()))
 	} else {
-		fmt.Fprintf(w, "Name:\t%s\n", session.Name())
-		fmt.Fprintf(w, "Email:\t%s\n", session.Email())
-		fmt.Fprintf(w, "Username:\t%s\n", session.Username())
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Name"), session.Name())
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Username"), ui.Faint(session.Username()))
+		fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Email"), session.Email())
 	}
 
 	w.Flush()

cmd/status.go

@@ -11,6 +11,7 @@ import (
 	"github.com/manifoldco/torus-cli/config"
 	"github.com/manifoldco/torus-cli/errs"
 	"github.com/manifoldco/torus-cli/prefs"
+	"github.com/manifoldco/torus-cli/ui"
 
 	"github.com/urfave/cli"
 )
@@ -93,17 +94,17 @@ func statusCmd(ctx *cli.Context) error {
 	instance := ctx.String("instance")
 
 	w := tabwriter.NewWriter(os.Stdout, 2, 0, 1, ' ', 0)
-	fmt.Fprintf(w, "Org:\t%s\n", org)
-	fmt.Fprintf(w, "Project:\t%s\n", project)
-	fmt.Fprintf(w, "Environment:\t%s\n", env)
-	fmt.Fprintf(w, "Service:\t%s\n", service)
-	fmt.Fprintf(w, "Identity:\t%s\n", identity)
-	fmt.Fprintf(w, "Instance:\t%s\n", instance)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Org"), org)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Project"), project)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Environment"), env)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Service"), service)
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Identity"), ui.Faint(identity))
+	fmt.Fprintf(w, "%s:\t%s\n", ui.Bold("Instance"), instance)
 	w.Flush()
 
 	parts := []string{"", org, project, env, service, identity, instance}
 	credPath := strings.Join(parts, "/")
-	fmt.Printf("\nCredential path: %s\n", credPath)
+	fmt.Printf("\n%s: %s\n", ui.Bold("Credential Path"), credPath)
 
 	return nil
 }