changing to output of json or yaml

Signed-off-by: Christian Hernandez <[email protected]>

pkg/cli/whoami/whoami.go

@@ -2,6 +2,7 @@ package whoami
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -17,6 +18,7 @@ import (
 
 	userv1 "github.com/openshift/api/user/v1"
 	userv1typedclient "github.com/openshift/client-go/user/clientset/versioned/typed/user/v1"
+	"sigs.k8s.io/yaml"
 )
 
 const (
@@ -48,6 +50,7 @@ type WhoAmIOptions struct {
 	ShowServer     bool
 	ShowConsoleUrl bool
 	ShowGroups     bool
+	Output         string
 
 	genericclioptions.IOStreams
 }
@@ -77,7 +80,7 @@ func NewCmdWhoAmI(f kcmdutil.Factory, streams genericclioptions.IOStreams) *cobr
 	cmd.Flags().BoolVarP(&o.ShowContext, "show-context", "c", o.ShowContext, "Print the current user context name")
 	cmd.Flags().BoolVar(&o.ShowServer, "show-server", o.ShowServer, "If true, print the current server's REST API URL")
 	cmd.Flags().BoolVar(&o.ShowConsoleUrl, "show-console", o.ShowConsoleUrl, "If true, print the current server's web console URL")
-	cmd.Flags().BoolVarP(&o.ShowGroups, "show-groups", "g", o.ShowGroups, "Print the groups the current user belongs to.")
+	cmd.Flags().StringVarP(&o.Output, "output", "o", o.Output, "One of 'yaml' or 'json'.")
 
 	return cmd
 }
@@ -155,6 +158,29 @@ func (o *WhoAmIOptions) Run() error {
 		}
 		fmt.Fprintf(o.Out, "%s\n", consoleUrl)
 		return nil
+	case o.Output == "yaml":
+		u, err := o.WhoAmI()
+		if err != nil {
+			return err
+		}
+
+		y, err := yaml.Marshal(u)
+		if err != nil {
+			return err
+		}
+		fmt.Fprintf(o.Out, "%s\n", string(y))
+		return nil
+	case o.Output == "json":
+		u, err := o.WhoAmI()
+		if err != nil {
+			return err
+		}
+		j, err := json.MarshalIndent(u, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Fprintf(o.Out, "%s\n", string(j))
+		return nil
 	}
 
 	var err error
@@ -163,14 +189,7 @@ func (o *WhoAmIOptions) Run() error {
 		return err
 	}
 
-	u, err := o.WhoAmI()
-
-	if o.ShowGroups && len(u.Groups) > 0 {
-		fmt.Fprintf(o.Out, "%s\n", "Groups:")
-		for _, group := range u.Groups {
-			fmt.Fprintf(o.Out, "- %s\n", group)
-		}
-	}
+	_, err = o.WhoAmI()
 
 	return err
 }