List/Format refactoring

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>

Author: simonferquel

cli/command/context/list.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	ctxformatter "github.com/docker/cli/cli/command/context/formatter"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/context/docker"
 	"github.com/docker/cli/cli/context/kubernetes"
@@ -32,7 +31,7 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringVar(&opts.format, "format", "", "Pretty-print contexts using a Go template")
+	flags.StringVar(&opts.format, "format", formatter.TableFormatKey, "Pretty-print contexts using a Go template")
 	return cmd
 }
 
@@ -42,7 +41,7 @@ func runList(dockerCli command.Cli, opts *listOptions) error {
 	if err != nil {
 		return err
 	}
-	var contexts []*ctxformatter.ClientContext
+	var contexts []*formatter.ClientContext
 	for name, rawMeta := range contextMap {
 		meta, err := command.GetDockerContext(rawMeta)
 		if err != nil {
@@ -57,7 +56,7 @@ func runList(dockerCli command.Cli, opts *listOptions) error {
 		if kubernetesEndpoint != nil {
 			kubEndpointText = fmt.Sprintf("%s (%s)", kubernetesEndpoint.Host, kubernetesEndpoint.DefaultNamespace)
 		}
-		desc := ctxformatter.ClientContext{
+		desc := formatter.ClientContext{
 			Name:               name,
 			Current:            name == curContext,
 			Description:        meta.Description,
@@ -73,14 +72,10 @@ func runList(dockerCli command.Cli, opts *listOptions) error {
 	return format(dockerCli, opts, contexts)
 }
 
-func format(dockerCli command.Cli, opts *listOptions, contexts []*ctxformatter.ClientContext) error {
-	format := opts.format
-	if format == "" {
-		format = ctxformatter.ClientContextTableFormat
-	}
+func format(dockerCli command.Cli, opts *listOptions, contexts []*formatter.ClientContext) error {
 	contextCtx := formatter.Context{
 		Output: dockerCli.Out(),
-		Format: formatter.Format(format),
+		Format: formatter.NewClientContextFormat(opts.format),
 	}
-	return ctxformatter.ClientContextWrite(contextCtx, contexts)
+	return formatter.ClientContextWrite(contextCtx, contexts)
 }

cli/command/context/formatter/context.go cli/command/formatter/context.gocli/command/context/formatter/context.go renamed to cli/command/formatter/context.go

@@ -1,9 +1,5 @@
 package formatter
 
-import (
-	"github.com/docker/cli/cli/command/formatter"
-)
-
 const (
 	// ClientContextTableFormat is the default client context format
 	ClientContextTableFormat = "table {{.NameWithCurrent}}\t{{.Description}}\t{{.DockerEndpoint}}\t{{.KubernetesEndpoint}}\t{{.StackOrchestrator}}"
@@ -13,6 +9,14 @@ const (
 	stackOrchestrastorHeader = "ORCHESTRATOR"
 )
 
+// NewClientContextFormat returns a Format for rendering using a Context
+func NewClientContextFormat(source string) Format {
+	if source == TableFormatKey {
+		return Format(ClientContextTableFormat)
+	}
+	return Format(source)
+}
+
 // ClientContext is a context for display
 type ClientContext struct {
 	Name               string
@@ -24,8 +28,8 @@ type ClientContext struct {
 }
 
 // ClientContextWrite writes formatted contexts using the Context
-func ClientContextWrite(ctx formatter.Context, contexts []*ClientContext) error {
-	render := func(format func(subContext formatter.SubContext) error) error {
+func ClientContextWrite(ctx Context, contexts []*ClientContext) error {
+	render := func(format func(subContext SubContext) error) error {
 		for _, context := range contexts {
 			if err := format(&clientContextContext{c: context}); err != nil {
 				return err
@@ -37,15 +41,15 @@ func ClientContextWrite(ctx formatter.Context, contexts []*ClientContext) error
 }
 
 type clientContextContext struct {
-	formatter.HeaderContext
+	HeaderContext
 	c *ClientContext
 }
 
 func newClientContextContext() *clientContextContext {
 	ctx := clientContextContext{}
-	ctx.Header = formatter.SubHeaderContext{
-		"NameWithCurrent":    formatter.NameHeader,
-		"Description":        formatter.DescriptionHeader,
+	ctx.Header = SubHeaderContext{
+		"NameWithCurrent":    NameHeader,
+		"Description":        DescriptionHeader,
 		"DockerEndpoint":     dockerEndpointHeader,
 		"KubernetesEndpoint": kubernetesEndpointHeader,
 		"StackOrchestrator":  stackOrchestrastorHeader,
@@ -54,7 +58,7 @@ func newClientContextContext() *clientContextContext {
 }
 
 func (c *clientContextContext) MarshalJSON() ([]byte, error) {
-	return formatter.MarshalJSON(c)
+	return MarshalJSON(c)
 }
 
 func (c *clientContextContext) NameWithCurrent() string {