HandleError is dead, long live ConvertToTranslatableError!

- replaced PluginInstallationCancelled with boolean return
- adjusted InvalidSSLCertError to match UnverifiedServerError
- adjust integration test for ApplicationNotFoundError

Author: XenoPhex

command/common/install_plugin_command.go

@@ -77,36 +77,36 @@ func (cmd *InstallPluginCommand) Setup(config command.Config, ui command.UI) err
 func (cmd InstallPluginCommand) Execute([]string) error {
 	err := os.MkdirAll(cmd.Config.PluginHome(), 0700)
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	tempPluginDir, err := ioutil.TempDir(cmd.Config.PluginHome(), "temp")
 	defer os.RemoveAll(tempPluginDir)
 
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	tempPluginPath, pluginSource, err := cmd.getPluginBinaryAndSource(tempPluginDir)
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	// copy twice when downloading from a URL to keep Windows specific code
 	// isolated to CreateExecutableCopy
 	executablePath, err := cmd.Actor.CreateExecutableCopy(tempPluginPath, tempPluginDir)
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	rpcService, err := shared.NewRPCService(cmd.Config, cmd.UI)
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	plugin, err := cmd.Actor.GetAndValidatePlugin(rpcService, Commands, executablePath)
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	if cmd.Actor.IsPluginInstalled(plugin.Name) {
@@ -120,7 +120,7 @@ func (cmd InstallPluginCommand) Execute([]string) error {
 
 		err = cmd.uninstallPlugin(plugin, rpcService)
 		if err != nil {
-			return shared.HandleError(err)
+			return err
 		}
 	}
 
@@ -256,23 +256,21 @@ func (InstallPluginCommand) handleFetchingPluginInfoFromRepositoriesError(fetchE
 }
 
 func (cmd InstallPluginCommand) getPluginFromLocalFile(pluginLocation string) (string, PluginSource, error) {
-	err := cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
+	exitInstall, err := cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
 		"Path": pluginLocation,
 	})
-	if err != nil {
+	if err != nil || exitInstall {
 		return "", 0, err
 	}
 
 	return pluginLocation, PluginFromLocalFile, err
 }
 
 func (cmd InstallPluginCommand) getPluginFromURL(pluginLocation string, tempPluginDir string) (string, PluginSource, error) {
-	var err error
-
-	err = cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
+	exitInstall, err := cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
 		"Path": pluginLocation,
 	})
-	if err != nil {
+	if err != nil || exitInstall {
 		return "", 0, err
 	}
 
@@ -311,23 +309,24 @@ func (cmd InstallPluginCommand) getPluginFromRepositories(pluginName string, rep
 	})
 
 	installedPlugin, exist := cmd.Config.GetPlugin(pluginName)
+	var exitInstall bool
 	if exist {
 		cmd.UI.DisplayText("Plugin {{.PluginName}} {{.PluginVersion}} is already installed.", map[string]interface{}{
 			"PluginName":    installedPlugin.Name,
 			"PluginVersion": installedPlugin.Version.String(),
 		})
 
-		err = cmd.installPluginPrompt("Do you want to uninstall the existing plugin and install {{.Path}} {{.PluginVersion}}?", map[string]interface{}{
+		exitInstall, err = cmd.installPluginPrompt("Do you want to uninstall the existing plugin and install {{.Path}} {{.PluginVersion}}?", map[string]interface{}{
 			"Path":          pluginName,
 			"PluginVersion": pluginInfo.Version,
 		})
 	} else {
-		err = cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
+		exitInstall, err = cmd.installPluginPrompt(installConfirmationPrompt, map[string]interface{}{
 			"Path": pluginName,
 		})
 	}
 
-	if err != nil {
+	if err != nil || exitInstall {
 		return "", 0, err
 	}
 
@@ -347,12 +346,12 @@ func (cmd InstallPluginCommand) getPluginFromRepositories(pluginName string, rep
 	return tempPath, PluginFromRepository, err
 }
 
-func (cmd InstallPluginCommand) installPluginPrompt(template string, templateValues ...map[string]interface{}) error {
+func (cmd InstallPluginCommand) installPluginPrompt(template string, templateValues ...map[string]interface{}) (bool, error) {
 	cmd.UI.DisplayHeader("Attention: Plugins are binaries written by potentially untrusted authors.")
 	cmd.UI.DisplayHeader("Install and use plugins at your own risk.")
 
 	if cmd.Force {
-		return nil
+		return false, nil
 	}
 
 	var (
@@ -363,13 +362,13 @@ func (cmd InstallPluginCommand) installPluginPrompt(template string, templateVal
 	really, promptErr = cmd.UI.DisplayBoolPrompt(false, template, templateValues...)
 
 	if promptErr != nil {
-		return promptErr
+		return false, promptErr
 	}
 
 	if !really {
 		cmd.UI.DisplayText("Plugin installation cancelled.")
-		return shared.PluginInstallationCancelled{}
+		return true, nil
 	}
 
-	return nil
+	return false, nil
 }

command/common/install_plugin_command_test.go

@@ -100,7 +100,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns an error", func() {
-						Expect(executeErr).To(MatchError(translatableerror.PluginInvalidError{}))
+						Expect(executeErr).To(MatchError(returnedErr))
 
 						Expect(testUI.Out).ToNot(Say("Installing plugin"))
 					})
@@ -115,7 +115,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns an error", func() {
-						Expect(executeErr).To(MatchError(translatableerror.PluginInvalidError{Err: wrappedErr}))
+						Expect(executeErr).To(MatchError(actionerror.PluginInvalidError{Err: wrappedErr}))
 
 						Expect(testUI.Out).ToNot(Say("Installing plugin"))
 					})
@@ -454,7 +454,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns a DownloadPluginHTTPError", func() {
-						Expect(executeErr).To(MatchError(translatableerror.DownloadPluginHTTPError{Message: "some-status"}))
+						Expect(executeErr).To(MatchError(pluginerror.RawHTTPStatusError{Status: "some-status"}))
 					})
 				})
 
@@ -464,7 +464,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns a DownloadPluginHTTPError", func() {
-						Expect(executeErr).To(MatchError(translatableerror.DownloadPluginHTTPError{Message: "x509: certificate signed by unknown authority"}))
+						Expect(executeErr).To(MatchError(pluginerror.UnverifiedServerError{}))
 					})
 				})
 			})
@@ -503,7 +503,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns an error", func() {
-						Expect(executeErr).To(MatchError(translatableerror.PluginInvalidError{}))
+						Expect(executeErr).To(MatchError(returnedErr))
 
 						Expect(fakeActor.IsPluginInstalledCallCount()).To(Equal(0))
 					})

command/common/install_plugin_from_repo_command_test.go

@@ -93,7 +93,7 @@ var _ = Describe("install-plugin command", func() {
 			})
 
 			It("returns a RepositoryNotRegisteredError", func() {
-				Expect(executeErr).To(MatchError(translatableerror.RepositoryNotRegisteredError{Name: repoName}))
+				Expect(executeErr).To(MatchError(actionerror.RepositoryNotRegisteredError{Name: repoName}))
 
 				Expect(fakeActor.GetPluginRepositoryCallCount()).To(Equal(1))
 				repositoryNameArg := fakeActor.GetPluginRepositoryArgsForCall(0)
@@ -118,7 +118,7 @@ var _ = Describe("install-plugin command", func() {
 				})
 
 				It("returns a JSONSyntaxError", func() {
-					Expect(executeErr).To(MatchError(translatableerror.JSONSyntaxError{Err: jsonErr}))
+					Expect(executeErr).To(MatchError(jsonErr))
 				})
 			})
 
@@ -149,7 +149,7 @@ var _ = Describe("install-plugin command", func() {
 					})
 
 					It("returns the wrapped client(request/http status) error", func() {
-						Expect(executeErr).To(MatchError(translatableerror.DownloadPluginHTTPError{Message: returnedErr.Status}))
+						Expect(executeErr).To(MatchError(returnedErr))
 					})
 				})
 			})
@@ -181,7 +181,7 @@ var _ = Describe("install-plugin command", func() {
 				})
 
 				It("returns the NoCompatibleBinaryError", func() {
-					Expect(executeErr).To(MatchError(translatableerror.NoCompatibleBinaryError{}))
+					Expect(executeErr).To(MatchError(actionerror.NoCompatibleBinaryError{}))
 				})
 			})
 
@@ -316,7 +316,7 @@ var _ = Describe("install-plugin command", func() {
 										})
 
 										It("returns the error", func() {
-											Expect(executeErr).To(MatchError(translatableerror.PluginInvalidError{}))
+											Expect(executeErr).To(MatchError(actionerror.PluginInvalidError{}))
 											Expect(testUI.Out).ToNot(Say("Installing plugin"))
 
 											Expect(fakeActor.GetAndValidatePluginCallCount()).To(Equal(1))
@@ -482,7 +482,7 @@ var _ = Describe("install-plugin command", func() {
 										})
 
 										It("returns the error", func() {
-											Expect(executeErr).To(MatchError(translatableerror.PluginInvalidError{}))
+											Expect(executeErr).To(MatchError(actionerror.PluginInvalidError{}))
 											Expect(testUI.Out).ToNot(Say("Installing plugin"))
 										})
 									})

command/plugin/add_plugin_repo_command.go

@@ -47,7 +47,7 @@ func (cmd AddPluginRepoCommand) Execute(args []string) error {
 				"RepositoryURL":  cmd.RequiredArgs.PluginRepoURL,
 			})
 	default:
-		return shared.HandleError(err)
+		return err
 	}
 
 	return nil

command/plugin/add_plugin_repo_command_test.go

@@ -5,7 +5,6 @@ import (
 	"code.cloudfoundry.org/cli/command/commandfakes"
 	. "code.cloudfoundry.org/cli/command/plugin"
 	"code.cloudfoundry.org/cli/command/plugin/pluginfakes"
-	"code.cloudfoundry.org/cli/command/translatableerror"
 	"code.cloudfoundry.org/cli/util/ui"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -40,7 +39,7 @@ var _ = Describe("add-plugin-repo command", func() {
 		})
 
 		It("returns RepositoryNameTakenError", func() {
-			Expect(executeErr).To(MatchError(translatableerror.RepositoryNameTakenError{Name: "some-repo"}))
+			Expect(executeErr).To(MatchError(actionerror.RepositoryNameTakenError{Name: "some-repo"}))
 		})
 	})
 
@@ -71,7 +70,7 @@ var _ = Describe("add-plugin-repo command", func() {
 		})
 
 		It("handles the error", func() {
-			Expect(executeErr).To(MatchError(translatableerror.AddPluginRepositoryError{Name: "some-repo", URL: "some-URL", Message: "404"}))
+			Expect(executeErr).To(MatchError(actionerror.AddPluginRepositoryError{Name: "some-repo", URL: "some-URL", Message: "404"}))
 		})
 	})
 

command/plugin/plugins_command.go

@@ -75,7 +75,7 @@ func (cmd PluginsCommand) displayOutdatedPlugins() error {
 
 	outdatedPlugins, err := cmd.Actor.GetOutdatedPlugins()
 	if err != nil {
-		return shared.HandleError(err)
+		return err
 	}
 
 	table := [][]string{{"plugin", "version", "latest version"}}

command/plugin/plugins_command_test.go

@@ -198,7 +198,7 @@ var _ = Describe("plugins Command", func() {
 						})
 					})
 					It("displays the repository and the error", func() {
-						Expect(executeErr).To(MatchError(translatableerror.GettingPluginRepositoryError{
+						Expect(executeErr).To(MatchError(actionerror.GettingPluginRepositoryError{
 							Name:    "repo-1",
 							Message: "404",
 						}))