Merge pull request #539 from jcsirot/verify-stdout-stderr

Verify outputs to stdout and stderr

Author: chris-crone

e2e/testdata/init-output.golden

@@ -1,2 +1,2 @@
-You will need to edit parameters.yml to fill in default values.
 Created "app-test.dockerapp"
+You will need to edit parameters.yml to fill in default values.

internal/commands/bundle.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"os"
 
 	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal/packager"
@@ -61,7 +62,7 @@ func runBundle(dockerCli command.Cli, appName string, opts bundleOptions) error
 		return err
 	}
 
-	fmt.Fprintf(dockerCli.Out(), "Invocation image %q successfully built\n", bundle.InvocationImages[0].Image)
+	fmt.Fprintf(os.Stdout, "Invocation image %q successfully built\n", bundle.InvocationImages[0].Image)
 	bundleBytes, err := json.MarshalIndent(bundle, "", "\t")
 	if err != nil {
 		return err

internal/commands/install.go

@@ -142,6 +142,6 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
 		return err2
 	}
 
-	fmt.Printf("Application %q installed on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "Application %q installed on context %q\n", installationName, opts.targetContext)
 	return nil
 }

internal/commands/pull.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/docker/app/internal/store"
 	"github.com/docker/cli/cli"
@@ -46,7 +47,7 @@ func runPull(dockerCli command.Cli, name string, opts registryOptions) error {
 		return errors.Wrap(err, name)
 	}
 
-	fmt.Printf("Successfully pulled %q (%s) from %s\n", bndl.Name, bndl.Version, ref.String())
+	fmt.Fprintf(os.Stdout, "Successfully pulled %q (%s) from %s\n", bndl.Name, bndl.Version, ref.String())
 
 	return nil
 }

internal/commands/push.go

@@ -118,7 +118,7 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 	if err != nil {
 		return errors.Wrapf(err, "pushing to %q", retag.cnabRef)
 	}
-	fmt.Printf("Successfully pushed bundle to %s. Digest is %s.\n", retag.cnabRef.String(), descriptor.Digest)
+	fmt.Fprintf(os.Stdout, "Successfully pushed bundle to %s. Digest is %s.\n", retag.cnabRef.String(), descriptor.Digest)
 	return nil
 }
 

internal/commands/root.go

@@ -34,7 +34,7 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
 		mergeCmd(dockerCli),
 		renderCmd(dockerCli),
 		splitCmd(),
-		validateCmd(dockerCli),
+		validateCmd(),
 		versionCmd(dockerCli),
 		completionCmd(dockerCli, cmd),
 		bundleCmd(dockerCli),

internal/commands/uninstall.go

@@ -86,6 +86,6 @@ func runUninstall(dockerCli command.Cli, installationName string, opts uninstall
 	if err := installationStore.Delete(installationName); err != nil {
 		return fmt.Errorf("Failed to delete installation %q from the installation store: %s", installationName, err)
 	}
-	fmt.Printf("Application %q uninstalled on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "Application %q uninstalled on context %q\n", installationName, opts.targetContext)
 	return nil
 }

internal/commands/upgrade.go

@@ -97,6 +97,6 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
 	if err2 != nil {
 		return err2
 	}
-	fmt.Printf("Application %q upgraded on context %q\n", installationName, opts.targetContext)
+	fmt.Fprintf(os.Stdout, "Application %q upgraded on context %q\n", installationName, opts.targetContext)
 	return nil
 }

internal/commands/validate.go

@@ -2,12 +2,12 @@ package commands
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/render"
 	"github.com/docker/app/types"
 	"github.com/docker/cli/cli"
-	"github.com/docker/cli/cli/command"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +16,7 @@ type validateOptions struct {
 	parametersOptions
 }
 
-func validateCmd(dockerCli command.Cli) *cobra.Command {
+func validateCmd() *cobra.Command {
 	var opts validateOptions
 	cmd := &cobra.Command{
 		Use:   "validate [APP_NAME] [--set KEY=VALUE ...] [--parameters-file PARAMETERS_FILE]",
@@ -35,7 +35,7 @@ func validateCmd(dockerCli command.Cli) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			fmt.Fprintf(dockerCli.Out(), "Validated %q\n", app.Path)
+			fmt.Fprintf(os.Stdout, "Validated %q\n", app.Path)
 			return nil
 		},
 	}

internal/commands/version.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
@@ -25,9 +26,9 @@ In order to be able to build an invocation images when using docker app from an
 		Run: func(cmd *cobra.Command, args []string) {
 			image := packager.BaseInvocationImage(dockerCli)
 			if onlyBaseImage {
-				fmt.Fprintln(dockerCli.Out(), image)
+				fmt.Fprintln(os.Stdout, image)
 			} else {
-				fmt.Fprintln(dockerCli.Out(), internal.FullVersion(image))
+				fmt.Fprintln(os.Stdout, internal.FullVersion(image))
 			}
 		},
 	}