clean up the code

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

Author: yangcao77

.idea/workspace.xml

@@ -15,7 +15,7 @@ require (
 	github.com/openshift/api v0.0.0-20200930075302-db52bc4ef99f
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/afero v1.2.2
-	github.com/stretchr/testify v1.6.1 // indirect
+	github.com/stretchr/testify v1.6.1
 	github.com/xeipuuv/gojsonschema v1.2.0
 	k8s.io/api v0.19.0
 	k8s.io/apimachinery v0.19.0

go.mod

@@ -72,7 +72,7 @@ func (d *DevfileCtx) Populate() (err error) {
 	}
 	klog.V(4).Infof("absolute devfile path: '%s'", d.absPath)
 	if d.uriMap == nil {
-		d.uriMap= make(map[string]bool)
+		d.uriMap = make(map[string]bool)
 	}
 	if d.uriMap[d.absPath] {
 		return fmt.Errorf("URI %v is recursively referenced", d.absPath)
@@ -93,11 +93,7 @@ func (d *DevfileCtx) PopulateFromURL() (err error) {
 		return err
 	}
 	if d.uriMap == nil {
-		d.uriMap= make(map[string]bool)
-	}
-	fmt.Printf("uriMap length is: %v", len(d.uriMap))
-	for k,_ := range d.uriMap {
-		fmt.Printf("uriMap now contains: %s", k)
+		d.uriMap = make(map[string]bool)
 	}
 	if d.uriMap[d.url] {
 		return fmt.Errorf("URI %v is recursively referenced", d.url)
@@ -150,8 +146,6 @@ func (d *DevfileCtx) GetURIMap() map[string]bool {
 }
 
 // GetURIMap func returns current devfile uri map
-func (d *DevfileCtx) SetURIMap(uriMap map[string]bool){
+func (d *DevfileCtx) SetURIMap(uriMap map[string]bool) {
 	d.uriMap = uriMap
 }
-
-

pkg/devfile/parser/context/context.go

@@ -185,51 +185,38 @@ func parseFromURI(uri string, curDevfileCtx devfileCtx.DevfileCtx) (DevfileObj,
 	}
 	// NewDevfileCtx
 	var d DevfileObj
-	// absolute URL address
-	if strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://") {
-		// return ParseFromURL(uri)
-		d.Ctx = devfileCtx.NewURLDevfileCtx(uri)
-		d.Ctx.SetURIMap(curDevfileCtx.GetURIMap())
-		// Fill the fields of DevfileCtx struct
-		err = d.Ctx.PopulateFromURL()
-		if err != nil {
-			return DevfileObj{}, err
-		}
-		return parseDevfile(d, true)
-	}
+	absoluteURL := strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://")
 
 	// relative path on disk
-	if curDevfileCtx.GetAbsPath() != "" {
+	if !absoluteURL && curDevfileCtx.GetAbsPath() != "" {
 		d.Ctx = devfileCtx.NewDevfileCtx(path.Join(path.Dir(curDevfileCtx.GetAbsPath()), uri))
 		d.Ctx.SetURIMap(curDevfileCtx.GetURIMap())
 
 		// Fill the fields of DevfileCtx struct
 		err = d.Ctx.Populate()
-		if err!= nil {
+		if err != nil {
 			return DevfileObj{}, err
 		}
-		// return Parse(path.Join(path.Dir(curDevfileCtx.GetAbsPath()), uri))
 		return parseDevfile(d, true)
 	}
 
-	if curDevfileCtx.GetURL() != "" {
+	// absolute URL address
+	if absoluteURL {
+		d.Ctx = devfileCtx.NewURLDevfileCtx(uri)
+	} else if curDevfileCtx.GetURL() != "" {
 		u, err := url.Parse(curDevfileCtx.GetURL())
 		if err != nil {
 			return DevfileObj{}, err
 		}
-
 		u.Path = path.Join(path.Dir(u.Path), uri)
 		d.Ctx = devfileCtx.NewURLDevfileCtx(u.String())
-		d.Ctx.SetURIMap(curDevfileCtx.GetURIMap())
-		// Fill the fields of DevfileCtx struct
-		err = d.Ctx.PopulateFromURL()
-		if err != nil {
-			return DevfileObj{}, err
-		}
-		return parseDevfile(d, true)
-		// u.String() is the joint absolute URL path
-		// return ParseFromURL(u.String())
 	}
+	d.Ctx.SetURIMap(curDevfileCtx.GetURIMap())
+	// Fill the fields of DevfileCtx struct
+	err = d.Ctx.PopulateFromURL()
+	if err != nil {
+		return DevfileObj{}, err
+	}
+	return parseDevfile(d, true)
 
-	return DevfileObj{}, fmt.Errorf("fail to parse from uri: %s", uri)
 }