rebase with master and update test

Signed-off-by: Maysun J Faisal <maysun.j.faisal@ibm.com>

pkg/devfile/parser/parse.go

@@ -9,21 +9,12 @@ import (
 	"github.com/pkg/errors"
 )
 
-// parse func parses and validates the devfile integrity.
-// Creates devfile context and runtime objects.
-func parse(path string) (d DevfileObj, err error) {
-
-	// NewDevfileCtx
-	d.Ctx = devfileCtx.NewDevfileCtx(path)
-
-	// Fill the fields of DevfileCtx struct
-	err = d.Ctx.Populate()
-	if err != nil {
-		return d, err
-	}
+// ParseDevfile func validates the devfile integrity.
+// Creates devfile context and runtime objects
+func parseDevfile(d DevfileObj) (DevfileObj, error) {
 
-	// Validate devfile schema
-	err = d.Ctx.Validate()
+	// Validate devfile
+	err := d.Ctx.Validate()
 	if err != nil {
 		return d, err
 	}
@@ -44,6 +35,21 @@ func parse(path string) (d DevfileObj, err error) {
 	return d, nil
 }
 
+// Parse func populates the devfile data, parses and validates the devfile integrity.
+// Creates devfile context and runtime objects
+func parse(path string) (d DevfileObj, err error) {
+
+	// NewDevfileCtx
+	d.Ctx = devfileCtx.NewDevfileCtx(path)
+
+	// Fill the fields of DevfileCtx struct
+	err = d.Ctx.Populate()
+	if err != nil {
+		return d, err
+	}
+	return parseDevfile(d)
+}
+
 // ParseAndValidate func parses the devfile data
 // and validates the devfile integrity with the schema
 // and validates the devfile data.
@@ -65,3 +71,37 @@ func ParseAndValidate(path string) (d DevfileObj, err error) {
 	// Successful
 	return d, nil
 }
+
+// parseInMemory func populates the data from memory, parses and validates the devfile integrity.
+// Creates devfile context and runtime objects
+func parseInMemory(bytes []byte) (d DevfileObj, err error) {
+
+	// Fill the fields of DevfileCtx struct
+	err = d.Ctx.PopulateFromBytes(bytes)
+	if err != nil {
+		return d, err
+	}
+	return parseDevfile(d)
+}
+
+// ParseInMemoryAndValidate func parses the devfile data in memory
+// and validates the devfile integrity with the schema
+// and validates the devfile data.
+// Creates devfile context and runtime objects.
+func ParseInMemoryAndValidate(data []byte) (d DevfileObj, err error) {
+
+	// read and parse devfile from given data
+	d, err = parseInMemory(data)
+	if err != nil {
+		return d, err
+	}
+
+	// odo specific validation on devfile content
+	err = validate.ValidateDevfileData(d.Data)
+	if err != nil {
+		return d, err
+	}
+
+	// Successful
+	return d, nil
+}

pkg/odo/cli/catalog/describe/component.go

@@ -6,7 +6,6 @@ import (
 	"text/tabwriter"
 
 	"github.com/openshift/odo/pkg/catalog"
-	"github.com/openshift/odo/pkg/devfile"
 	"github.com/openshift/odo/pkg/devfile/parser"
 	"github.com/openshift/odo/pkg/devfile/parser/data/common"
 	"github.com/openshift/odo/pkg/log"
@@ -187,7 +186,7 @@ func GetDevfile(devfileComponent catalog.DevfileComponentType) (parser.DevfileOb
 	if err != nil {
 		return devObj, errors.Wrapf(err, "Failed to download devfile.yaml for devfile component: %s", devfileComponent.Name)
 	}
-	devObj, err = devfile.ParseInMemory(data)
+	devObj, err = parser.ParseInMemoryAndValidate(data)
 	if err != nil {
 		return devObj, err
 	}

pkg/util/util_test.go

@@ -1360,7 +1360,7 @@ func TestDownloadFile(t *testing.T) {
 			err := DownloadFile(tt.url, tt.filepath)
 
 			if tt.url == "" && err != nil {
-				if !strings.Contains(err.Error(), "Get : unsupported protocol scheme") {
+				if !strings.Contains(err.Error(), "unsupported protocol scheme") {
 					t.Errorf("Did not get expected error %s", err)
 				}
 			} else if tt.url != "invalid" && err != nil {

tests/integration/devfile/cmd_devfile_catalog_test.go

@@ -12,6 +12,8 @@ import (
 
 var _ = Describe("odo devfile catalog command tests", func() {
 	var project, context, currentWorkingDirectory, originalKubeconfig string
+	const registryName string = "RegistryName"
+	const addRegistryURL string = "https://raw.githubusercontent.com/odo-devfiles/registry/master"
 
 	// Using program commmand according to cliRunner in devfile
 	cliRunner := helper.GetCliRunner()
@@ -88,8 +90,8 @@ var _ = Describe("odo devfile catalog command tests", func() {
 
 	Context("When executing catalog describe component with a component name with a single project", func() {
 		It("should only give information about one project", func() {
-			output := helper.CmdShouldPass("odo", "catalog", "describe", "component", "java-openliberty")
-			helper.MatchAllInOutput(output, []string{"location: https://github.com/OpenLiberty/application-stack.git"})
+			output := helper.CmdShouldPass("odo", "catalog", "describe", "component", "openLiberty")
+			helper.MatchAllInOutput(output, []string{"location: https://github.com/odo-devfiles/openliberty-ex.git"})
 		})
 	})
 	Context("When executing catalog describe component with a component name with no starter projects", func() {
@@ -100,8 +102,11 @@ var _ = Describe("odo devfile catalog command tests", func() {
 	})
 	Context("When executing catalog describe component with a component name with multiple components", func() {
 		It("should print multiple devfiles from different registries", func() {
-			output := helper.CmdShouldPass("odo", "catalog", "describe", "component", "nodejs")
-			helper.MatchAllInOutput(output, []string{"name: nodejs-web-app", "location: https://github.com/odo-devfiles/nodejs-ex.git", "location: https://github.com/che-samples/web-nodejs-sample.git"})
+			helper.CmdShouldPass("odo", "registry", "add", registryName, addRegistryURL)
+			output := helper.CmdShouldPass("odo", "registry", "list")
+			helper.MatchAllInOutput(output, []string{registryName, addRegistryURL})
+			output = helper.CmdShouldPass("odo", "catalog", "describe", "component", "nodejs")
+			helper.MatchAllInOutput(output, []string{"name: nodejs-web-app", "Registry: DefaultDevfileRegistry", "Registry: " + registryName})
 		})
 	})
 	Context("When executing catalog describe component with a component name that does not have a devfile component", func() {