Fix warning message not shown properly as the docker cli was muted

Signed-off-by: Silvin Lubecki <[email protected]>

Author: silvin-lubecki

internal/commands/image/inspect.go

@@ -54,7 +54,6 @@ func inspectCmd(dockerCli command.Cli, installerContext *cliopts.InstallerContex
 }
 
 func runInspect(dockerCli command.Cli, appname string, opts inspectOptions, installerContext *cliopts.InstallerContextOptions) error {
-	defer muteDockerCli(dockerCli)()
 	s, err := appstore.NewApplicationStore(config.Dir())
 	if err != nil {
 		return err
@@ -82,6 +81,7 @@ func runInspect(dockerCli command.Cli, appname string, opts inspectOptions, inst
 		return err
 	}
 
+	defer muteDockerCli(dockerCli)()
 	if _, hasAction := installation.Bundle.Actions[internal.ActionInspectName]; hasAction {
 		driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, os.Stdout)
 		if err != nil {

internal/commands/image/render.go

@@ -1,20 +1,17 @@
 package image
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"os"
 
-	"github.com/docker/app/internal/packager"
-
-	"github.com/deislabs/cnab-go/driver"
-
 	"github.com/deislabs/cnab-go/action"
+	"github.com/deislabs/cnab-go/driver"
 	"github.com/docker/app/internal"
 	bdl "github.com/docker/app/internal/bundle"
 	"github.com/docker/app/internal/cliopts"
 	"github.com/docker/app/internal/cnab"
+	"github.com/docker/app/internal/packager"
 	appstore "github.com/docker/app/internal/store"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -49,8 +46,6 @@ func renderCmd(dockerCli command.Cli, installerContext *cliopts.InstallerContext
 }
 
 func runRender(dockerCli command.Cli, appname string, opts renderOptions, installerContext *cliopts.InstallerContextOptions) error {
-	defer muteDockerCli(dockerCli)()
-
 	var w io.Writer = os.Stdout
 	if opts.renderOutput != "-" {
 		f, err := os.Create(opts.renderOutput)
@@ -61,64 +56,51 @@ func runRender(dockerCli command.Cli, appname string, opts renderOptions, instal
 		w = f
 	}
 
-	cfgFunc := func(op *driver.Operation) error {
-		op.Out = w
-		return nil
-	}
-
-	action, installation, errBuf, err := prepareCustomAction(internal.ActionRenderName, dockerCli, appname, w, opts, installerContext)
-	if err != nil {
-		return err
-	}
-	installation.Parameters[internal.ParameterRenderFormatName] = opts.formatDriver
-
-	if err := action.Run(&installation.Claim, nil, cfgFunc, cnab.WithRelocationMap(installation)); err != nil {
-		return fmt.Errorf("render failed: %s\n%s", err, errBuf)
-	}
-	return nil
-}
-
-func prepareCustomAction(actionName string,
-	dockerCli command.Cli,
-	appname string,
-	stdout io.Writer,
-	opts renderOptions,
-	installerContext *cliopts.InstallerContextOptions) (*action.RunCustom, *appstore.Installation, *bytes.Buffer, error) {
-
 	s, err := appstore.NewApplicationStore(config.Dir())
 	if err != nil {
-		return nil, nil, nil, err
+		return err
 	}
 	bundleStore, err := s.BundleStore()
 	if err != nil {
-		return nil, nil, nil, err
+		return err
 	}
 	bndl, ref, err := cnab.GetBundle(dockerCli, bundleStore, appname)
 	if err != nil {
-		return nil, nil, nil, errors.Wrapf(err, "could not render %q: no such App image", appname)
+		return errors.Wrapf(err, "could not render %q: no such App image", appname)
 	}
 	if err := packager.CheckAppVersion(dockerCli.Err(), bndl.Bundle); err != nil {
-		return nil, nil, nil, err
+		return err
 	}
 	installation, err := appstore.NewInstallation("custom-action", ref.String(), bndl)
 	if err != nil {
-		return nil, nil, nil, err
+		return err
 	}
 
 	if err := bdl.MergeBundleParameters(installation,
 		bdl.WithFileParameters(opts.ParametersFiles),
 		bdl.WithCommandLineParameters(opts.Overrides),
 	); err != nil {
-		return nil, nil, nil, err
+		return err
 	}
 
-	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, stdout)
+	defer muteDockerCli(dockerCli)()
+	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, w)
 	if err != nil {
-		return nil, nil, nil, err
+		return err
 	}
-	a := &action.RunCustom{
-		Action: actionName,
+	action := &action.RunCustom{
+		Action: internal.ActionRenderName,
 		Driver: driverImpl,
 	}
-	return a, installation, errBuf, nil
+	installation.Parameters[internal.ParameterRenderFormatName] = opts.formatDriver
+
+	cfgFunc := func(op *driver.Operation) error {
+		op.Out = w
+		return nil
+	}
+
+	if err := action.Run(&installation.Claim, nil, cfgFunc, cnab.WithRelocationMap(installation)); err != nil {
+		return fmt.Errorf("render failed: %s\n%s", err, errBuf)
+	}
+	return nil
 }

internal/commands/inspect.go

@@ -43,7 +43,6 @@ func inspectCmd(dockerCli command.Cli, installerContext *cliopts.InstallerContex
 }
 
 func runInspect(dockerCli command.Cli, appName string, inspectOptions inspectOptions, installerContext *cliopts.InstallerContextOptions) error {
-	defer muteDockerCli(dockerCli)()
 	_, installationStore, credentialStore, err := prepareStores(dockerCli.CurrentContext())
 	if err != nil {
 		return err
@@ -60,6 +59,7 @@ func runInspect(dockerCli command.Cli, appName string, inspectOptions inspectOpt
 		return err
 	}
 
+	defer muteDockerCli(dockerCli)()
 	var buf bytes.Buffer
 	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, &buf)
 	if err != nil {

internal/commands/remove.go

@@ -42,8 +42,6 @@ func removeCmd(dockerCli command.Cli, installerContext *cliopts.InstallerContext
 }
 
 func runRemove(dockerCli command.Cli, installationName string, opts removeOptions, installerContext *cliopts.InstallerContextOptions) (mainErr error) {
-	defer muteDockerCli(dockerCli)()
-
 	_, installationStore, credentialStore, err := prepareStores(dockerCli.CurrentContext())
 	if err != nil {
 		return err
@@ -69,6 +67,8 @@ func runRemove(dockerCli command.Cli, installationName string, opts removeOption
 			fmt.Fprintf(os.Stderr, "deletion forced for running App %q\n", installationName)
 		}()
 	}
+
+	defer muteDockerCli(dockerCli)()
 	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, os.Stdout)
 	if err != nil {
 		return err

internal/commands/update.go

@@ -41,8 +41,6 @@ func updateCmd(dockerCli command.Cli, installerContext *cliopts.InstallerContext
 }
 
 func runUpdate(dockerCli command.Cli, installationName string, opts updateOptions, installerContext *cliopts.InstallerContextOptions) error {
-	defer muteDockerCli(dockerCli)()
-
 	bundleStore, installationStore, credentialStore, err := prepareStores(dockerCli.CurrentContext())
 	if err != nil {
 		return err
@@ -76,6 +74,7 @@ func runUpdate(dockerCli command.Cli, installationName string, opts updateOption
 		return err
 	}
 
+	defer muteDockerCli(dockerCli)()
 	driverImpl, errBuf, err := cnab.SetupDriver(installation, dockerCli, installerContext, os.Stdout)
 	if err != nil {
 		return err