mirror of
https://github.com/passbolt/go-passbolt-cli.git
synced 2025-05-12 10:58:21 +00:00
formatted code with go fmt
This commit is contained in:
parent
be07d31747
commit
ff9aa904c6
5 changed files with 64 additions and 64 deletions
|
@ -18,7 +18,7 @@ var createCmd = &cobra.Command{
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(createCmd)
|
rootCmd.AddCommand(createCmd)
|
||||||
createCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
createCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
||||||
createCmd.AddCommand(resource.ResourceCreateCmd)
|
createCmd.AddCommand(resource.ResourceCreateCmd)
|
||||||
createCmd.AddCommand(folder.FolderCreateCmd)
|
createCmd.AddCommand(folder.FolderCreateCmd)
|
||||||
createCmd.AddCommand(group.GroupCreateCmd)
|
createCmd.AddCommand(group.GroupCreateCmd)
|
||||||
|
|
|
@ -18,7 +18,7 @@ var getCmd = &cobra.Command{
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(getCmd)
|
rootCmd.AddCommand(getCmd)
|
||||||
getCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
getCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
||||||
getCmd.AddCommand(resource.ResourceGetCmd)
|
getCmd.AddCommand(resource.ResourceGetCmd)
|
||||||
getCmd.AddCommand(folder.FolderGetCmd)
|
getCmd.AddCommand(folder.FolderGetCmd)
|
||||||
getCmd.AddCommand(group.GroupGetCmd)
|
getCmd.AddCommand(group.GroupGetCmd)
|
||||||
|
|
|
@ -18,7 +18,7 @@ var listCmd = &cobra.Command{
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(listCmd)
|
rootCmd.AddCommand(listCmd)
|
||||||
listCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
listCmd.PersistentFlags().BoolP("json", "j", false, "Outputs JSON")
|
||||||
listCmd.AddCommand(resource.ResourceListCmd)
|
listCmd.AddCommand(resource.ResourceListCmd)
|
||||||
listCmd.AddCommand(folder.FolderListCmd)
|
listCmd.AddCommand(folder.FolderListCmd)
|
||||||
listCmd.AddCommand(group.GroupListCmd)
|
listCmd.AddCommand(group.GroupListCmd)
|
||||||
|
|
|
@ -2,7 +2,7 @@ package user
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/passbolt/go-passbolt-cli/util"
|
"github.com/passbolt/go-passbolt-cli/util"
|
||||||
|
@ -46,10 +46,10 @@ func UserCreate(cmd *cobra.Command, args []string) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
jsonOutput, err := cmd.Flags().GetBool("json")
|
jsonOutput, err := cmd.Flags().GetBool("json")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx := util.GetContext()
|
ctx := util.GetContext()
|
||||||
|
|
||||||
|
@ -63,28 +63,28 @@ func UserCreate(cmd *cobra.Command, args []string) error {
|
||||||
user, err := client.CreateUser(
|
user, err := client.CreateUser(
|
||||||
ctx,
|
ctx,
|
||||||
api.User{
|
api.User{
|
||||||
Username: username,
|
Username: username,
|
||||||
Profile: &api.Profile{
|
Profile: &api.Profile{
|
||||||
FirstName: firstname,
|
FirstName: firstname,
|
||||||
LastName: lastname,
|
LastName: lastname,
|
||||||
},
|
},
|
||||||
Role: &api.Role{
|
Role: &api.Role{
|
||||||
Name: role,
|
Name: role,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("Creating User: %w", err)
|
return fmt.Errorf("Creating User: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if jsonOutput {
|
if jsonOutput {
|
||||||
jsonUser, err := json.MarshalIndent(user, "", " ")
|
jsonUser, err := json.MarshalIndent(user, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Println(string(jsonUser))
|
fmt.Println(string(jsonUser))
|
||||||
} else {
|
} else {
|
||||||
fmt.Printf("UserID: %v\n", user.ID)
|
fmt.Printf("UserID: %v\n", user.ID)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
74
user/list.go
74
user/list.go
|
@ -2,7 +2,7 @@ package user
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ func UserList(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")
|
jsonOutput, err := cmd.Flags().GetBool("json")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
ctx := util.GetContext()
|
ctx := util.GetContext()
|
||||||
|
|
||||||
client, err := util.GetClient(ctx)
|
client, err := util.GetClient(ctx)
|
||||||
|
@ -80,38 +80,38 @@ func UserList(cmd *cobra.Command, args []string) error {
|
||||||
return fmt.Errorf("Listing User: %w", err)
|
return fmt.Errorf("Listing User: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if jsonOutput {
|
if jsonOutput {
|
||||||
jsonUser, err := json.MarshalIndent(users, "", " ")
|
jsonUser, err := json.MarshalIndent(users, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Println(string(jsonUser))
|
fmt.Println(string(jsonUser))
|
||||||
} else {
|
} else {
|
||||||
data := pterm.TableData{columns}
|
data := pterm.TableData{columns}
|
||||||
|
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
entry := make([]string, len(columns))
|
entry := make([]string, len(columns))
|
||||||
for i := range columns {
|
for i := range columns {
|
||||||
switch strings.ToLower(columns[i]) {
|
switch strings.ToLower(columns[i]) {
|
||||||
case "id":
|
case "id":
|
||||||
entry[i] = user.ID
|
entry[i] = user.ID
|
||||||
case "username":
|
case "username":
|
||||||
entry[i] = shellescape.StripUnsafe(user.Username)
|
entry[i] = shellescape.StripUnsafe(user.Username)
|
||||||
case "firstname":
|
case "firstname":
|
||||||
entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
|
entry[i] = shellescape.StripUnsafe(user.Profile.FirstName)
|
||||||
case "lastname":
|
case "lastname":
|
||||||
entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
|
entry[i] = shellescape.StripUnsafe(user.Profile.LastName)
|
||||||
case "role":
|
case "role":
|
||||||
entry[i] = shellescape.StripUnsafe(user.Role.Name)
|
entry[i] = shellescape.StripUnsafe(user.Role.Name)
|
||||||
default:
|
default:
|
||||||
cmd.SilenceUsage = false
|
cmd.SilenceUsage = false
|
||||||
return fmt.Errorf("Unknown Column: %v", columns[i])
|
return fmt.Errorf("Unknown Column: %v", columns[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
data = append(data, entry)
|
data = append(data, entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
pterm.DefaultTable.WithHasHeader().WithData(data).Render()
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue