move push and plugin errors into actionerror

Author: XenoPhex

actor/actionerror/add_plugin_repository_error.go

@@ -0,0 +1,13 @@
+package actionerror
+
+import "fmt"
+
+type AddPluginRepositoryError struct {
+	Name    string
+	URL     string
+	Message string
+}
+
+func (e AddPluginRepositoryError) Error() string {
+	return fmt.Sprintf("Could not add repository '%s' from %s: %s", e.Name, e.URL, e.Message)
+}

actor/actionerror/app_not_found_in_manifest_error.go

@@ -0,0 +1,11 @@
+package actionerror
+
+import "fmt"
+
+type AppNotFoundInManifestError struct {
+	Name string
+}
+
+func (e AppNotFoundInManifestError) Error() string {
+	return fmt.Sprintf("specfied app: %s not found in manifest", e.Name)
+}

actor/actionerror/command_line_options_with_multiple_apps_error.go

@@ -0,0 +1,7 @@
+package actionerror
+
+type CommandLineOptionsWithMultipleAppsError struct{}
+
+func (CommandLineOptionsWithMultipleAppsError) Error() string {
+	return "cannot use command line flag with multiple apps"
+}

actor/actionerror/domains_not_found_error.go

@@ -0,0 +1,13 @@
+package actionerror
+
+import "fmt"
+
+// NoDomainsFoundError is returned when there are no private or shared domains
+// accessible to an organization.
+type NoDomainsFoundError struct {
+	OrganizationGUID string
+}
+
+func (e NoDomainsFoundError) Error() string {
+	return fmt.Sprintf("No private or shared domains found for organization (GUID: %s)", e.OrganizationGUID)
+}

actor/actionerror/fetching_plugin_info_from_repository_error.go

@@ -0,0 +1,14 @@
+package actionerror
+
+import "fmt"
+
+// FetchingPluginInfoFromRepositoryError is returned an error is encountered
+// getting plugin info from a repository.
+type FetchingPluginInfoFromRepositoryError struct {
+	RepositoryName string
+	Err            error
+}
+
+func (e FetchingPluginInfoFromRepositoryError) Error() string {
+	return fmt.Sprintf("Plugin repository %s returned %s.", e.RepositoryName, e.Err.Error())
+}

actor/actionerror/getting_plugin_repository_error.go

@@ -0,0 +1,14 @@
+package actionerror
+
+import "fmt"
+
+// GettingPluginRepositoryError is returned when there's an error
+// accessing the plugin repository.
+type GettingPluginRepositoryError struct {
+	Name    string
+	Message string
+}
+
+func (e GettingPluginRepositoryError) Error() string {
+	return fmt.Sprintf("Could not get plugin repository '%s'\n%s", e.Name, e.Message)
+}

actor/actionerror/missing_name_error.go

@@ -0,0 +1,7 @@
+package actionerror
+
+type MissingNameError struct{}
+
+func (MissingNameError) Error() string {
+	return "name not specified for app"
+}

actor/actionerror/no_compatible_binary_error.go

@@ -0,0 +1,10 @@
+package actionerror
+
+// NoCompatibleBinaryError is returned when a repository contains a specified
+// plugin but not for the specified platform.
+type NoCompatibleBinaryError struct {
+}
+
+func (e NoCompatibleBinaryError) Error() string {
+	return "Plugin requested has no binary available for your platform."
+}

actor/actionerror/nonexistent_app_path_error.go

@@ -0,0 +1,11 @@
+package actionerror
+
+import "fmt"
+
+type NonexistentAppPathError struct {
+	Path string
+}
+
+func (e NonexistentAppPathError) Error() string {
+	return fmt.Sprint("app path not found:", e.Path)
+}

actor/actionerror/plugin_binary_remove_failed_error.go

@@ -0,0 +1,10 @@
+package actionerror
+
+// PluginBinaryRemoveFailedError is returned when running the plugin binary fails.
+type PluginBinaryRemoveFailedError struct {
+	Err error
+}
+
+func (e PluginBinaryRemoveFailedError) Error() string {
+	return e.Err.Error()
+}

actor/actionerror/plugin_commands_conflict_error.go

@@ -0,0 +1,14 @@
+package actionerror
+
+// PluginCommandsConflictError is returned when a plugin command name conflicts
+// with a core or existing plugin command name.
+type PluginCommandsConflictError struct {
+	PluginName     string
+	PluginVersion  string
+	CommandNames   []string
+	CommandAliases []string
+}
+
+func (PluginCommandsConflictError) Error() string {
+	return ""
+}

actor/actionerror/plugin_execute_error.go

@@ -0,0 +1,10 @@
+package actionerror
+
+// PluginExecuteError is returned when running the plugin binary fails.
+type PluginExecuteError struct {
+	Err error
+}
+
+func (e PluginExecuteError) Error() string {
+	return e.Err.Error()
+}

actor/actionerror/plugin_invalid_error.go

@@ -0,0 +1,11 @@
+package actionerror
+
+// PluginInvalidError is returned with a plugin is invalid because it is
+// missing a name or has 0 commands.
+type PluginInvalidError struct {
+	Err error
+}
+
+func (PluginInvalidError) Error() string {
+	return "File is not a valid cf CLI plugin binary."
+}

actor/actionerror/plugin_not_found_error.go

@@ -0,0 +1,13 @@
+package actionerror
+
+import "fmt"
+
+// PluginNotFoundError is an error returned when a plugin is not found.
+type PluginNotFoundError struct {
+	PluginName string
+}
+
+// Error outputs a plugin not found error message.
+func (e PluginNotFoundError) Error() string {
+	return fmt.Sprintf("Plugin name %s does not exist.", e.PluginName)
+}

actor/actionerror/plugin_not_found_in_any_repository_error.go

@@ -0,0 +1,14 @@
+package actionerror
+
+import "fmt"
+
+// PluginNotFoundInAnyRepositoryError is an error returned when a plugin cannot
+// be found in any repositories.
+type PluginNotFoundInAnyRepositoryError struct {
+	PluginName string
+}
+
+// Error outputs that the plugin cannot be found in any repositories.
+func (e PluginNotFoundInAnyRepositoryError) Error() string {
+	return fmt.Sprintf("Plugin %s not found in any registered repo", e.PluginName)
+}

actor/actionerror/plugin_not_found_in_repository_error.go

@@ -0,0 +1,15 @@
+package actionerror
+
+import "fmt"
+
+// PluginNotFoundInRepositoryError is an error returned when a plugin is not
+// found.
+type PluginNotFoundInRepositoryError struct {
+	PluginName     string
+	RepositoryName string
+}
+
+// Error outputs the plugin not found in repository error message.
+func (e PluginNotFoundInRepositoryError) Error() string {
+	return fmt.Sprintf("Plugin %s not found in repository %s", e.PluginName, e.RepositoryName)
+}

actor/actionerror/repository_already_exists_error.go

@@ -0,0 +1,12 @@
+package actionerror
+
+import "fmt"
+
+type RepositoryAlreadyExistsError struct {
+	Name string
+	URL  string
+}
+
+func (e RepositoryAlreadyExistsError) Error() string {
+	return fmt.Sprintf("%s already registered as %s.", e.URL, e.Name)
+}

actor/actionerror/repository_name_taken_error.go

@@ -0,0 +1,11 @@
+package actionerror
+
+import "fmt"
+
+type RepositoryNameTakenError struct {
+	Name string
+}
+
+func (e RepositoryNameTakenError) Error() string {
+	return fmt.Sprintf("Plugin repo named '%s' already exists, please use another name.", e.Name)
+}

actor/actionerror/repository_not_registered_error.go

@@ -0,0 +1,11 @@
+package actionerror
+
+import "fmt"
+
+type RepositoryNotRegisteredError struct {
+	Name string
+}
+
+func (e RepositoryNotRegisteredError) Error() string {
+	return fmt.Sprintf("Plugin repository %s not found", e.Name)
+}

actor/actionerror/upload_failed_error.go

@@ -0,0 +1,9 @@
+package actionerror
+
+type UploadFailedError struct {
+	Err error
+}
+
+func (UploadFailedError) Error() string {
+	return "upload failed"
+}

actor/pluginaction/install.go

@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strings"
 
+	"code.cloudfoundry.org/cli/actor/actionerror"
 	"code.cloudfoundry.org/cli/api/plugin"
 	"code.cloudfoundry.org/cli/util/configv3"
 	"code.cloudfoundry.org/cli/util/generic"
@@ -26,29 +27,6 @@ type CommandList interface {
 	HasAlias(string) bool
 }
 
-// PluginInvalidError is returned with a plugin is invalid because it is
-// missing a name or has 0 commands.
-type PluginInvalidError struct {
-	Err error
-}
-
-func (PluginInvalidError) Error() string {
-	return "File is not a valid cf CLI plugin binary."
-}
-
-// PluginCommandConflictError is returned when a plugin command name conflicts
-// with a core or existing plugin command name.
-type PluginCommandsConflictError struct {
-	PluginName     string
-	PluginVersion  string
-	CommandAliases []string
-	CommandNames   []string
-}
-
-func (PluginCommandsConflictError) Error() string {
-	return ""
-}
-
 // CreateExecutableCopy makes a temporary copy of a plugin binary and makes it
 // executable.
 //
@@ -80,8 +58,8 @@ func (actor Actor) CreateExecutableCopy(path string, tempPluginDir string) (stri
 	return executablePath, nil
 }
 
-// DownloadBinaryFromURL fetches a plugin binary from the specified URL, if
-// it exists.
+// DownloadExecutableBinaryFromURL fetches a plugin binary from the specified
+// URL, if it exists.
 func (actor Actor) DownloadExecutableBinaryFromURL(pluginURL string, tempPluginDir string, proxyReader plugin.ProxyReader) (string, error) {
 	tempFile, err := makeTempFile(tempPluginDir)
 	if err != nil {
@@ -106,7 +84,7 @@ func (actor Actor) FileExists(path string) bool {
 func (actor Actor) GetAndValidatePlugin(pluginMetadata PluginMetadata, commandList CommandList, path string) (configv3.Plugin, error) {
 	plugin, err := pluginMetadata.GetMetadata(path)
 	if err != nil || plugin.Name == "" || len(plugin.Commands) == 0 {
-		return configv3.Plugin{}, PluginInvalidError{Err: err}
+		return configv3.Plugin{}, actionerror.PluginInvalidError{Err: err}
 	}
 
 	installedPlugins := actor.config.Plugins()
@@ -152,7 +130,7 @@ func (actor Actor) GetAndValidatePlugin(pluginMetadata PluginMetadata, commandLi
 			return strings.ToLower(conflictingAliases[i]) < strings.ToLower(conflictingAliases[j])
 		})
 
-		return configv3.Plugin{}, PluginCommandsConflictError{
+		return configv3.Plugin{}, actionerror.PluginCommandsConflictError{
 			PluginName:     plugin.Name,
 			PluginVersion:  plugin.Version.String(),
 			CommandNames:   conflictingNames,