Rename "uninstall" to "remove/rm"

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

README.md

@@ -362,7 +362,7 @@ Commands:
   push        Push an application package to a registry
   render      Render the Compose file for an Application Package
   status      Get the installation status of an application
-  uninstall   Uninstall an application
+  rm          Remove an application
   upgrade     Upgrade an installed application
   validate    Checks the rendered application is syntactically correct
 

e2e/cnab_test.go

@@ -55,7 +55,7 @@ func TestCallCustomStatusAction(t *testing.T) {
 
 			// docker app uninstall
 			defer func() {
-				cmd.Command = dockerCli.Command("app", "uninstall", testCase.name)
+				cmd.Command = dockerCli.Command("app", "rm", testCase.name)
 				icmd.RunCmd(cmd).Assert(t, icmd.Success)
 			}()
 
@@ -79,7 +79,7 @@ func TestCnabParameters(t *testing.T) {
 
 	// docker app uninstall
 	defer func() {
-		cmd.Command = dockerCli.Command("app", "uninstall", "cnab-parameters")
+		cmd.Command = dockerCli.Command("app", "rm", "cnab-parameters")
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
 	}()
 

e2e/commands_test.go

@@ -362,7 +362,7 @@ STATUS
 	icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 0, Out: "8081"})
 
 	// Uninstall the application
-	cmd.Command = dockerCli.Command("app", "uninstall", appName)
+	cmd.Command = dockerCli.Command("app", "rm", appName)
 	checkContains(t, icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(),
 		[]string{
 			fmt.Sprintf("Removing service %s_api", appName),

e2e/pushpull_test.go

@@ -258,7 +258,7 @@ func TestPushInstallBundle(t *testing.T) {
 			assert.Check(t, cmp.Contains(icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(), ref))
 
 			// ensure it doesn't confuse the next test
-			cmd.Command = dockerCli.Command("app", "uninstall", name)
+			cmd.Command = dockerCli.Command("app", "rm", name)
 			icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 			cmd.Command = dockerCli.Command("service", "ls")

e2e/testdata/plugin-usage-experimental.golden

@@ -15,8 +15,8 @@ Commands:
   pull        Pull an application package from a registry
   push        Push an application package to a registry
   render      Render the Compose file for an Application Package
+  rm          Remove an application
   status      Get the installation status of an application
-  uninstall   Uninstall an application
   upgrade     Upgrade an installed application
   validate    Checks the rendered application is syntactically correct
 

e2e/testdata/plugin-usage.golden

@@ -15,8 +15,8 @@ Commands:
   pull        Pull an application package from a registry
   push        Push an application package to a registry
   render      Render the Compose file for an Application Package
+  rm          Remove an application
   status      Get the installation status of an application
-  uninstall   Uninstall an application
   upgrade     Upgrade an installed application
   validate    Checks the rendered application is syntactically correct
 

internal/commands/uninstall.go → internal/commands/remove.go

@@ -20,9 +20,10 @@ func uninstallCmd(dockerCli command.Cli) *cobra.Command {
 	var opts uninstallOptions
 
 	cmd := &cobra.Command{
-		Use:     "uninstall INSTALLATION_NAME [--target-context TARGET_CONTEXT] [OPTIONS]",
-		Short:   "Uninstall an application",
-		Example: `$ docker app uninstall myinstallation --target-context=mycontext`,
+		Use:     "rm INSTALLATION_NAME [--target-context TARGET_CONTEXT] [OPTIONS]",
+		Short:   "Remove an application",
+		Aliases: []string{"remove"},
+		Example: `$ docker app rm myinstallation --target-context=mycontext`,
 		Args:    cli.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runUninstall(dockerCli, args[0], opts)