fix error check and function desc

Signed-off-by: Stephanie <[email protected]>

Author: yangcao77

pkg/devfile/parser/parse.go

@@ -193,22 +193,16 @@ func parseParentAndPlugin(d DevfileObj, resolveCtx *resolutionContextTree, tool
 			switch {
 			case parent.Uri != "":
 				parentDevfileObj, err = parseFromURI(parent.ImportReference, d.Ctx, resolveCtx, tool)
-				if err != nil {
-					return err
-				}
 			case parent.Id != "":
 				parentDevfileObj, err = parseFromRegistry(parent.ImportReference, resolveCtx, tool)
-				if err != nil {
-					return err
-				}
 			case parent.Kubernetes != nil:
 				parentDevfileObj, err = parseFromKubeCRD(parent.ImportReference, resolveCtx, tool)
-				if err != nil {
-					return err
-				}
 			default:
 				return fmt.Errorf("devfile parent does not define any resources")
 			}
+			if err != nil {
+				return err
+			}
 
 			parentWorkspaceContent := parentDevfileObj.Data.GetDevfileWorkspaceSpecContent()
 			// add attribute to parent elements
@@ -247,19 +241,16 @@ func parseParentAndPlugin(d DevfileObj, resolveCtx *resolutionContextTree, tool
 			switch {
 			case plugin.Uri != "":
 				pluginDevfileObj, err = parseFromURI(plugin.ImportReference, d.Ctx, resolveCtx, tool)
-				if err != nil {
-					return err
-				}
 			case plugin.Id != "":
 				pluginDevfileObj, err = parseFromRegistry(plugin.ImportReference, resolveCtx, tool)
-				if err != nil {
-					return err
-				}
 			case plugin.Kubernetes != nil:
 				pluginDevfileObj, err = parseFromKubeCRD(plugin.ImportReference, resolveCtx, tool)
 			default:
 				return fmt.Errorf("plugin %s does not define any resources", component.Name)
 			}
+			if err != nil {
+				return err
+			}
 			pluginWorkspaceContent := pluginDevfileObj.Data.GetDevfileWorkspaceSpecContent()
 			// add attribute to plugin elements
 			err = addSourceAttributesForOverrideAndMerge(plugin.ImportReference, pluginWorkspaceContent)

pkg/devfile/parser/sourceAttribute.go

@@ -8,11 +8,11 @@ import (
 
 const (
 	importSourceAttribute   = "library.devfile.io/imported-from"
-	pluginOverrideAttribute = "library.devfile.io/plugin-override-from"
 	parentOverrideAttribute = "library.devfile.io/parent-override-from"
+	pluginOverrideAttribute = "library.devfile.io/plugin-override-from"
 )
 
-// addSourceAttributesForTemplateSpecContent adds an attribute 'library.devfile.io/parent-override-from=<source reference>'
+// addSourceAttributesForParentOverride adds an attribute 'library.devfile.io/imported-from=<source reference>'
 //  to all elements of template spec content that support attributes.
 func addSourceAttributesForTemplateSpecContent(sourceImportReference v1.ImportReference, template *v1.DevWorkspaceTemplateSpecContent) {
 	for idx, component := range template.Components {
@@ -41,7 +41,7 @@ func addSourceAttributesForTemplateSpecContent(sourceImportReference v1.ImportRe
 	}
 }
 
-// addSourceAttributesForParentOverride adds an attribute 'library.devfile.io/imported-from=<source reference>'
+// addSourceAttributesForParentOverride adds an attribute 'library.devfile.io/parent-override-from=<source reference>'
 //  to all elements of parent override that support attributes.
 func addSourceAttributesForParentOverride(sourceImportReference v1.ImportReference, parentOverrides *v1.ParentOverrides) {
 	for idx, component := range parentOverrides.Components {