Use an interface to encapsulate CSV values

internal/cmd/backup/backup.go

@@ -50,6 +50,10 @@ func (b *Backup) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(b.orig, "", "  ")
 }
 
+func (b *Backup) MarshalCSVValue() interface{} {
+	return []*Backup{b}
+}
+
 func (b Backups) String() string {
 	var buf strings.Builder
 	tableprinter.Print(&buf, b)

internal/cmd/backup/show.go

@@ -65,7 +65,7 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 
 			end()
 
-			return ch.Printer.PrintResource(toBackups([]*planetscale.Backup{bkp}))
+			return ch.Printer.PrintResource(toBackup(bkp))
 		},
 	}
 

internal/cmd/backup/show_test.go

@@ -27,9 +27,7 @@ func TestBackup_ShowCmd(t *testing.T) {
 	branch := "development"
 	backup := "mybackup"
 
-	res := []*ps.Backup{
-		{Name: "foo"},
-	}
+	res := &ps.Backup{Name: "foo"}
 
 	svc := &mock.BackupsService{
 		GetFn: func(ctx context.Context, req *ps.GetBackupRequest) (*ps.Backup, error) {
@@ -38,7 +36,7 @@ func TestBackup_ShowCmd(t *testing.T) {
 			c.Assert(req.Branch, qt.Equals, branch)
 			c.Assert(req.Backup, qt.Equals, backup)
 
-			return res[0], nil
+			return res, nil
 		},
 	}
 

internal/cmd/branch/branch.go

@@ -46,6 +46,10 @@ func (d *DatabaseBranch) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(d.orig, "", "  ")
 }
 
+func (d *DatabaseBranch) MarshalCSVValue() interface{} {
+	return []*DatabaseBranch{d}
+}
+
 // toDatabaseBranch returns a struct that prints out the various fields of a
 // database model.
 func toDatabaseBranch(db *ps.DatabaseBranch) *DatabaseBranch {

internal/cmd/branch/show.go

@@ -63,7 +63,7 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 
 			end()
 
-			return ch.Printer.PrintResource(toDatabaseBranches([]*planetscale.DatabaseBranch{b}))
+			return ch.Printer.PrintResource(toDatabaseBranch(b))
 		},
 	}
 

internal/cmd/branch/show_test.go

@@ -26,17 +26,15 @@ func TestBranch_ShowCmd(t *testing.T) {
 	db := "planetscale"
 	branch := "development"
 
-	res := []*ps.DatabaseBranch{
-		{Name: branch},
-	}
+	res := &ps.DatabaseBranch{Name: branch}
 
 	svc := &mock.DatabaseBranchesService{
 		GetFn: func(ctx context.Context, req *ps.GetDatabaseBranchRequest) (*ps.DatabaseBranch, error) {
 			c.Assert(req.Branch, qt.Equals, branch)
 			c.Assert(req.Database, qt.Equals, db)
 			c.Assert(req.Organization, qt.Equals, org)
 
-			return res[0], nil
+			return res, nil
 		},
 	}
 

internal/cmd/database/database.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/gocarina/gocsv"
 	"github.com/planetscale/cli/internal/cmdutil"
 	"github.com/spf13/cobra"
 
@@ -72,6 +71,6 @@ func (d *Database) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(d.orig, "", "  ")
 }
 
-func (d *Database) MarshalCSV() (string, error) {
-	return gocsv.MarshalString([]*Database{d})
+func (d *Database) MarshalCSVValue() interface{} {
+	return []*Database{d}
 }

internal/cmd/database/show.go

@@ -8,7 +8,6 @@ import (
 	"github.com/planetscale/cli/internal/printer"
 
 	"github.com/planetscale/planetscale-go/planetscale"
-	ps "github.com/planetscale/planetscale-go/planetscale"
 
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
@@ -62,7 +61,7 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 			}
 			end()
 
-			return ch.Printer.PrintResource(toDatabases([]*ps.Database{database}))
+			return ch.Printer.PrintResource(toDatabase(database))
 		},
 	}
 

internal/cmd/database/show_test.go

@@ -25,16 +25,14 @@ func TestDatabase_ShowCmd(t *testing.T) {
 	org := "planetscale"
 	db := "planetscale"
 
-	res := []*ps.Database{
-		{Name: "foo"},
-	}
+	res := &ps.Database{Name: "foo"}
 
 	svc := &mock.DatabaseService{
 		GetFn: func(ctx context.Context, req *ps.GetDatabaseRequest) (*ps.Database, error) {
 			c.Assert(req.Organization, qt.Equals, org)
 			c.Assert(req.Database, qt.Equals, db)
 
-			return res[0], nil
+			return res, nil
 		},
 	}
 

internal/cmd/deployrequest/dr.go

@@ -50,6 +50,10 @@ type DeployRequest struct {
 	ClosedAt  *int64 `header:"closed_at,timestamp(ms|utc|human),-" json:"closed_at"`
 }
 
+func (d *DeployRequest) MarshalCSVValue() interface{} {
+	return []*DeployRequest{d}
+}
+
 func toDeployRequest(dr *planetscale.DeployRequest) *DeployRequest {
 	return &DeployRequest{
 		ID:                  dr.ID,

internal/cmd/deployrequest/show.go

@@ -60,7 +60,7 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 				}
 			}
 
-			return ch.Printer.PrintResource(toDeployRequests([]*planetscale.DeployRequest{dr}))
+			return ch.Printer.PrintResource(toDeployRequest(dr))
 		},
 	}
 

internal/cmd/deployrequest/show_test.go

@@ -57,6 +57,6 @@ func TestDeployRequest_ShowCmd(t *testing.T) {
 	c.Assert(err, qt.IsNil)
 	c.Assert(svc.GetFnInvoked, qt.IsTrue)
 
-	res := []*DeployRequest{{Number: number}}
+	res := &DeployRequest{Number: number}
 	c.Assert(buf.String(), qt.JSONEquals, res)
 }

internal/cmd/org/show.go

@@ -52,11 +52,15 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 				return nil
 			}
 
-			var res = []struct {
-				Org string `json:"org"`
-			}{{Org: cfg.Organization}}
+			if ch.Printer.Format() == printer.CSV {
+				var res = []struct {
+					Org string `json:"org"`
+				}{{Org: cfg.Organization}}
 
-			return ch.Printer.PrintResource(res)
+				return ch.Printer.PrintResource(res)
+			}
+
+			return ch.Printer.PrintResource(map[string]string{"org": cfg.Organization})
 		},
 	}
 

internal/cmd/snapshot/show.go

@@ -44,7 +44,7 @@ func ShowCmd(ch *cmdutil.Helper) *cobra.Command {
 			}
 			end()
 
-			return ch.Printer.PrintResource(toSchemaSnapshots([]*planetscale.SchemaSnapshot{snapshot}))
+			return ch.Printer.PrintResource(toSchemaSnapshot(snapshot))
 		},
 	}
 

internal/cmd/snapshot/snapshot.go

@@ -39,6 +39,10 @@ func (s *SchemaSnapshot) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(s.orig, "", "  ")
 }
 
+func (s *SchemaSnapshot) MarshalCSVValue() interface{} {
+	return []*SchemaSnapshot{s}
+}
+
 // toSchemaSnapshot returns a struct that prints out the various fields
 // of a schema snapshot model.
 func toSchemaSnapshot(ss *ps.SchemaSnapshot) *SchemaSnapshot {

internal/printer/printer.go

@@ -176,6 +176,14 @@ func (p *Printer) PrintResource(v interface{}) error {
 		fmt.Fprintln(out, string(buf))
 		return nil
 	case CSV:
+		type csvvaluer interface {
+			MarshalCSVValue() interface{}
+		}
+
+		if c, ok := v.(csvvaluer); ok {
+			v = c.MarshalCSVValue()
+		}
+
 		buf, err := gocsv.MarshalString(v)
 		if err != nil {
 			return err