Merge pull request #162 from markylaing/format-flag

Adds a format flag when listing tokens and cluster members.
canonical · Sep 18, 2023 · f475486 · f475486
2 parents fea03ad + 35a0900
commit f475486
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/microcloud/cmd/microcloud/cluster_members.go b/microcloud/cmd/microcloud/cluster_members.go
@@ -36,7 +36,8 @@ func (c *cmdClusterMembers) Run(cmd *cobra.Command, args []string) error {
 }
 
 type cmdClusterMembersList struct {
-	common *CmdControl
+	common     *CmdControl
+	flagFormat string
 }
 
 func (c *cmdClusterMembersList) Command() *cobra.Command {
@@ -46,6 +47,8 @@ func (c *cmdClusterMembersList) Command() *cobra.Command {
 		RunE:  c.Run,
 	}
 
+	cmd.Flags().StringVarP(&c.flagFormat, "format", "f", cli.TableFormatTable, "Format (csv|json|table|yaml|compact)")
+
 	return cmd
 }
 
@@ -94,7 +97,7 @@ func (c *cmdClusterMembersList) Run(cmd *cobra.Command, args []string) error {
 	header := []string{"NAME", "ADDRESS", "ROLE", "FINGERPRINT", "STATUS"}
 	sort.Sort(cli.SortColumnsNaturally(data))
 
-	return cli.RenderTable(cli.TableFormatTable, header, data, clusterMembers)
+	return cli.RenderTable(c.flagFormat, header, data, clusterMembers)
 }
 
 type cmdClusterMemberRemove struct {

diff --git a/microcloud/cmd/microcloud/tokens.go b/microcloud/cmd/microcloud/tokens.go
@@ -73,7 +73,8 @@ func (c *cmdTokensAdd) Run(cmd *cobra.Command, args []string) error {
 }
 
 type cmdTokensList struct {
-	common *CmdControl
+	common     *CmdControl
+	flagFormat string
 }
 
 func (c *cmdTokensList) Command() *cobra.Command {
@@ -83,6 +84,8 @@ func (c *cmdTokensList) Command() *cobra.Command {
 		RunE:  c.Run,
 	}
 
+	cmd.Flags().StringVarP(&c.flagFormat, "format", "f", cli.TableFormatTable, "Format (csv|json|table|yaml|compact)")
+
 	return cmd
 }
 
@@ -110,7 +113,7 @@ func (c *cmdTokensList) Run(cmd *cobra.Command, args []string) error {
 	header := []string{"NAME", "TOKENS"}
 	sort.Sort(cli.SortColumnsNaturally(data))
 
-	return cli.RenderTable(cli.TableFormatTable, header, data, records)
+	return cli.RenderTable(c.flagFormat, header, data, records)
 }
 
 type cmdTokensRevoke struct {