Port over odo parser

.gitignore

@@ -17,3 +17,5 @@ main
 
 # Files used for debugging
 .vscode/
+
+.DS_Store

devfile.yaml

@@ -2,63 +2,53 @@ schemaVersion: 2.0.0
 metadata:
   name: nodejs
   version: 1.0.0
-  alpha.deployment-manifest: "https://raw.githubusercontent.com/groeges/devfile-registry/master/devfiles/nodejs/deploy_deployment.yaml"
-projects:
-  - name: nodejs-starter
-    git:
-      location: "https://github.com/odo-devfiles/nodejs-ex.git"
+  alpha.build-dockerfile: https://raw.githubusercontent.com/odo-devfiles/registry/master/devfiles/nodejs/build/Dockerfile
+  alpha.deployment-manifest: https://raw.githubusercontent.com/odo-devfiles/registry/master/devfiles/nodejs/deploy/deployment-manifest.yaml
+starterProjects:
+- name: nodejs-starter
+  git:
+    remotes:
+      origin: https://github.com/odo-devfiles/nodejs-ex.git
 components:
-  - container:
-      name: runtime
-      image: registry.access.redhat.com/ubi8/nodejs-12:1-36
-      memoryLimit: 1024Mi
-      mountSources: true
-      endpoints:
-        - name: http-3000
-          targetPort: 3000
-          configuration:
-            protocol: tcp
-            scheme: http
-            type: terminal
-
-  - dockerfile:
-      name: dockerfile-build
-      source: 
-         sourceDir: "src"
-         location: "https://github.com/ranakan19/golang-ex.git"
-      dockerfileLocation: "https://raw.githubusercontent.com/wtam2018/test/master/nodejs-dockerfiile"
-      destination: "docker.io"
-
+- name: runtime
+  container:
+    endpoints:
+    - name: http-3000
+      targetPort: 3000
+    image: registry.access.redhat.com/ubi8/nodejs-12:1-45
+    memoryLimit: 1024Mi
+    mountSources: true
+    sourceMapping: /project
 commands:
-  - exec:
-      id: install
-      component: runtime
-      commandLine: npm install
-      workingDir: ${CHE_PROJECTS_ROOT}/nodejs-starter
-      group:
-        kind: build
-        isDefault: true
-  - exec:
-      id: run
-      component: runtime
-      commandLine: npm start
-      workingDir: ${CHE_PROJECTS_ROOT}/nodejs-starter
-      group:
-        kind: run
-        isDefault: true
-  - exec:
-      id: debug
-      component: runtime
-      commandLine: npm run debug
-      workingDir: ${CHE_PROJECTS_ROOT}/nodejs-starter
-      group:
-        kind: debug
-        isDefault: true
-  - exec:
-      id: test
-      component: runtime
-      commandLine: npm test
-      workingDir: ${CHE_PROJECTS_ROOT}/nodejs-starter
-      group:
-        kind: test
-        isDefault: true
+- exec:
+    commandLine: npm install
+    component: runtime
+    group:
+      isDefault: true
+      kind: build
+    workingDir: /project
+  id: install
+- exec:
+    commandLine: npm start
+    component: runtime
+    group:
+      isDefault: true
+      kind: run
+    workingDir: /project
+  id: run
+- exec:
+    commandLine: npm run debug
+    component: runtime
+    group:
+      isDefault: true
+      kind: debug
+    workingDir: /project
+  id: debug
+- exec:
+    commandLine: npm test
+    component: runtime
+    group:
+      isDefault: true
+      kind: test
+    workingDir: /project
+  id: test

go.mod

@@ -3,18 +3,20 @@ module github.com/devfile/parser
 go 1.14
 
 require (
-	github.com/devfile/api v0.0.0-20200826170839-778718f72ad7
+	github.com/devfile/api v0.0.0-20201020083026-77074bac47ab
 	github.com/fatih/color v1.7.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/gobwas/glob v0.2.3
 	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
 	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/afero v1.3.2
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f // indirect
-	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/api v0.18.6
 	k8s.io/apimachinery v0.18.6
 	k8s.io/klog v1.0.0

main.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
+	devfilepkg "github.com/devfile/parser/pkg/devfile"
 	"github.com/devfile/parser/pkg/devfile/parser"
-	v200 "github.com/devfile/parser/pkg/devfile/parser/data/2.0.0"
+	v2 "github.com/devfile/parser/pkg/devfile/parser/data/v2"
 )
 
 func main() {
@@ -14,17 +15,12 @@ func main() {
 		fmt.Println(err)
 	} else {
 		devdata := devfile.Data
-		if (reflect.TypeOf(devdata) == reflect.TypeOf(&v200.Devfile200{})) {
-			d := devdata.(*v200.Devfile200)
+		if (reflect.TypeOf(devdata) == reflect.TypeOf(&v2.DevfileV2{})) {
+			d := devdata.(*v2.DevfileV2)
 			fmt.Println(d.SchemaVersion)
 		}
 
 		for _, component := range devfile.Data.GetComponents() {
-			/*
-				if component.Dockerfile != nil {
-							fmt.Println(component.Dockerfile.DockerfileLocation)
-						}
-			*/
 			if component.Container != nil {
 				fmt.Println(component.Container.Image)
 			}
@@ -40,11 +36,8 @@ func main() {
 }
 
 //ParseDevfile to parse devfile from library
-func ParseDevfile(devfileLocation string) (devfileoj parser.DevfileObj, err error) {
-	/*
-		var devfile parser.DevfileObj
-		devfile, err = parser.ParseAndValidate(devfileLocation)
-		return devfile, err
-	*/
-	return
+func ParseDevfile(devfileLocation string) (parser.DevfileObj, error) {
+
+	devfile, err := devfilepkg.ParseAndValidate(devfileLocation)
+	return devfile, err
 }

pkg/devfile/parse.go

@@ -0,0 +1,58 @@
+package devfile
+
+import (
+	"github.com/devfile/parser/pkg/devfile/parser"
+)
+
+// ParseFromURLAndValidate func parses the devfile data from the url
+// and validates the devfile integrity with the schema
+// and validates the devfile data.
+// Creates devfile context and runtime objects.
+func ParseFromURLAndValidate(url string) (d parser.DevfileObj, err error) {
+
+	// read and parse devfile from the given URL
+	d, err = parser.ParseFromURL(url)
+	if err != nil {
+		return d, err
+	}
+
+	// odo specific validation on devfile content
+	// err = validate.ValidateDevfileData(d.Data)
+
+	return d, err
+}
+
+// ParseFromDataAndValidate func parses the devfile data
+// and validates the devfile integrity with the schema
+// and validates the devfile data.
+// Creates devfile context and runtime objects.
+func ParseFromDataAndValidate(data []byte) (d parser.DevfileObj, err error) {
+	// read and parse devfile from the given bytes
+	d, err = parser.ParseFromData(data)
+	if err != nil {
+		return d, err
+	}
+
+	// odo specific validation on devfile content
+	// err = validate.ValidateDevfileData(d.Data)
+
+	return d, err
+}
+
+// ParseAndValidate func parses the devfile data
+// and validates the devfile integrity with the schema
+// and validates the devfile data.
+// Creates devfile context and runtime objects.
+func ParseAndValidate(path string) (d parser.DevfileObj, err error) {
+
+	// read and parse devfile from given path
+	d, err = parser.Parse(path)
+	if err != nil {
+		return d, err
+	}
+
+	// odo specific validation on devfile content
+	// err = validate.ValidateDevfileData(d.Data)
+
+	return d, err
+}