mirror of
https://github.com/passbolt/go-passbolt-cli.git
synced 2025-05-14 11:48:20 +00:00
Add Group Json Output
This commit is contained in:
parent
269e117fbf
commit
4dcb528f70
3 changed files with 116 additions and 46 deletions
29
group/get.go
29
group/get.go
|
@ -2,6 +2,7 @@ package group
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -37,6 +38,10 @@ func GroupGet(cmd *cobra.Command, args []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
jsonOutput, err := cmd.Flags().GetBool("json")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
ctx := util.GetContext()
|
ctx := util.GetContext()
|
||||||
|
|
||||||
|
@ -55,6 +60,29 @@ func GroupGet(cmd *cobra.Command, args []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Getting Group: %w", err)
|
return fmt.Errorf("Getting Group: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if jsonOutput {
|
||||||
|
groupUserMemberships := []GroupUserMembershipJsonOutput{}
|
||||||
|
for i := range memberships {
|
||||||
|
groupUserMemberships = append(groupUserMemberships, GroupUserMembershipJsonOutput{
|
||||||
|
ID: &memberships[i].UserID,
|
||||||
|
Username: &memberships[i].Username,
|
||||||
|
FirstName: &memberships[i].UserFirstName,
|
||||||
|
LastName: &memberships[i].UserLastName,
|
||||||
|
IsGroupManager: &memberships[i].IsGroupManager,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
fmt.Printf("Name: %v\n", name)
|
||||||
// Print Memberships
|
// Print Memberships
|
||||||
if len(columns) != 0 {
|
if len(columns) != 0 {
|
||||||
|
@ -84,5 +112,6 @@ func GroupGet(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
19
group/json.go
Normal file
19
group/json.go
Normal file
|
@ -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"`
|
||||||
|
}
|
|
@ -2,6 +2,7 @@ package group
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -46,6 +47,10 @@ func GroupList(cmd *cobra.Command, args []string) error {
|
||||||
if len(columns) == 0 {
|
if len(columns) == 0 {
|
||||||
return fmt.Errorf("You need to specify atleast one column to return")
|
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()
|
ctx := util.GetContext()
|
||||||
|
|
||||||
|
@ -64,6 +69,22 @@ func GroupList(cmd *cobra.Command, args []string) error {
|
||||||
return fmt.Errorf("Listing Group: %w", err)
|
return fmt.Errorf("Listing Group: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if jsonOutput {
|
||||||
|
outputGroups := []GroupJsonOutput{}
|
||||||
|
for i := range groups {
|
||||||
|
outputGroups = append(outputGroups, GroupJsonOutput{
|
||||||
|
ID: &groups[i].ID,
|
||||||
|
Name: &groups[i].Name,
|
||||||
|
CreatedTimestamp: &groups[i].Created.Time,
|
||||||
|
ModifiedTimestamp: &groups[i].Modified.Time,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
jsonGroups, err := json.MarshalIndent(outputGroups, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fmt.Println(string(jsonGroups))
|
||||||
|
} else {
|
||||||
data := pterm.TableData{columns}
|
data := pterm.TableData{columns}
|
||||||
|
|
||||||
for _, group := range groups {
|
for _, group := range groups {
|
||||||
|
@ -87,5 +108,6 @@ func GroupList(cmd *cobra.Command, args []string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue