remove abrubt os.Exit calls

pkg/catalog/catalog.go

@@ -136,7 +136,11 @@ func getRegistryDevfiles(registry Registry) (registryDevfiles []DevfileComponent
 		request := util.HTTPRequestParams{
 			URL: indexLink,
 		}
-		if registryUtil.IsSecure(registry.Name) {
+		secure, err := registryUtil.IsSecure(registry.Name)
+		if err != nil {
+			return nil, err
+		}
+		if secure {
 			token, err := keyring.Get(fmt.Sprintf("%s%s", util.CredentialPrefix, registry.Name), registryUtil.RegistryUser)
 			if err != nil {
 				return nil, errors.Wrap(err, "unable to get secure registry credential from keyring")

pkg/devfile/adapters/kubernetes/component/adapter.go

@@ -32,7 +32,6 @@ import (
 	"github.com/openshift/odo/pkg/kclient"
 	"github.com/openshift/odo/pkg/log"
 	"github.com/openshift/odo/pkg/occlient"
-	odoutil "github.com/openshift/odo/pkg/odo/util"
 	storagepkg "github.com/openshift/odo/pkg/storage"
 	storagelabels "github.com/openshift/odo/pkg/storage/labels"
 	"github.com/openshift/odo/pkg/sync"
@@ -265,7 +264,7 @@ func (a Adapter) Push(parameters common.PushParameters) (err error) {
 	parameters.EnvSpecificInfo.SetDevfileObj(a.Devfile)
 	err = component.ApplyConfig(&a.Client, config.LocalConfigInfo{}, parameters.EnvSpecificInfo, color.Output, componentExists, false)
 	if err != nil {
-		odoutil.LogErrorAndExit(err, "Failed to update config to component deployed.")
+		return errors.Wrapf(err, "Failed to update config to component deployed.")
 	}
 
 	// Compare the name of the pod with the one before the rollout. If they differ, it means there's a new pod and a force push is required

pkg/odo/cli/component/common_link.go

@@ -116,7 +116,10 @@ func (o *commonLinkOptions) run() (err error) {
 		component = o.EnvSpecificInfo.GetName()
 		err = o.operation(o.secretName, component, o.Application)
 	} else {
-		component = o.Component()
+		component, err = o.Component()
+		if err != nil {
+			return err
+		}
 		err = o.operation(o.secretName, component, o.Application)
 	}
 

pkg/odo/cli/component/common_push.go

@@ -15,7 +15,6 @@ import (
 	"github.com/openshift/odo/pkg/kclient"
 	"github.com/openshift/odo/pkg/log"
 	"github.com/openshift/odo/pkg/odo/genericclioptions"
-	odoutil "github.com/openshift/odo/pkg/odo/util"
 	"github.com/openshift/odo/pkg/project"
 	"github.com/openshift/odo/pkg/util"
 	"github.com/pkg/errors"
@@ -113,13 +112,13 @@ func (cpo *CommonPushOptions) createCmpIfNotExistsAndApplyCmpConfig(stdout io.Wr
 				cmpName,
 				err,
 			)
-			os.Exit(1)
+			return err
 		}
 	}
 	// Apply config
 	err := component.ApplyConfig(cpo.Context.Client, *cpo.LocalConfigInfo, envinfo.EnvSpecificInfo{}, stdout, cpo.doesComponentExist, true)
 	if err != nil {
-		odoutil.LogErrorAndExit(err, "Failed to update config to component deployed.")
+		return errors.Wrapf(err, "Failed to update config to component deployed.")
 	}
 
 	return nil

pkg/odo/cli/component/component.go

@@ -23,19 +23,28 @@ type ComponentOptions struct {
 
 // Complete completes component options
 func (co *ComponentOptions) Complete(name string, cmd *cobra.Command, args []string) (err error) {
-	context := genericclioptions.GetContextFlagValue(cmd)
+	context, err := genericclioptions.GetContextFlagValue(cmd)
+	if err != nil {
+		return err
+	}
+
 	devfilePath := filepath.Join(context, devFile)
 	if util.CheckPathExists(devfilePath) {
 		co.Context, err = genericclioptions.NewDevfileContext(cmd)
 	} else {
 		co.Context, err = genericclioptions.NewContext(cmd)
 	}
 	if err != nil {
-		co.Context = genericclioptions.NewOfflineDevfileContext(cmd)
-		err = nil
+		co.Context, err = genericclioptions.NewOfflineDevfileContext(cmd)
+		if err != nil {
+			return err
+		}
 	}
 
-	co.componentName = co.Context.Component(args...)
+	co.componentName, err = co.Context.Component(args...)
+	if err != nil {
+		return nil
+	}
 	return
 }
 

pkg/odo/cli/component/create.go

@@ -163,7 +163,10 @@ func (co *CreateOptions) Complete(name string, cmd *cobra.Command, args []string
 			return err
 		}
 	} else {
-		co.Context = genericclioptions.NewOfflineDevfileContext(cmd)
+		co.Context, err = genericclioptions.NewOfflineDevfileContext(cmd)
+		if err != nil {
+			return err
+		}
 	}
 
 	// Configure the context
@@ -488,7 +491,13 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
 				params = util.HTTPRequestParams{
 					URL: co.devfileMetadata.devfileRegistry.URL + co.devfileMetadata.devfileLink,
 				}
-				if registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name) {
+
+				secure, err := registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name)
+				if err != nil {
+					return err
+				}
+
+				if secure {
 					var token string
 					token, err = keyring.Get(fmt.Sprintf("%s%s", util.CredentialPrefix, co.devfileMetadata.devfileRegistry.Name), registryUtil.RegistryUser)
 					if err != nil {
@@ -543,7 +552,11 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
 		return err
 	}
 
-	if co.devfileMetadata.starterToken == "" && registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name) {
+	secure, err := registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name)
+	if err != nil {
+		return err
+	}
+	if co.devfileMetadata.starterToken == "" && secure {
 		var token string
 		token, err = keyring.Get(fmt.Sprintf("%s%s", util.CredentialPrefix, co.devfileMetadata.devfileRegistry.Name), registryUtil.RegistryUser)
 		if err != nil {

pkg/odo/cli/component/devfile.go

@@ -173,7 +173,7 @@ func (lo LogOptions) DevfileComponentLog() error {
 			componentName,
 			err,
 		)
-		os.Exit(1)
+		return err
 	}
 
 	return util.DisplayLog(lo.logFollow, rd, os.Stdout, componentName, -1)

pkg/odo/cli/component/get.go

@@ -38,7 +38,10 @@ func (gto *GetOptions) Complete(name string, cmd *cobra.Command, args []string)
 	if err != nil {
 		return err
 	}
-	gto.componentName = gto.Context.ComponentAllowingEmpty(true)
+	gto.componentName, err = gto.Context.ComponentAllowingEmpty(true)
+	if err != nil {
+		return err
+	}
 	return
 }
 

pkg/odo/cli/component/link.go

@@ -102,8 +102,12 @@ func (o *LinkOptions) Validate() (err error) {
 	if o.Context.EnvSpecificInfo != nil {
 		return
 	}
+	componentName, err := o.Component()
+	if err != nil {
+		return err
+	}
 
-	alreadyLinkedSecretNames, err := component.GetComponentLinkedSecretNames(o.Client, o.Component(), o.Application)
+	alreadyLinkedSecretNames, err := component.GetComponentLinkedSecretNames(o.Client, componentName, o.Application)
 	if err != nil {
 		return err
 	}

pkg/odo/cli/component/list.go

@@ -90,7 +90,10 @@ func (lo *ListOptions) Complete(name string, cmd *cobra.Command, args []string)
 
 		} else {
 			klog.V(4).Infof("New Config Context")
-			lo.Context = genericclioptions.NewConfigContext(cmd)
+			lo.Context, err = genericclioptions.NewConfigContext(cmd)
+			if err != nil {
+				return err
+			}
 			// for disconnected situation we just assume we have DC support
 			lo.hasDCSupport = true
 		}

pkg/odo/cli/preference/view.go

@@ -9,7 +9,6 @@ import (
 	"github.com/openshift/odo/pkg/log"
 	"github.com/openshift/odo/pkg/machineoutput"
 	"github.com/openshift/odo/pkg/odo/genericclioptions"
-	"github.com/openshift/odo/pkg/odo/util"
 	"github.com/openshift/odo/pkg/preference"
 	"github.com/spf13/cobra"
 	ktemplates "k8s.io/kubectl/pkg/util/templates"
@@ -46,7 +45,7 @@ func (o *ViewOptions) Run(cmd *cobra.Command) (err error) {
 	cfg, err := preference.New()
 
 	if err != nil {
-		util.LogErrorAndExit(err, "")
+		return err
 	}
 
 	if log.IsJSON() {

pkg/odo/cli/registry/delete.go

@@ -58,8 +58,10 @@ func (o *DeleteOptions) Validate() (err error) {
 
 // Run contains the logic for "odo registry delete" command
 func (o *DeleteOptions) Run(cmd *cobra.Command) (err error) {
-	isSecure := registryUtil.IsSecure(o.registryName)
-
+	isSecure, err := registryUtil.IsSecure(o.registryName)
+	if err != nil {
+		return err
+	}
 	cfg, err := preference.New()
 	if err != nil {
 		return errors.Wrap(err, "unable to delete registry")

pkg/odo/cli/registry/list.go

@@ -3,7 +3,6 @@ package registry
 import (
 	// Built-in packages
 	"fmt"
-	util2 "github.com/openshift/odo/pkg/odo/cli/registry/util"
 	"io"
 	"os"
 	"text/tabwriter"
@@ -15,8 +14,8 @@ import (
 	ktemplates "k8s.io/kubectl/pkg/util/templates"
 
 	// odo packages
+	util "github.com/openshift/odo/pkg/odo/cli/registry/util"
 	"github.com/openshift/odo/pkg/odo/genericclioptions"
-	"github.com/openshift/odo/pkg/odo/util"
 	"github.com/openshift/odo/pkg/preference"
 )
 
@@ -57,7 +56,7 @@ func (o *ListOptions) Validate() (err error) {
 func (o *ListOptions) Run(cmd *cobra.Command) (err error) {
 	cfg, err := preference.New()
 	if err != nil {
-		util.LogErrorAndExit(err, "")
+		return err
 	}
 
 	registryList := cfg.OdoSettings.RegistryList
@@ -75,7 +74,7 @@ func (o *ListOptions) Run(cmd *cobra.Command) (err error) {
 	o.printRegistryList(w, registryList)
 	w.Flush()
 	if o.printGitRegistryDeprecationWarning {
-		util2.PrintGitRegistryDeprecationWarning()
+		util.PrintGitRegistryDeprecationWarning()
 	}
 	return
 }
@@ -94,7 +93,7 @@ func (o *ListOptions) printRegistryList(w io.Writer, registryList *[]preference.
 			secure = "Yes"
 		}
 		fmt.Fprintln(w, registry.Name, "\t", registry.URL, "\t", secure)
-		if util2.IsGitBasedRegistry(registry.URL) {
+		if util.IsGitBasedRegistry(registry.URL) {
 			o.printGitRegistryDeprecationWarning = true
 		}
 	}

pkg/odo/cli/registry/update.go

@@ -68,9 +68,16 @@ func (o *UpdateOptions) Validate() (err error) {
 func (o *UpdateOptions) Run(cmd *cobra.Command) (err error) {
 	secureBeforeUpdate := false
 	secureAfterUpdate := false
-	if registryUtil.IsSecure(o.registryName) {
+
+	secure, err := registryUtil.IsSecure(o.registryName)
+	if err != nil {
+		return err
+	}
+
+	if secure {
 		secureBeforeUpdate = true
 	}
+
 	if o.token != "" {
 		secureAfterUpdate = true
 	}

pkg/odo/cli/registry/util/util.go

@@ -3,24 +3,21 @@ package util
 import (
 	// odo packages
 
-	"os"
 	"strings"
 
 	"github.com/openshift/odo/pkg/log"
 	"github.com/openshift/odo/pkg/preference"
-	"github.com/pkg/errors"
 )
 
 const (
 	RegistryUser = "default"
 )
 
 // IsSecure checks if the registry is secure
-func IsSecure(registryName string) bool {
+func IsSecure(registryName string) (bool, error) {
 	cfg, err := preference.New()
 	if err != nil {
-		log.Error(errors.Cause(err))
-		os.Exit(1)
+		return false, err
 	}
 
 	isSecure := false
@@ -33,7 +30,7 @@ func IsSecure(registryName string) bool {
 		}
 	}
 
-	return isSecure
+	return isSecure, nil
 }
 
 func IsGitBasedRegistry(url string) bool {

pkg/odo/cli/registry/util/util_test.go

@@ -62,7 +62,10 @@ func TestIsSecure(t *testing.T) {
 				t.Errorf("Unable to add registry to preference file with error: %v", err)
 			}
 
-			got := IsSecure(tt.registryName)
+			got, err := IsSecure(tt.registryName)
+			if err != nil {
+				t.Errorf("Unable to check if the registry is secure or not")
+			}
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Got: %t, want %t", got, tt.want)
 			}