Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 2c98fb3

Browse files
Add a message in case of success for install/uninstall/upgrade actions
Signed-off-by: Silvin Lubecki <[email protected]>
1 parent bcff419 commit 2c98fb3

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

internal/commands/install.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,17 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
131131
inst := &action.Install{
132132
Driver: driverImpl,
133133
}
134-
err = inst.Run(c, creds, dockerCli.Out())
134+
err = inst.Run(c, creds, os.Stdout)
135135
// Even if the installation failed, the installation is persisted with its failure status,
136136
// so any installation needs a clean uninstallation.
137137
err2 := installationStore.Store(*c)
138138
if err != nil {
139-
return fmt.Errorf("install failed: %s", errBuf)
139+
return fmt.Errorf("Installation failed: %s", errBuf)
140140
}
141-
return err2
141+
if err2 != nil {
142+
return err2
143+
}
144+
145+
fmt.Printf("Application %q installed on context %q\n", installationName, opts.targetContext)
146+
return nil
142147
}

internal/commands/uninstall.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package commands
22

33
import (
44
"fmt"
5+
"os"
56

67
"github.com/deislabs/duffle/pkg/action"
78
"github.com/deislabs/duffle/pkg/credentials"
@@ -58,12 +59,15 @@ func runUninstall(dockerCli command.Cli, installationName string, opts credentia
5859
uninst := &action.Uninstall{
5960
Driver: driverImpl,
6061
}
61-
err = uninst.Run(&c, creds, dockerCli.Out())
62-
if err == nil {
63-
return installationStore.Delete(installationName)
62+
if err := uninst.Run(&c, creds, os.Stdout); err != nil {
63+
if err2 := installationStore.Store(c); err2 != nil {
64+
return fmt.Errorf("%s while %s", err2, errBuf)
65+
}
66+
return fmt.Errorf("Uninstall failed: %s", errBuf)
6467
}
65-
if err2 := installationStore.Store(c); err2 != nil {
66-
fmt.Fprintf(dockerCli.Err(), "failed to update installation: %s\n", err2)
68+
if err := installationStore.Delete(installationName); err != nil {
69+
return fmt.Errorf("Failed to delete installation %q from the installation store: %s", installationName, err)
6770
}
68-
return fmt.Errorf("uninstall failed: %s", errBuf)
71+
fmt.Printf("Application %q uninstalled on context %q\n", installationName, opts.targetContext)
72+
return nil
6973
}

internal/commands/upgrade.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
9292
err = u.Run(&installation, creds, os.Stdout)
9393
err2 := installationStore.Store(installation)
9494
if err != nil {
95-
return fmt.Errorf("upgrade failed: %s", errBuf)
95+
return fmt.Errorf("Upgrade failed: %s", errBuf)
9696
}
97-
return err2
97+
if err2 != nil {
98+
return err2
99+
}
100+
fmt.Printf("Application %q upgraded on context %q\n", installationName, opts.targetContext)
101+
return nil
98102
}

0 commit comments

Comments
 (0)