Add User Json Output

user/get.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"github.com/alessio/shellescape"
@@ -29,6 +30,10 @@ func UserGet(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	jsonOutput, err := cmd.Flags().GetBool("json")
+	if err != nil {
+		return err
+	}
 
 	ctx := util.GetContext()
 
@@ -47,10 +52,22 @@ func UserGet(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("Getting User: %w", err)
 	}
-	fmt.Printf("Username: %v\n", shellescape.StripUnsafe(username))
+	if jsonOutput {
-	fmt.Printf("FirstName: %v\n", shellescape.StripUnsafe(firstname))
+		jsonUser, err := json.MarshalIndent(UserJsonOutput{
-	fmt.Printf("LastName: %v\n", shellescape.StripUnsafe(lastname))
+			Username:  &username,
-	fmt.Printf("Role: %v\n", shellescape.StripUnsafe(role))
+			FirstName: &firstname,
-
+			LastName:  &lastname,
+			Role:      &role,
+		}, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonUser))
+	} else {
+		fmt.Printf("Username: %v\n", shellescape.StripUnsafe(username))
+		fmt.Printf("FirstName: %v\n", shellescape.StripUnsafe(firstname))
+		fmt.Printf("LastName: %v\n", shellescape.StripUnsafe(lastname))
+		fmt.Printf("Role: %v\n", shellescape.StripUnsafe(role))
+	}
 	return nil
 }

user/json.go

@@ -0,0 +1,13 @@
+package user
+
+import "time"
+
+type UserJsonOutput struct {
+	ID                *string    `json:"id,omitempty"`
+	Username          *string    `json:"username,omitempty"`
+	FirstName         *string    `json:"first_name,omitempty"`
+	LastName          *string    `json:"last_name,omitempty"`
+	Role              *string    `json:"role,omitempty"`
+	CreatedTimestamp  *time.Time `json:"created_timestamp,omitempty"`
+	ModifiedTimestamp *time.Time `json:"modified_timestamp,omitempty"`
+}

user/list.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -57,6 +58,10 @@ func UserList(cmd *cobra.Command, args []string) error {
 	if len(columns) == 0 {
 		return fmt.Errorf("You need to specify atleast one column to return")
 	}
+	jsonOutput, err := cmd.Flags().GetBool("json")
+	if err != nil {
+		return err
+	}
 
 	ctx := util.GetContext()
 
@@ -77,34 +82,54 @@ func UserList(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Listing User: %w", err)
 	}
 
-	data := pterm.TableData{columns}
+	if jsonOutput {
-
+		outputUsers := []UserJsonOutput{}
-	for _, user := range users {
+		for i := range users {
-		entry := make([]string, len(columns))
+			outputUsers = append(outputUsers, UserJsonOutput{
-		for i := range columns {
+				ID:                &users[i].ID,
-			switch strings.ToLower(columns[i]) {
+				Username:          &users[i].Username,
-			case "id":
+				FirstName:         &users[i].Profile.FirstName,
-				entry[i] = user.ID
+				LastName:          &users[i].Profile.LastName,
-			case "username":
+				Role:              &users[i].Role.Name,
-				entry[i] = shellescape.StripUnsafe(user.Username)
+				CreatedTimestamp:  &users[i].Created.Time,
-			case "firstname":
+				ModifiedTimestamp: &users[i].Modified.Time,
-				entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
+			})
-			case "lastname":
-				entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
-			case "role":
-				entry[i] = shellescape.StripUnsafe(user.Role.Name)
-			case "createdtimestamp":
-				entry[i] = user.Created.Format(time.RFC3339)
-			case "modifiedtimestamp":
-				entry[i] = user.Modified.Format(time.RFC3339)
-			default:
-				cmd.SilenceUsage = false
-				return fmt.Errorf("Unknown Column: %v", columns[i])
-			}
 		}
-		data = append(data, entry)
+		jsonUsers, err := json.MarshalIndent(outputUsers, "", "  ")
-	}
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonUsers))
+	} else {
+		data := pterm.TableData{columns}
 
-	pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		for _, user := range users {
+			entry := make([]string, len(columns))
+			for i := range columns {
+				switch strings.ToLower(columns[i]) {
+				case "id":
+					entry[i] = user.ID
+				case "username":
+					entry[i] = shellescape.StripUnsafe(user.Username)
+				case "firstname":
+					entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
+				case "lastname":
+					entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
+				case "role":
+					entry[i] = shellescape.StripUnsafe(user.Role.Name)
+				case "createdtimestamp":
+					entry[i] = user.Created.Format(time.RFC3339)
+				case "modifiedtimestamp":
+					entry[i] = user.Modified.Format(time.RFC3339)
+				default:
+					cmd.SilenceUsage = false
+					return fmt.Errorf("Unknown Column: %v", columns[i])
+				}
+			}
+			data = append(data, entry)
+		}
+
+		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+	}
 	return nil
 }