Merge pull request #77 from yangcao77/398-restictURI

remove file name addition to URL

Author: yangcao77

pkg/devfile/parser/context/context.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net/url"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 
@@ -104,20 +103,10 @@ func (d *DevfileCtx) Populate() (err error) {
 
 // PopulateFromURL fills the DevfileCtx struct with relevant context info
 func (d *DevfileCtx) PopulateFromURL() (err error) {
-	u, err := url.ParseRequestURI(d.url)
+	_, err = url.ParseRequestURI(d.url)
 	if err != nil {
 		return err
 	}
-	if !strings.HasSuffix(d.url, ".yaml") {
-		u.Path = path.Join(u.Path, "devfile.yaml")
-		if _, err = util.DownloadFileInMemory(u.String()); err != nil {
-			u.Path = path.Join(path.Dir(u.Path), ".devfile.yaml")
-			if _, err = util.DownloadFileInMemory(u.String()); err != nil {
-				return fmt.Errorf("the provided url is not a valid yaml filepath, and devfile.yaml or .devfile.yaml not found in the provided path : %s", d.url)
-			}
-		}
-		d.url = u.String()
-	}
 	if d.uriMap == nil {
 		d.uriMap = make(map[string]bool)
 	}

pkg/devfile/parser/parse_test.go

@@ -2390,7 +2390,7 @@ func Test_parseParentAndPlugin_RecursivelyReference_withMultipleURI(t *testing.T
 	defer testServer3.Close()
 	t.Run("it should error out if URI is recursively referenced with multiple references", func(t *testing.T) {
 		err := parseParentAndPlugin(devFileObj)
-		expectedErr := fmt.Sprintf("URI %v%v/devfile.yaml is recursively referenced", httpPrefix, uri1)
+		expectedErr := fmt.Sprintf("URI %v%v is recursively referenced", httpPrefix, uri1)
 		// Unexpected error
 		if err == nil || !reflect.DeepEqual(expectedErr, err.Error()) {
 			t.Errorf("Test_parseParentAndPlugin_RecursivelyReference_withMultipleURI() unexpected error = %v", err)