Merge pull request #117 from yangcao77/625-concrete-version

support concrete schema version

Author: yangcao77

devfile.yaml

@@ -1,4 +1,4 @@
-schemaVersion: 2.2.0
+schemaVersion: 2.2.0-latest
 metadata:
   name: nodejs
   version: 1.0.0

go.mod

@@ -3,7 +3,7 @@ module github.com/devfile/library
 go 1.15
 
 require (
-	github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b
+	github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460
 	github.com/fatih/color v1.7.0
 	github.com/gobwas/glob v0.2.3
 	github.com/golang/mock v1.5.0

go.sum

@@ -83,8 +83,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b h1:OSORBTgmRBJUKbZhGJJn+CH7gyY4IBdARn9pJpnqyBs=
-github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
+github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460 h1:cmd+3poyUwevcWchYdvE02YT1nQU4SJpA5/wrdLrpWE=
+github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=

pkg/devfile/parser/context/apiVersion.go

@@ -3,6 +3,7 @@ package parser
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/devfile/library/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
@@ -38,7 +39,9 @@ func (d *DevfileCtx) SetDevfileAPIVersion() error {
 	}
 
 	// Successful
-	d.apiVersion = schemaVersion.(string)
+	// split by `-` and get the first substring as schema version, schemaVersion without `-` won't get affected
+	// e.g. 2.2.0-latest => 2.2.0, 2.2.0 => 2.2.0
+	d.apiVersion = strings.Split(schemaVersion.(string), "-")[0]
 	klog.V(4).Infof("devfile schemaVersion: '%s'", d.apiVersion)
 	return nil
 }

pkg/devfile/parser/context/apiVersion_test.go

@@ -9,8 +9,9 @@ import (
 func TestSetDevfileAPIVersion(t *testing.T) {
 
 	const (
-		schemaVersion          = "2.0.0"
-		validJson              = `{"schemaVersion": "2.0.0"}`
+		schemaVersion          = "2.2.0"
+		validJson              = `{"schemaVersion": "2.2.0"}`
+		concreteSchema         = `{"schemaVersion": "2.2.0-latest"}`
 		emptyJson              = "{}"
 		emptySchemaVersionJson = `{"schemaVersion": ""}`
 		devfilePath            = "/testpath/devfile.yaml"
@@ -30,6 +31,12 @@ func TestSetDevfileAPIVersion(t *testing.T) {
 			want:       schemaVersion,
 			wantErr:    nil,
 		},
+		{
+			name:       "concrete schemaVersion",
+			devfileCtx: DevfileCtx{rawContent: []byte(concreteSchema), absPath: devfilePath},
+			want:       schemaVersion,
+			wantErr:    nil,
+		},
 		{
 			name:       "schemaVersion not present",
 			devfileCtx: DevfileCtx{rawContent: []byte(emptyJson), absPath: devfilePath},