add return error for more functions

Signed-off-by: anandrkskd <[email protected]>
redhat-developer · Sep 29, 2021 · 3ad14ec · 3ad14ec
1 parent 7afd222
commit 3ad14ec
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 15 deletions.
diff --git a/pkg/catalog/catalog.go b/pkg/catalog/catalog.go
@@ -136,14 +136,16 @@ func getRegistryDevfiles(registry Registry) (registryDevfiles []DevfileComponent
 		request := util.HTTPRequestParams{
 			URL: indexLink,
 		}
-		if secure, err := registryUtil.IsSecure(registry.Name); secure && err == nil {
+		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")
 			}
 			request.Token = token
-		} else {
-			return nil, err
 		}
 
 		cfg, err := preference.New()

diff --git a/pkg/odo/cli/component/component.go b/pkg/odo/cli/component/component.go
@@ -39,7 +39,10 @@ func (co *ComponentOptions) Complete(name string, cmd *cobra.Command, args []str
 		err = nil
 	}
 
-	co.componentName = co.Context.Component(args...)
+	co.componentName, err = co.Context.Component(args...)
+	if err != nil {
+		return nil
+	}
 	return
 }
 

diff --git a/pkg/odo/cli/component/create.go b/pkg/odo/cli/component/create.go
@@ -491,15 +491,19 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
 				params = util.HTTPRequestParams{
 					URL: co.devfileMetadata.devfileRegistry.URL + co.devfileMetadata.devfileLink,
 				}
-				if secure, err := registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name); secure && err == nil {
+
+				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 {
 						return errors.Wrap(err, "unable to get secure registry credential from keyring")
 					}
 					params.Token = token
-				} else {
-					return err
 				}
 			} else {
 				err = registryLibrary.PullStackFromRegistry(co.devfileMetadata.devfileRegistry.URL, co.devfileMetadata.componentType, co.componentContext)
@@ -548,15 +552,17 @@ func (co *CreateOptions) devfileRun(cmd *cobra.Command) (err error) {
 		return err
 	}
 
-	if secure, err := registryUtil.IsSecure(co.devfileMetadata.devfileRegistry.Name); co.devfileMetadata.starterToken == "" && secure && err == nil {
+	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 {
 			return errors.Wrap(err, "unable to get secure registry credential from keyring")
 		}
 		co.devfileMetadata.starterToken = token
-	} else {
-		return err
 	}
 
 	err = decideAndDownloadStarterProject(devObj, co.devfileMetadata.starter, co.devfileMetadata.starterToken, co.interactive, co.componentContext)

diff --git a/pkg/odo/cli/component/get.go b/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
 }
 

diff --git a/pkg/odo/cli/component/link.go b/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
 	}

diff --git a/pkg/odo/cli/registry/update.go b/pkg/odo/cli/registry/update.go
@@ -68,11 +68,16 @@ func (o *UpdateOptions) Validate() (err error) {
 func (o *UpdateOptions) Run(cmd *cobra.Command) (err error) {
 	secureBeforeUpdate := false
 	secureAfterUpdate := false
-	if secure, err := registryUtil.IsSecure(o.registryName); secure {
-		secureBeforeUpdate = true
-	} else {
+
+	secure, err := registryUtil.IsSecure(o.registryName)
+	if err != nil {
 		return err
 	}
+
+	if secure {
+		secureBeforeUpdate = true
+	}
+
 	if o.token != "" {
 		secureAfterUpdate = true
 	}