Add Group Json Output

group/get.go

@@ -2,6 +2,7 @@ package group
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -37,6 +38,10 @@ func GroupGet(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()
 
@@ -55,34 +60,58 @@ func GroupGet(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("Getting Group: %w", err)
 	}
-	fmt.Printf("Name: %v\n", name)
-	// Print Memberships
-	if len(columns) != 0 {
-		data := pterm.TableData{columns}
 
-		for _, membership := range memberships {
+	if jsonOutput {
-			entry := make([]string, len(columns))
+		groupUserMemberships := []GroupUserMembershipJsonOutput{}
-			for i := range columns {
+		for i := range memberships {
-				switch strings.ToLower(columns[i]) {
+			groupUserMemberships = append(groupUserMemberships, GroupUserMembershipJsonOutput{
-				case "userid":
+				ID:             &memberships[i].UserID,
-					entry[i] = membership.UserID
+				Username:       &memberships[i].Username,
-				case "isgroupmanager":
+				FirstName:      &memberships[i].UserFirstName,
-					entry[i] = fmt.Sprint(membership.IsGroupManager)
+				LastName:       &memberships[i].UserLastName,
-				case "username":
+				IsGroupManager: &memberships[i].IsGroupManager,
-					entry[i] = shellescape.StripUnsafe(membership.Username)
+			})
-				case "userfirstname":
-					entry[i] = shellescape.StripUnsafe(membership.UserFirstName)
-				case "userlastname":
-					entry[i] = shellescape.StripUnsafe(membership.UserLastName)
-				default:
-					cmd.SilenceUsage = false
-					return fmt.Errorf("Unknown Column: %v", columns[i])
-				}
-			}
-			data = append(data, entry)
 		}
 
-		pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		jsonGroup, err := json.MarshalIndent(GroupJsonOutput{
+			Name:  &name,
+			Users: groupUserMemberships,
+		}, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonGroup))
+
+	} else {
+		fmt.Printf("Name: %v\n", name)
+		// Print Memberships
+		if len(columns) != 0 {
+			data := pterm.TableData{columns}
+
+			for _, membership := range memberships {
+				entry := make([]string, len(columns))
+				for i := range columns {
+					switch strings.ToLower(columns[i]) {
+					case "userid":
+						entry[i] = membership.UserID
+					case "isgroupmanager":
+						entry[i] = fmt.Sprint(membership.IsGroupManager)
+					case "username":
+						entry[i] = shellescape.StripUnsafe(membership.Username)
+					case "userfirstname":
+						entry[i] = shellescape.StripUnsafe(membership.UserFirstName)
+					case "userlastname":
+						entry[i] = shellescape.StripUnsafe(membership.UserLastName)
+					default:
+						cmd.SilenceUsage = false
+						return fmt.Errorf("Unknown Column: %v", columns[i])
+					}
+				}
+				data = append(data, entry)
+			}
+
+			pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		}
 	}
 	return nil
 }

group/json.go

@@ -0,0 +1,19 @@
+package group
+
+import "time"
+
+type GroupJsonOutput struct {
+	ID                *string                         `json:"id,omitempty"`
+	Name              *string                         `json:"name,omitempty"`
+	Users             []GroupUserMembershipJsonOutput `json:"users,omitempty"`
+	CreatedTimestamp  *time.Time                      `json:"created_timestamp,omitempty"`
+	ModifiedTimestamp *time.Time                      `json:"modified_timestamp,omitempty"`
+}
+
+type GroupUserMembershipJsonOutput struct {
+	ID             *string `json:"id,omitempty"`
+	Username       *string `json:"username,omitempty"`
+	FirstName      *string `json:"first_name,omitempty"`
+	LastName       *string `json:"last_name,omitempty"`
+	IsGroupManager *bool   `json:"is_group_manager,omitempty"`
+}

group/list.go

@@ -2,6 +2,7 @@ package group
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -46,6 +47,10 @@ func GroupList(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()
 
@@ -64,28 +69,45 @@ func GroupList(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Listing Group: %w", err)
 	}
 
-	data := pterm.TableData{columns}
+	if jsonOutput {
-
+		outputGroups := []GroupJsonOutput{}
-	for _, group := range groups {
+		for i := range groups {
-		entry := make([]string, len(columns))
+			outputGroups = append(outputGroups, GroupJsonOutput{
-		for i := range columns {
+				ID:                &groups[i].ID,
-			switch strings.ToLower(columns[i]) {
+				Name:              &groups[i].Name,
-			case "id":
+				CreatedTimestamp:  &groups[i].Created.Time,
-				entry[i] = group.ID
+				ModifiedTimestamp: &groups[i].Modified.Time,
-			case "name":
+			})
-				entry[i] = shellescape.StripUnsafe(group.Name)
-			case "createdtimestamp":
-				entry[i] = group.Created.Format(time.RFC3339)
-			case "modifiedtimestamp":
-				entry[i] = group.Modified.Format(time.RFC3339)
-			default:
-				cmd.SilenceUsage = false
-				return fmt.Errorf("Unknown Column: %v", columns[i])
-			}
 		}
-		data = append(data, entry)
+		jsonGroups, err := json.MarshalIndent(outputGroups, "", "  ")
-	}
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(jsonGroups))
+	} else {
+		data := pterm.TableData{columns}
 
-	pterm.DefaultTable.WithHasHeader().WithData(data).Render()
+		for _, group := range groups {
+			entry := make([]string, len(columns))
+			for i := range columns {
+				switch strings.ToLower(columns[i]) {
+				case "id":
+					entry[i] = group.ID
+				case "name":
+					entry[i] = shellescape.StripUnsafe(group.Name)
+				case "createdtimestamp":
+					entry[i] = group.Created.Format(time.RFC3339)
+				case "modifiedtimestamp":
+					entry[i] = group.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
 }