move FindUsersInGroup to users.ls

Closes: #2945

Author: Hrabur Stoyanov

govc/USAGE.md

@@ -4654,11 +4654,9 @@ List SSO groups.
 Examples:
   govc sso.group.ls
   govc sso.group.ls group-name # list groups in group-name
-  govc sso.group.ls -users group-name # list users in group-name instead groups
-  govc sso.group.ls -s Admin # search for groups`
+  govc sso.group.ls -search Admin # search for groups`
 Options:
-  -s string # search for groups or users
-  -users # list users in group-name instead groups
+  -search string # search for groups
 ```
 
 ## sso.group.rm
@@ -4780,9 +4778,11 @@ List SSO users.
 
 Examples:
   govc sso.user.ls -s
-
+  govc sso.user.ls -group group-name # list users in group-name
 Options:
   -s=false               List solution users
+  -group                 List users in group-name
+  -search                Search string to list users in group
 ```
 
 ## sso.user.rm

govc/sso/group/ls.go

@@ -35,7 +35,6 @@ type ls struct {
 	*flags.OutputFlag
 
 	search string
-	users  bool
 }
 
 func init() {
@@ -49,8 +48,7 @@ func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
 	cmd.OutputFlag.Register(ctx, f)
 
-	f.StringVar(&cmd.search, "s", "", "Search")
-	f.BoolVar(&cmd.users, "users", false, "List users in group")
+	f.StringVar(&cmd.search, "search", "", "Search")
 }
 
 func (cmd *ls) Usage() string {
@@ -63,8 +61,7 @@ func (cmd *ls) Description() string {
 Examples:
   govc sso.group.ls
   govc sso.group.ls group-name # list groups in group-name
-  govc sso.group.ls -users group-name # list users in group-name instead groups
-  govc sso.group.ls -s Admin # search for groups`
+  govc sso.group.ls -search Admin # search for groups`
 }
 
 func (cmd *ls) Process(ctx context.Context) error {
@@ -88,43 +85,19 @@ func (r groupResult) Write(w io.Writer) error {
 	return tw.Flush()
 }
 
-type userResult []types.AdminUser
-
-func (r userResult) Dump() interface{} {
-	return []types.AdminUser(r)
-}
-
-func (r userResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-	for _, info := range r {
-		fmt.Fprintf(tw, "%s\t%s\n", info.Id.Name, info.Description)
-	}
-	return tw.Flush()
-}
-
 func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
 	return sso.WithClient(ctx, cmd.ClientFlag, func(c *ssoadmin.Client) error {
-		if f.NArg() == 0 && !cmd.users {
+		if f.NArg() == 0 {
 			info, err := c.FindGroups(ctx, cmd.search)
 			if err != nil {
 				return err
 			}
 			return cmd.WriteResult(groupResult(info))
 		}
-		if f.NArg() != 0 && cmd.users {
-			info, err := c.FindUsersInGroup(ctx, f.Arg(0), cmd.search)
-			if err != nil {
-				return err
-			}
-			return cmd.WriteResult(userResult(info))
-		}
-		if f.NArg() != 0 {
-			info, err := c.FindGroupsInGroup(ctx, f.Arg(0), cmd.search)
-			if err != nil {
-				return err
-			}
-			return cmd.WriteResult(groupResult(info))
+		info, err := c.FindGroupsInGroup(ctx, f.Arg(0), cmd.search)
+		if err != nil {
+			return err
 		}
-		return flag.ErrHelp
+		return cmd.WriteResult(groupResult(info))
 	})
 }

govc/sso/user/ls.go

@@ -35,6 +35,8 @@ type ls struct {
 	*flags.OutputFlag
 
 	solution bool
+	group    bool
+	search   string
 }
 
 func init() {
@@ -49,13 +51,16 @@ func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.OutputFlag.Register(ctx, f)
 
 	f.BoolVar(&cmd.solution, "s", false, "List solution users")
+	f.BoolVar(&cmd.group, "group", false, "List users in group")
+	f.StringVar(&cmd.search, "search", "", "Search users in group")
 }
 
 func (cmd *ls) Description() string {
 	return `List SSO users.
 
 Examples:
-  govc sso.user.ls -s`
+  govc sso.user.ls -s
+  govc sso.user.ls -group group-name`
 }
 
 func (cmd *ls) Process(ctx context.Context) error {
@@ -65,6 +70,20 @@ func (cmd *ls) Process(ctx context.Context) error {
 	return cmd.OutputFlag.Process(ctx)
 }
 
+type userResult []types.AdminUser
+
+func (r userResult) Dump() interface{} {
+	return []types.AdminUser(r)
+}
+
+func (r userResult) Write(w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
+	for _, info := range r {
+		fmt.Fprintf(tw, "%s\t%s\n", info.Id.Name, info.Description)
+	}
+	return tw.Flush()
+}
+
 type solutionResult []types.AdminSolutionUser
 
 func (r solutionResult) Dump() interface{} {
@@ -98,14 +117,27 @@ func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
 
 	return sso.WithClient(ctx, cmd.ClientFlag, func(c *ssoadmin.Client) error {
 		if cmd.solution {
+			if f.NArg() != 0 {
+				return flag.ErrHelp
+			}
 			info, err := c.FindSolutionUsers(ctx, arg)
 			if err != nil {
 				return err
 			}
 
 			return cmd.WriteResult(solutionResult(info))
 		}
+		if cmd.group {
+			if f.NArg() == 0 {
+				return flag.ErrHelp
+			}
+			info, err := c.FindUsersInGroup(ctx, f.Arg(0), cmd.search)
+			if err != nil {
+				return err
+			}
 
+			return cmd.WriteResult(userResult(info))
+		}
 		info, err := c.FindPersonUsers(ctx, arg)
 		if err != nil {
 			return err