Do not call LogErrorAndExit but return err in GenericRun (#6352)

* Do not call LogErrorAndExit but return err in GenericRun * Review
redhat-developer · Nov 30, 2022 · 3fc9f97 · 3fc9f97
1 parent aba1515
commit 3fc9f97
Show file tree

Hide file tree

Showing 30 changed files with 95 additions and 78 deletions.
diff --git a/pkg/odo/cli/add/binding/binding.go b/pkg/odo/cli/add/binding/binding.go
@@ -195,8 +195,8 @@ func NewCmdBinding(name, fullName string) *cobra.Command {
 		Long:    "Add a binding between a service and the component in the devfile",
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
 		Example: fmt.Sprintf(addBindingExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	bindingCmd.Flags().String(backend.FLAG_NAME, "", "Name of the Binding to create")

diff --git a/pkg/odo/cli/alizer/alizer.go b/pkg/odo/cli/alizer/alizer.go
@@ -65,8 +65,8 @@ func NewCmdAlizer(name, fullName string) *cobra.Command {
 		Long:        "Detect devfile to use based on files present in current directory",
 		Args:        cobra.MaximumNArgs(0),
 		Annotations: map[string]string{},
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(alizerCmd, clientset.ALIZER, clientset.FILESYSTEM)

diff --git a/pkg/odo/cli/build_images/build_images.go b/pkg/odo/cli/build_images/build_images.go
@@ -74,8 +74,8 @@ func NewCmdBuildImages(name, fullName string) *cobra.Command {
 		Long:    "Build images defined in the devfile",
 		Example: fmt.Sprintf(buildImagesExample, fullName),
 		Args:    cobra.MaximumNArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

diff --git a/pkg/odo/cli/create/namespace/namespace.go b/pkg/odo/cli/create/namespace/namespace.go
@@ -125,8 +125,8 @@ func NewCmdNamespaceCreate(name, fullName string) *cobra.Command {
 		Long:    createLongDesc,
 		Example: fmt.Sprintf(createExample, fullName),
 		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Annotations: map[string]string{"command": "main"},
 		Aliases:     []string{"project"},

diff --git a/pkg/odo/cli/delete/component/component.go b/pkg/odo/cli/delete/component/component.go
@@ -316,8 +316,8 @@ func NewCmdComponent(name, fullName string) *cobra.Command {
 		Long:    "Delete component",
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
 		Example: fmt.Sprintf(deleteExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	componentCmd.Flags().StringVar(&o.name, "name", "", "Name of the component to delete, optional. By default, the component described in the local devfile is deleted")

diff --git a/pkg/odo/cli/delete/namespace/namespace.go b/pkg/odo/cli/delete/namespace/namespace.go
@@ -3,9 +3,10 @@ package namespace
 import (
 	"context"
 	"fmt"
+	"os"
+
 	"github.com/spf13/cobra"
 	ktemplates "k8s.io/kubectl/pkg/util/templates"
-	"os"
 
 	"github.com/redhat-developer/odo/pkg/log"
 	"github.com/redhat-developer/odo/pkg/odo/cli/ui"
@@ -117,8 +118,8 @@ func NewCmdNamespaceDelete(name, fullName string) *cobra.Command {
 		Long:    deleteLongDesc,
 		Example: fmt.Sprintf(deleteExample, fullName),
 		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(do, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(do, cmd, args)
 		},
 		Annotations: map[string]string{"command": "main"},
 		Aliases:     []string{"project"},

diff --git a/pkg/odo/cli/deploy/deploy.go b/pkg/odo/cli/deploy/deploy.go
@@ -99,8 +99,8 @@ func NewCmdDeploy(name, fullName string) *cobra.Command {
 		Long:    "Deploy the components defined in the devfile",
 		Example: fmt.Sprintf(deployExample, fullName),
 		Args:    cobra.MaximumNArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(deployCmd, clientset.INIT, clientset.DEPLOY, clientset.FILESYSTEM)

diff --git a/pkg/odo/cli/describe/binding.go b/pkg/odo/cli/describe/binding.go
@@ -113,8 +113,8 @@ func NewCmdBinding(name, fullName string) *cobra.Command {
 		Long:    "Describe bindings",
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
 		Example: fmt.Sprintf(describeBindingExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	bindingCmd.Flags().StringVar(&o.nameFlag, "name", "", "Name of the binding to describe, optional. By default, the bindings in the local devfile are described")

diff --git a/pkg/odo/cli/describe/component.go b/pkg/odo/cli/describe/component.go
@@ -286,8 +286,8 @@ func NewCmdComponent(name, fullName string) *cobra.Command {
 		Long:    "Describe a component",
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
 		Example: fmt.Sprintf(describeExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	componentCmd.Flags().StringVar(&o.nameFlag, "name", "", "Name of the component to describe, optional. By default, the component in the local devfile is described")

diff --git a/pkg/odo/cli/dev/dev.go b/pkg/odo/cli/dev/dev.go
@@ -208,8 +208,8 @@ func NewCmdDev(name, fullName string) *cobra.Command {
 It forwards endpoints with any exposure values ('public', 'internal' or 'none') to a port on localhost.`,
 		Example: fmt.Sprintf(devExample, fullName),
 		Args:    cobra.MaximumNArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	devCmd.Flags().BoolVar(&o.noWatchFlag, "no-watch", false, "Do not watch for file changes")

diff --git a/pkg/odo/cli/init/init.go b/pkg/odo/cli/init/init.go
@@ -256,8 +256,8 @@ func NewCmdInit(name, fullName string) *cobra.Command {
 		Long:    "Bootstraps a new project",
 		Example: fmt.Sprintf(initExample, fullName),
 		Args:    cobra.MaximumNArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(initCmd, clientset.PREFERENCE, clientset.FILESYSTEM, clientset.REGISTRY, clientset.INIT)

diff --git a/pkg/odo/cli/list/binding/binding.go b/pkg/odo/cli/list/binding/binding.go
@@ -111,8 +111,8 @@ func NewCmdBindingList(name, fullName string) *cobra.Command {
 		Long:    listLongDesc,
 		Example: fmt.Sprintf(listExample, fullName),
 		Args:    cobra.ExactArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Aliases: []string{"bindings"},
 	}

diff --git a/pkg/odo/cli/list/component/list.go b/pkg/odo/cli/list/component/list.go
@@ -127,8 +127,8 @@ func NewCmdComponentList(name, fullName string) *cobra.Command {
 		Example:     fmt.Sprintf(listExample, fullName),
 		Args:        genericclioptions.NoArgsAndSilenceJSON,
 		Annotations: map[string]string{"command": "management"},
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Aliases: []string{"components"},
 	}

diff --git a/pkg/odo/cli/list/list.go b/pkg/odo/cli/list/list.go
@@ -146,8 +146,8 @@ func NewCmdList(name, fullName string) *cobra.Command {
 		Example:     fmt.Sprintf(listExample, fullName),
 		Args:        genericclioptions.NoArgsAndSilenceJSON,
 		Annotations: map[string]string{"command": "management"},
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(listCmd, clientset.KUBERNETES, clientset.BINDING, clientset.FILESYSTEM)

diff --git a/pkg/odo/cli/list/namespace/namespace.go b/pkg/odo/cli/list/namespace/namespace.go
@@ -108,8 +108,8 @@ func NewCmdNamespaceList(name, fullName string) *cobra.Command {
 		Long:    listLongDesc,
 		Example: fmt.Sprintf(listExample, fullName),
 		Args:    cobra.ExactArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Aliases: []string{"namespaces", "project", "projects"},
 	}

diff --git a/pkg/odo/cli/list/services/services.go b/pkg/odo/cli/list/services/services.go
@@ -161,8 +161,8 @@ func NewCmdServicesList(name, fullName string) *cobra.Command {
 		Long:    listLongDesc,
 		Example: fmt.Sprintf(listExample, fullName),
 		Args:    cobra.ExactArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Aliases: []string{"service"},
 	}

diff --git a/pkg/odo/cli/login/login.go b/pkg/odo/cli/login/login.go
@@ -100,8 +100,8 @@ func NewCmdLogin(name, fullName string) *cobra.Command {
 		Long:    "Login to cluster",
 		Example: fmt.Sprintf(loginExample, fullName),
 		Args:    cobra.MaximumNArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

diff --git a/pkg/odo/cli/logout/logout.go b/pkg/odo/cli/logout/logout.go
@@ -61,8 +61,8 @@ func NewCmdLogout(name, fullName string) *cobra.Command {
 		Long:    "Logout of the cluster.",
 		Example: fmt.Sprintf(example, fullName),
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

diff --git a/pkg/odo/cli/logs/logs.go b/pkg/odo/cli/logs/logs.go
@@ -234,8 +234,8 @@ func NewCmdLogs(name, fullname string) *cobra.Command {
 By default it shows logs of all containers running in both Dev and Deploy mode. It prefixes each log message with the container name.`,
 		Example: fmt.Sprintf(logsExample, fullname),
 		Args:    cobra.MaximumNArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	logsCmd.Flags().BoolVar(&o.devMode, string(DevMode), false, "Show logs for containers running only in Dev mode")

diff --git a/pkg/odo/cli/preference/add/registry.go b/pkg/odo/cli/preference/add/registry.go
@@ -115,8 +115,8 @@ func NewCmdRegistry(name, fullName string) *cobra.Command {
 		Long:    addLongDesc,
 		Example: fmt.Sprintf(fmt.Sprint(addExample), fullName),
 		Args:    cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(registryCmd, clientset.PREFERENCE)

diff --git a/pkg/odo/cli/preference/remove/registry.go b/pkg/odo/cli/preference/remove/registry.go
@@ -97,8 +97,8 @@ func NewCmdRegistry(name, fullName string) *cobra.Command {
 		Long:    removeLongDesc,
 		Example: fmt.Sprintf(fmt.Sprint(removeExample), fullName),
 		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(registryDeleteCmd, clientset.PREFERENCE)

diff --git a/pkg/odo/cli/preference/set.go b/pkg/odo/cli/preference/set.go
@@ -106,8 +106,8 @@ func NewCmdSet(ctx context.Context, name, fullName string) *cobra.Command {
 			return "\n" + exampleString
 		}(setExample, fullName),
 		Args: cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(preferenceSetCmd, clientset.PREFERENCE)

diff --git a/pkg/odo/cli/preference/unset.go b/pkg/odo/cli/preference/unset.go
@@ -104,8 +104,8 @@ func NewCmdUnset(name, fullName string) *cobra.Command {
 			return "\n" + exampleString + "\n"
 		}(unsetExample, fullName),
 		Args: cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(preferenceUnsetCmd, clientset.PREFERENCE)

diff --git a/pkg/odo/cli/preference/view.go b/pkg/odo/cli/preference/view.go
@@ -128,8 +128,8 @@ func NewCmdView(name, fullName string) *cobra.Command {
 		Example: fmt.Sprintf(fmt.Sprint("\n", viewExample), fullName),
 
 		Args: cobra.ExactArgs(0),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(preferenceViewCmd, clientset.PREFERENCE)

diff --git a/pkg/odo/cli/registry/registry.go b/pkg/odo/cli/registry/registry.go
@@ -108,8 +108,8 @@ func NewCmdRegistry(name, fullName string) *cobra.Command {
 		Short:   "List all components from the Devfile registry",
 		Long:    "List all components from the Devfile registry",
 		Example: fmt.Sprintf(Example, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 

diff --git a/pkg/odo/cli/remove/binding/binding.go b/pkg/odo/cli/remove/binding/binding.go
@@ -81,8 +81,8 @@ func NewCmdBinding(name, fullName string) *cobra.Command {
 		Long:    "Remove a binding between a service and the component from the devfile",
 		Args:    genericclioptions.NoArgsAndSilenceJSON,
 		Example: fmt.Sprintf(removeBindingExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	bindingCmd.Flags().String(backend.FLAG_NAME, "", "Name of the Binding to create")

diff --git a/pkg/odo/cli/set/namespace/namespace.go b/pkg/odo/cli/set/namespace/namespace.go
@@ -96,8 +96,8 @@ func NewCmdNamespaceSet(name, fullName string) *cobra.Command {
 		Long:    setLongDesc,
 		Example: fmt.Sprintf(setExample, fullName),
 		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 		Annotations: map[string]string{"command": "main"},
 		Aliases:     []string{"project"},

diff --git a/pkg/odo/cli/telemetry/telemetry.go b/pkg/odo/cli/telemetry/telemetry.go
@@ -85,8 +85,8 @@ func NewCmdTelemetry(name string) *cobra.Command {
 		DisableFlagsInUseLine:  true,
 		DisableSuggestions:     true,
 		FParseErrWhitelist:     cobra.FParseErrWhitelist{},
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(telemetryCmd)

diff --git a/pkg/odo/cli/version/version.go b/pkg/odo/cli/version/version.go
@@ -125,8 +125,8 @@ func NewCmdVersion(name, fullName string) *cobra.Command {
 		Short:   versionLongDesc,
 		Long:    versionLongDesc,
 		Example: fmt.Sprintf(versionExample, fullName),
-		Run: func(cmd *cobra.Command, args []string) {
-			genericclioptions.GenericRun(o, cmd, args)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return genericclioptions.GenericRun(o, cmd, args)
 		},
 	}
 	clientset.Add(versionCmd, clientset.PREFERENCE)