Merge pull request #155 from superfly/fixverbosehandling

Fix verbose handling, implement --json, purge many renderers
superfly · Jun 17, 2020 · 0dfbdec · 0dfbdec
2 parents 713471b + c0c657f
commit 0dfbdec
Show file tree

Hide file tree

Showing 32 changed files with 174 additions and 68 deletions.
diff --git a/api/resource_platform.go b/api/resource_platform.go
@@ -1,6 +1,28 @@
 package api
 
 func (c *Client) PlatformRegions() ([]Region, error) {
+	query := `
+		query {
+			platform {
+				regions {
+					name
+					code
+				}
+			}
+		}
+	`
+
+	req := c.NewRequest(query)
+
+	data, err := c.Run(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return data.Platform.Regions, nil
+}
+
+func (c *Client) PlatformRegionsAll() ([]Region, error) {
 	query := `
 		query {
 			platform {

diff --git a/api/types.go b/api/types.go
@@ -394,10 +394,10 @@ type CheckState struct {
 }
 
 type Region struct {
-	Code      string
-	Name      string
-	Latitude  float32
-	Longitude float32
+	Code      string  `json:"code"`
+	Name      string  `json:"name"`
+	Latitude  float32 `json:"latitude,omitempty"`
+	Longitude float32 `json:"longitude,omitempty"`
 }
 
 type AutoscalingConfig struct {

diff --git a/cmd/appInfo.go b/cmd/appInfo.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/superfly/flyctl/docstrings"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/superfly/flyctl/cmd/presenters"
 )
 
@@ -21,26 +20,23 @@ func runAppInfo(ctx *CmdContext) error {
 		return err
 	}
 
-	fmt.Println(aurora.Bold("App"))
-	err = ctx.RenderEx(&presenters.AppInfo{App: *app}, presenters.Options{HideHeader: true, Vertical: true})
+	err = ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.AppInfo{App: *app}, HideHeader: true, Vertical: true, Title: "App"})
 	if err != nil {
 		return err
 	}
 
-	fmt.Println(aurora.Bold("Services"))
-	err = ctx.Render(&presenters.Services{Services: app.Services})
+	err = ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.Services{Services: app.Services}, Title: "Services"})
 	if err != nil {
 		return err
 	}
 
-	fmt.Println(aurora.Bold("IP Addresses"))
-	err = ctx.Render(&presenters.IPAddresses{IPAddresses: app.IPAddresses.Nodes})
+	err = ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.IPAddresses{IPAddresses: app.IPAddresses.Nodes}, Title: "IP Adresses"})
 	if err != nil {
 		return err
 	}
 
 	if !app.Deployed {
-		fmt.Println(`App has not been deployed yet. Try running "flyctl deploy --image flyio/hellofly"`)
+		fmt.Fprintln(ctx.Out, `App has not been deployed yet. Try running "flyctl deploy --image flyio/hellofly"`)
 	}
 
 	return nil

diff --git a/cmd/apps.go b/cmd/apps.go
@@ -222,7 +222,7 @@ func runAppsCreate(ctx *CmdContext) error {
 
 	fmt.Println("New app created")
 
-	err = ctx.RenderEx(&presenters.AppInfo{App: *app}, presenters.Options{HideHeader: true, Vertical: true})
+	err = ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.AppInfo{App: *app}, HideHeader: true, Vertical: true})
 	if err != nil {
 		return err
 	}

diff --git a/cmd/certificates.go b/cmd/certificates.go
@@ -31,9 +31,9 @@ func newCertificatesCommand() *Command {
 	create.Command.Args = cobra.ExactArgs(1)
 
 	certsDeleteStrings := docstrings.Get("certs.delete")
-	delete := BuildCommand(cmd, runCertDelete, certsDeleteStrings.Usage, certsDeleteStrings.Short, certsDeleteStrings.Long, os.Stdout, requireSession, requireAppName)
-	delete.Command.Args = cobra.ExactArgs(1)
-	delete.AddBoolFlag(BoolFlagOpts{Name: "yes", Shorthand: "y", Description: "accept all confirmations"})
+	deleteCmd := BuildCommand(cmd, runCertDelete, certsDeleteStrings.Usage, certsDeleteStrings.Short, certsDeleteStrings.Long, os.Stdout, requireSession, requireAppName)
+	deleteCmd.Command.Args = cobra.ExactArgs(1)
+	deleteCmd.AddBoolFlag(BoolFlagOpts{Name: "yes", Shorthand: "y", Description: "accept all confirmations"})
 
 	certsShowStrings := docstrings.Get("certs.show")
 	show := BuildCommand(cmd, runCertShow, certsShowStrings.Usage, certsShowStrings.Short, certsShowStrings.Long, os.Stdout, requireSession, requireAppName)
@@ -63,7 +63,7 @@ func runCertShow(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderEx(&presenters.Certificate{Certificate: cert}, presenters.Options{Vertical: true})
+	return ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.Certificate{Certificate: cert}, Vertical: true})
 }
 
 func runCertCheck(ctx *CmdContext) error {
@@ -74,7 +74,7 @@ func runCertCheck(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderEx(&presenters.Certificate{Certificate: cert}, presenters.Options{Vertical: true})
+	return ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.Certificate{Certificate: cert}, Vertical: true})
 }
 
 func runCertAdd(ctx *CmdContext) error {
@@ -85,7 +85,7 @@ func runCertAdd(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderEx(&presenters.Certificate{Certificate: cert}, presenters.Options{Vertical: true})
+	return ctx.Frender(ctx.Out, PresenterOption{Presentable: &presenters.Certificate{Certificate: cert}, Vertical: true})
 }
 
 func runCertDelete(ctx *CmdContext) error {

diff --git a/cmd/command.go b/cmd/command.go
@@ -150,7 +150,6 @@ type CmdContext struct {
 	Terminal     *terminal.Terminal
 	WorkingDir   string
 	ConfigFile   string
-	Verbose      bool
 	AppName      string
 	AppConfig    *flyctl.AppConfig
 }
@@ -165,20 +164,21 @@ func (ctx *CmdContext) Render(presentable presenters.Presentable) error {
 	return presenter.Render()
 }
 
-// RenderEx - Render a presentable structure via the context with additional options
-func (ctx *CmdContext) RenderEx(presentable presenters.Presentable, options presenters.Options) error {
-	presenter := &presenters.Presenter{
-		Item: presentable,
-		Out:  os.Stdout,
-		Opts: options,
-	}
-
-	return presenter.Render()
-}
+//// RenderEx - Render a presentable structure via the context with additional options
+//func (ctx *CmdContext) RenderEx(presentable presenters.Presentable, options presenters.Options) error {
+//	presenter := &presenters.Presenter{
+//		Item: presentable,
+//		Out:  os.Stdout,
+//		Opts: options,
+//	}
+//
+//	return presenter.Render()
+//}
 
 // PresenterOption - options for RenderEx, RenderView, render etc...
 type PresenterOption struct {
 	Presentable presenters.Presentable
+	AsJSON      bool
 	Vertical    bool
 	HideHeader  bool
 	Title       string
@@ -192,10 +192,11 @@ func (ctx *CmdContext) render(out io.Writer, views ...PresenterOption) error {
 			Opts: presenters.Options{
 				Vertical:   v.Vertical,
 				HideHeader: v.HideHeader,
+				AsJSON:     v.AsJSON,
 			},
 		}
 
-		if v.Title != "" {
+		if v.Title != "" && !v.AsJSON {
 			fmt.Fprintln(out, aurora.Bold(v.Title))
 		}
 
@@ -207,13 +208,15 @@ func (ctx *CmdContext) render(out io.Writer, views ...PresenterOption) error {
 	return nil
 }
 
-// RenderView - render a view through the context to the terminal
-func (ctx *CmdContext) RenderView(views ...PresenterOption) (err error) {
-	return ctx.render(ctx.Terminal, views...)
-}
+// Frender - render a view to a Writer
+func (ctx *CmdContext) Frender(w io.Writer, views ...PresenterOption) error {
+	// If JSON output wanted, set in all views
+	if ctx.GlobalConfig.GetBool(flyctl.ConfigJSONOutput) {
+		for i, _ := range views {
+			views[i].AsJSON = true
+		}
+	}
 
-// RenderViewW - render a view to a Writer
-func (ctx *CmdContext) RenderViewW(w io.Writer, views ...PresenterOption) error {
 	return ctx.render(w, views...)
 }
 
@@ -331,13 +334,6 @@ func requireAppName(cmd *Command) Initializer {
 		Default:     defaultConfigFilePath,
 		EnvName:     "FLY_APP_CONFIG",
 	})
-	cmd.AddBoolFlag(BoolFlagOpts{
-		Name:        "verbose",
-		Shorthand:   "v",
-		Description: "Use verbose output where available",
-		Default:     false,
-		EnvName:     "FLY_APP_VERBOSE",
-	})
 
 	return Initializer{
 		Setup: func(ctx *CmdContext) error {
@@ -379,9 +375,6 @@ func requireAppName(cmd *Command) Initializer {
 				ctx.AppName = ctx.AppConfig.AppName
 			}
 
-			verbose := ctx.Config.GetBool("verbose")
-			ctx.Verbose = verbose
-
 			return nil
 		},
 		PreRun: func(ctx *CmdContext) error {

diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -299,7 +299,7 @@ func watchDeployment(ctx context.Context, cc *CmdContext) error {
 			for alloc := range x {
 				count++
 				fmt.Fprintf(cc.Out, "\n  Failure #%d\n", count)
-				err := cc.RenderViewW(p,
+				err := cc.Frender(p,
 					PresenterOption{
 						Title: "Allocation",
 						Presentable: &presenters.Allocations{

diff --git a/cmd/ips.go b/cmd/ips.go
@@ -45,7 +45,7 @@ func runIPAddressesList(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderView(PresenterOption{
+	return ctx.Frender(ctx.Out, PresenterOption{
 		Presentable: &presenters.IPAddresses{IPAddresses: ipAddresses},
 	})
 }
@@ -66,7 +66,7 @@ func runAllocateIPAddress(ctx *CmdContext, addrType string) error {
 		return err
 	}
 
-	return ctx.RenderView(PresenterOption{
+	return ctx.Frender(ctx.Out, PresenterOption{
 		Presentable: &presenters.IPAddresses{IPAddresses: []api.IPAddress{*ipAddress}},
 	})
 }

diff --git a/cmd/monitor.go b/cmd/monitor.go
@@ -52,7 +52,7 @@ func monitorDeployment(ctx context.Context, cc *CmdContext) error {
 	monitor.DeploymentUpdated = func(d *api.DeploymentStatus, updatedAllocs []*api.AllocationStatus) error {
 		fmt.Fprintln(cc.Out, presenters.FormatDeploymemntAllocSummary(d))
 
-		if cc.Verbose {
+		if cc.GlobalConfig.GetBool("verbose") {
 			for _, alloc := range updatedAllocs {
 				fmt.Fprintln(cc.Out, presenters.FormatAllocSummary(alloc))
 			}
@@ -94,7 +94,7 @@ func monitorDeployment(ctx context.Context, cc *CmdContext) error {
 			for alloc := range x {
 				count++
 				fmt.Fprintf(cc.Out, "\n  Failure #%d\n", count)
-				err := cc.RenderViewW(p,
+				err := cc.Frender(p,
 					PresenterOption{
 						Title: "Allocation",
 						Presentable: &presenters.Allocations{

diff --git a/cmd/platform.go b/cmd/platform.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"fmt"
+	"github.com/superfly/flyctl/flyctl"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -34,7 +36,9 @@ func runPlatformRegions(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderView(PresenterOption{
+	fmt.Println(ctx.GlobalConfig.GetBool(flyctl.ConfigJSONOutput))
+
+	return ctx.Frender(ctx.Out, PresenterOption{
 		Presentable: &presenters.Regions{Regions: regions},
 	})
 }
@@ -45,7 +49,7 @@ func runPlatformVMSizes(ctx *CmdContext) error {
 		return err
 	}
 
-	return ctx.RenderView(PresenterOption{
+	return ctx.Frender(ctx.Out, PresenterOption{
 		Presentable: &presenters.VMSizes{VMSizes: sizes},
 	})
 }
diff --git a/cmd/presenters/alloc_checks.go b/cmd/presenters/alloc_checks.go
@@ -8,6 +8,10 @@ type AllocationChecks struct {
 	Checks []api.CheckState
 }
 
+func (p *AllocationChecks) APIStruct() interface{} {
+	return nil
+}
+
 func (p *AllocationChecks) FieldNames() []string {
 	return []string{"ID", "Service", "State", "Output"}
 }

diff --git a/cmd/presenters/alloc_events.go b/cmd/presenters/alloc_events.go
@@ -10,6 +10,10 @@ type AllocationEvents struct {
 	Events []api.AllocationEvent
 }
 
+func (p *AllocationEvents) APIStruct() interface{} {
+	return p.Events
+}
+
 func (p *AllocationEvents) FieldNames() []string {
 	return []string{"Timestamp", "Type", "Message"}
 }

diff --git a/cmd/presenters/allocations.go b/cmd/presenters/allocations.go
@@ -12,6 +12,10 @@ type Allocations struct {
 	Allocations []*api.AllocationStatus
 }
 
+func (p *Allocations) APIStruct() interface{} {
+	return p.Allocations
+}
+
 func (p *Allocations) FieldNames() []string {
 	return []string{"ID", "Version", "Region", "Desired", "Status", "Health Checks", "Restarts", "Created"}
 }

diff --git a/cmd/presenters/appInfo.go b/cmd/presenters/appInfo.go
@@ -10,6 +10,10 @@ type AppInfo struct {
 	App api.App
 }
 
+func (p *AppInfo) APIStruct() interface{} {
+	return p.App
+}
+
 func (p *AppInfo) FieldNames() []string {
 	return []string{"Name", "Owner", "Version", "Status", "Hostname"}
 }

diff --git a/cmd/presenters/apps.go b/cmd/presenters/apps.go
@@ -9,6 +9,10 @@ type Apps struct {
 	Apps []api.App
 }
 
+func (p *Apps) APIStruct() interface{} {
+	return nil
+}
+
 func (p *Apps) FieldNames() []string {
 	return []string{"Name", "Owner", "Status", "Latest Deploy"}
 }

diff --git a/cmd/presenters/builds.go b/cmd/presenters/builds.go
@@ -6,6 +6,10 @@ type Builds struct {
 	Builds []api.Build
 }
 
+func (p *Builds) APIStruct() interface{} {
+	return nil
+}
+
 func (p *Builds) FieldNames() []string {
 	return []string{"ID", "Status", "User", "Created At", "Updated At"}
 }

diff --git a/cmd/presenters/certificate.go b/cmd/presenters/certificate.go
@@ -11,6 +11,10 @@ type Certificate struct {
 	Certificate *api.AppCertificate
 }
 
+func (p *Certificate) APIStruct() interface{} {
+	return p.Certificate
+}
+
 func (p *Certificate) FieldNames() []string {
 	return []string{"Hostname", "Configured", "Issued", "Certificate Authority", "DNS Provider", "DNS Validation Instructions", "DNS Validation Hostname", "DNS Validation Target", "Source", "Created At", "Status"}
 }

diff --git a/cmd/presenters/certificates.go b/cmd/presenters/certificates.go
@@ -8,6 +8,10 @@ type Certificates struct {
 	Certificates []api.AppCertificate
 }
 
+func (p *Certificates) APIStruct() interface{} {
+	return nil
+}
+
 func (p *Certificates) FieldNames() []string {
 	return []string{"Hostname", "Created At", "Status"}
 }