Formatter e2e tests

Signed-off-by: Joffrey F <joffrey@docker.com>

Author: shin-

cmd/docker-app/render.go

@@ -48,13 +48,13 @@ func renderCmd(dockerCli command.Cli) *cobra.Command {
 				return err
 			}
 			if renderOutput == "-" {
-				fmt.Fprint(dockerCli.Out(), string(res))
+				fmt.Fprint(dockerCli.Out(), res)
 			} else {
 				f, err := os.Create(renderOutput)
 				if err != nil {
 					return err
 				}
-				fmt.Fprint(f, string(res))
+				fmt.Fprint(f, res)
 			}
 			return nil
 		},
@@ -69,6 +69,6 @@ func renderCmd(dockerCli command.Cli) *cobra.Command {
 	cmd.Flags().StringArrayVarP(&renderSettingsFile, "settings-files", "f", []string{}, "Override settings files")
 	cmd.Flags().StringArrayVarP(&renderEnv, "set", "s", []string{}, "Override settings values")
 	cmd.Flags().StringVarP(&renderOutput, "output", "o", "-", "Output file")
-	cmd.Flags().StringVarP(&formatDriver, "presenter", "p", "yaml", "Configure the output format")
+	cmd.Flags().StringVarP(&formatDriver, "presenter", "p", "yaml", "Configure the output format (yaml|json)")
 	return cmd
 }

e2e/commands_test.go

@@ -76,6 +76,15 @@ func testRenderApp(appPath string, env ...string) func(*testing.T) {
 	}
 }
 
+func TestRenderFormatters(t *testing.T) {
+	appPath := filepath.Join("testdata", "fork", "simple.dockerapp")
+	result := icmd.RunCommand(dockerApp, "render", "-p", "json", appPath).Assert(t, icmd.Success)
+	assert.Assert(t, golden.String(result.Stdout(), "expected-json-render.golden"))
+
+	result = icmd.RunCommand(dockerApp, "render", "-p", "yaml", appPath).Assert(t, icmd.Success)
+	assert.Assert(t, golden.String(result.Stdout(), "expected-yaml-render.golden"))
+}
+
 func TestInit(t *testing.T) {
 	composeData := `version: "3.2"
 services:

e2e/testdata/expected-json-render.golden

@@ -0,0 +1,78 @@
+{
+  "networks": {
+    "back": {
+      "ipam": {},
+      "external": false
+    },
+    "front": {
+      "ipam": {},
+      "external": false
+    }
+  },
+  "services": {
+    "api": {
+      "build": {},
+      "credential_spec": {},
+      "deploy": {
+        "resources": {},
+        "placement": {}
+      },
+      "image": "python:3.6",
+      "networks": {
+        "back": null,
+        "front": {
+          "aliases": [
+            "corp.app.api.com",
+            "coolapp.com"
+          ]
+        }
+      }
+    },
+    "db": {
+      "build": {},
+      "credential_spec": {},
+      "deploy": {
+        "resources": {},
+        "placement": {}
+      },
+      "image": "postgres:9.3",
+      "networks": {
+        "back": null
+      }
+    },
+    "web": {
+      "build": {},
+      "credential_spec": {},
+      "deploy": {
+        "resources": {},
+        "placement": {}
+      },
+      "image": "nginx:latest",
+      "networks": {
+        "front": null
+      },
+      "ports": [
+        {
+          "mode": "ingress",
+          "target": 80,
+          "published": 8082,
+          "protocol": "tcp"
+        }
+      ],
+      "volumes": [
+        {
+          "type": "volume",
+          "source": "static",
+          "target": "/opt/data/static"
+        }
+      ]
+    }
+  },
+  "version": "3.6",
+  "volumes": {
+    "static": {
+      "name": "corp/web-static-data",
+      "external": true
+    }
+  }
+}

e2e/testdata/expected-yaml-render.golden

@@ -0,0 +1,34 @@
+version: "3.6"
+services:
+  api:
+    image: python:3.6
+    networks:
+      back: null
+      front:
+        aliases:
+        - corp.app.api.com
+        - coolapp.com
+  db:
+    image: postgres:9.3
+    networks:
+      back: null
+  web:
+    image: nginx:latest
+    networks:
+      front: null
+    ports:
+    - mode: ingress
+      target: 80
+      published: 8082
+      protocol: tcp
+    volumes:
+    - type: volume
+      source: static
+      target: /opt/data/static
+networks:
+  back: {}
+  front: {}
+volumes:
+  static:
+    name: corp/web-static-data
+    external: true

internal/formatter/driver/driver.go

@@ -1,11 +1,11 @@
 package driver
 
 import (
-    composetypes "github.com/docker/cli/cli/compose/types"
+	composetypes "github.com/docker/cli/cli/compose/types"
 )
 
 // Driver is the interface that must be implemented by a formatter driver.
 type Driver interface {
-    // Format executes the formatter on the source config
-    Format(config *composetypes.Config) (string, error)
+	// Format executes the formatter on the source config
+	Format(config *composetypes.Config) (string, error)
 }

internal/formatter/formatter.go

@@ -1,58 +1,58 @@
 package formatter
 
 import (
-    "sort"
-    "sync"
+	"sort"
+	"sync"
 
-    "github.com/docker/app/internal/formatter/driver"
-    composetypes "github.com/docker/cli/cli/compose/types"
-    "github.com/pkg/errors"
+	"github.com/docker/app/internal/formatter/driver"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/pkg/errors"
 )
 
 var (
-    driversMu sync.RWMutex
-    drivers   = map[string]driver.Driver{}
+	driversMu sync.RWMutex
+	drivers   = map[string]driver.Driver{}
 )
 
 // Register makes a formatter available by the provided name.
 // If Register is called twice with the same name or if driver is nil,
 // it panics.
 func Register(name string, driver driver.Driver) {
-    driversMu.Lock()
-    defer driversMu.Unlock()
-    if driver == nil {
-        panic("formatter: Register driver is nil")
-    }
-    if _, dup := drivers[name]; dup {
-        panic("formatter: Register called twice for driver " + name)
-    }
-    drivers[name] = driver
+	driversMu.Lock()
+	defer driversMu.Unlock()
+	if driver == nil {
+		panic("formatter: Register driver is nil")
+	}
+	if _, dup := drivers[name]; dup {
+		panic("formatter: Register called twice for driver " + name)
+	}
+	drivers[name] = driver
 }
 
 // Format uses the specified formatter to create a printable output.
 // If the formatter is not registered, this errors out.
 func Format(config *composetypes.Config, formatter string) (string, error) {
-    driversMu.RLock()
-    d, present := drivers[formatter]
-    driversMu.RUnlock()
-    if !present {
-        return "", errors.Errorf("unknown formatter %s", formatter)
-    }
-    s, err := d.Format(config)
-    if err != nil {
-        return "", err
-    }
-    return s, nil
+	driversMu.RLock()
+	d, present := drivers[formatter]
+	driversMu.RUnlock()
+	if !present {
+		return "", errors.Errorf("unknown presenter %q", formatter)
+	}
+	s, err := d.Format(config)
+	if err != nil {
+		return "", err
+	}
+	return s, nil
 }
 
 // Drivers returns a sorted list of the names of the registered drivers.
 func Drivers() []string {
-    list := []string{}
-    driversMu.RLock()
-    for name := range drivers {
-        list = append(list, name)
-    }
-    driversMu.RUnlock()
-    sort.Strings(list)
-    return list
+	list := []string{}
+	driversMu.RLock()
+	for name := range drivers {
+		list = append(list, name)
+	}
+	driversMu.RUnlock()
+	sort.Strings(list)
+	return list
 }