Merge pull request #150 from devfile/v2.0.x

yangcao77 · web-flow · commit f1de9b52bc51 · 2022-10-18T13:05:09.000-04:00
bump up to v2
diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
-module github.com/devfile/library
+module github.com/devfile/library/v2
 
 go 1.15
 
 require (
-	github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1
+	github.com/devfile/api/v2 v2.2.0
 	github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be // indirect
 	github.com/devfile/registry-support/registry-library v0.0.0-20220627163229-4aa39fcb0c0a
 	github.com/fatih/color v1.7.0
diff --git a/go.sum b/go.sum
@@ -291,9 +291,10 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/devfile/api/v2 v2.0.0-20211021164004-dabee4e633ed/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
 github.com/devfile/api/v2 v2.0.0-20220117162434-6e6e6a8bc14c/go.mod h1:d99eTN6QxgzihOOFyOZA+VpUyD4Q1pYRYHZ/ci9J96Q=
-github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1 h1:rwhw0TQUCS/qT4iDsoOPV/AaopUiYYYXs5zXeX1n6Ts=
-github.com/devfile/api/v2 v2.0.0-20220614133608-351f05b7c2b1/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb5JL3aI=
+github.com/devfile/api/v2 v2.2.0 h1:3Mwl/dtT508oU4pNt/v4G8vqvjoZqi9LOInXCNwKMoc=
+github.com/devfile/api/v2 v2.2.0/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb5JL3aI=
 github.com/devfile/library v1.2.1-0.20211104222135-49d635cb492f/go.mod h1:uFZZdTuRqA68FVe/JoJHP92CgINyQkyWnM2Qyiim+50=
+github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de h1:jImHtiAxjyul1UkPmf6C3EMS5wqNz+k84LKkCXkeqws=
 github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de/go.mod h1:GSPfJaBg0+bBjBHbwBE5aerJLH6tWGQu2q2rHYd9czM=
 github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e/go.mod h1:iRPBxs+ZjfLEduVXpCCIOzdD2588Zv9OCs/CcXMcCCY=
 github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be h1:tCdIUbJ1eZV/jRa1gjs3dPZsbTjRibDqwRqIK4HCI9k=
diff --git a/main.go b/main.go
@@ -21,10 +21,10 @@ import (
 	"reflect"
 	"strings"
 
-	devfilepkg "github.com/devfile/library/pkg/devfile"
-	"github.com/devfile/library/pkg/devfile/parser"
-	v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	devfilepkg "github.com/devfile/library/v2/pkg/devfile"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 func main() {
diff --git a/pkg/devfile/generator/generators.go b/pkg/devfile/generator/generators.go
@@ -19,9 +19,9 @@ import (
 	"fmt"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/util"
 	buildv1 "github.com/openshift/api/build/v1"
 	imagev1 "github.com/openshift/api/image/v1"
 	routev1 "github.com/openshift/api/route/v1"
diff --git a/pkg/devfile/generator/generators_test.go b/pkg/devfile/generator/generators_test.go
@@ -28,11 +28,11 @@ import (
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/testingutil"
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/testingutil"
+	"github.com/devfile/library/v2/pkg/util"
 	"github.com/golang/mock/gomock"
 
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/devfile/generator/utils.go b/pkg/devfile/generator/utils.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	buildv1 "github.com/openshift/api/build/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/pkg/devfile/generator/utils_test.go b/pkg/devfile/generator/utils_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 
 	"github.com/devfile/api/v2/pkg/attributes"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/testingutil"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/testingutil"
 	"github.com/golang/mock/gomock"
 	buildv1 "github.com/openshift/api/build/v1"
 
diff --git a/pkg/devfile/parse.go b/pkg/devfile/parse.go
@@ -17,8 +17,8 @@ package devfile
 
 import (
 	"github.com/devfile/api/v2/pkg/validation/variables"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/validate"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/validate"
 )
 
 // ParseFromURLAndValidate func parses the devfile data from the url
diff --git a/pkg/devfile/parse_test.go b/pkg/devfile/parse_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 
 	"github.com/devfile/api/v2/pkg/validation/variables"
-	"github.com/devfile/library/pkg/devfile/parser"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 func TestParseDevfileAndValidate(t *testing.T) {
diff --git a/pkg/devfile/parser/configurables.go b/pkg/devfile/parser/configurables.go
@@ -17,7 +17,7 @@ package parser
 
 import (
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 const (
diff --git a/pkg/devfile/parser/context/apiVersion.go b/pkg/devfile/parser/context/apiVersion.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/devfile/library/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 )
diff --git a/pkg/devfile/parser/context/content.go b/pkg/devfile/parser/context/content.go
@@ -19,7 +19,7 @@ import (
 	"bytes"
 	"unicode"
 
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/util"
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 	"sigs.k8s.io/yaml"
diff --git a/pkg/devfile/parser/context/content_test.go b/pkg/devfile/parser/context/content_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/devfile/library/pkg/testingutil/filesystem"
+	"github.com/devfile/library/v2/pkg/testingutil/filesystem"
 )
 
 const (
diff --git a/pkg/devfile/parser/context/context.go b/pkg/devfile/parser/context/context.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/devfile/library/pkg/testingutil/filesystem"
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/testingutil/filesystem"
+	"github.com/devfile/library/v2/pkg/util"
 	"k8s.io/klog"
 )
 
diff --git a/pkg/devfile/parser/context/fakecontext.go b/pkg/devfile/parser/context/fakecontext.go
@@ -15,7 +15,7 @@
 
 package parser
 
-import "github.com/devfile/library/pkg/testingutil/filesystem"
+import "github.com/devfile/library/v2/pkg/testingutil/filesystem"
 
 func FakeContext(fs filesystem.Filesystem, absPath string) DevfileCtx {
 	return DevfileCtx{
diff --git a/pkg/devfile/parser/context/fs.go b/pkg/devfile/parser/context/fs.go
@@ -15,7 +15,7 @@
 
 package parser
 
-import "github.com/devfile/library/pkg/testingutil/filesystem"
+import "github.com/devfile/library/v2/pkg/testingutil/filesystem"
 
 // GetFs returns the filesystem object
 func (d *DevfileCtx) GetFs() filesystem.Filesystem {
diff --git a/pkg/devfile/parser/context/schema.go b/pkg/devfile/parser/context/schema.go
@@ -18,7 +18,7 @@ package parser
 import (
 	"fmt"
 
-	"github.com/devfile/library/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
 	"k8s.io/klog"
diff --git a/pkg/devfile/parser/context/schema_test.go b/pkg/devfile/parser/context/schema_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"testing"
 
-	v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
+	v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
 )
 
 const (
diff --git a/pkg/devfile/parser/data/helper_test.go b/pkg/devfile/parser/data/helper_test.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 	"testing"
 
-	v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
-	v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
+	v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
+	v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
 )
 
 func TestNewDevfileData(t *testing.T) {
diff --git a/pkg/devfile/parser/data/interface.go b/pkg/devfile/parser/data/interface.go
@@ -19,7 +19,7 @@ import (
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
 	devfilepkg "github.com/devfile/api/v2/pkg/devfile"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 // Generate mock interfaces for DevfileData by executing the following cmd in pkg/devfile/parser/data
diff --git a/pkg/devfile/parser/data/mock_interface.go b/pkg/devfile/parser/data/mock_interface.go
diff --git a/pkg/devfile/parser/data/v2/commands.go b/pkg/devfile/parser/data/v2/commands.go
@@ -18,7 +18,7 @@ package v2
 import (
 	"fmt"
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"reflect"
 	"strings"
 )
diff --git a/pkg/devfile/parser/data/v2/commands_test.go b/pkg/devfile/parser/data/v2/commands_test.go
@@ -23,7 +23,7 @@ import (
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/devfile/parser/data/v2/components.go b/pkg/devfile/parser/data/v2/components.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 // GetComponents returns the slice of Component objects parsed from the Devfile
diff --git a/pkg/devfile/parser/data/v2/components_test.go b/pkg/devfile/parser/data/v2/components_test.go
@@ -23,8 +23,8 @@ import (
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/testingutil"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/testingutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/devfile/parser/data/v2/containers.go b/pkg/devfile/parser/data/v2/containers.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	v1alpha2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	corev1 "k8s.io/api/core/v1"
 )
 
diff --git a/pkg/devfile/parser/data/v2/events.go b/pkg/devfile/parser/data/v2/events.go
@@ -18,7 +18,7 @@ package v2
 import (
 	"fmt"
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"strings"
 )
 
diff --git a/pkg/devfile/parser/data/v2/projects.go b/pkg/devfile/parser/data/v2/projects.go
@@ -18,7 +18,7 @@ package v2
 import (
 	"fmt"
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"reflect"
 	"strings"
 )
diff --git a/pkg/devfile/parser/data/v2/projects_test.go b/pkg/devfile/parser/data/v2/projects_test.go
@@ -22,7 +22,7 @@ import (
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/devfile/parser/data/v2/volumes.go b/pkg/devfile/parser/data/v2/volumes.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
 )
 
 // AddVolumeMounts adds the volume mounts to the specified container component
diff --git a/pkg/devfile/parser/data/v2/volumes_test.go b/pkg/devfile/parser/data/v2/volumes_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/library/pkg/testingutil"
+	"github.com/devfile/library/v2/pkg/testingutil"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/devfile/parser/data/versions.go b/pkg/devfile/parser/data/versions.go
@@ -18,10 +18,10 @@ package data
 import (
 	"reflect"
 
-	v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
-	v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
-	v210 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.1.0"
-	v220 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.2.0"
+	v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
+	v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
+	v210 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.1.0"
+	v220 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.2.0"
 )
 
 // SupportedApiVersions stores the supported devfile API versions
diff --git a/pkg/devfile/parser/devfileobj.go b/pkg/devfile/parser/devfileobj.go
@@ -16,8 +16,8 @@
 package parser
 
 import (
-	devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
-	"github.com/devfile/library/pkg/devfile/parser/data"
+	devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
 )
 
 // Default filenames for create devfile
diff --git a/pkg/devfile/parser/parse.go b/pkg/devfile/parser/parse.go
@@ -27,10 +27,10 @@ import (
 	"path"
 	"strings"
 
-	devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/util"
+	devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/util"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
diff --git a/pkg/devfile/parser/parse_test.go b/pkg/devfile/parser/parse_test.go
@@ -21,11 +21,11 @@ import (
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/api/v2/pkg/attributes"
 	devfilepkg "github.com/devfile/api/v2/pkg/devfile"
-	devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
-	"github.com/devfile/library/pkg/devfile/parser/data"
-	v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
-	"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
-	"github.com/devfile/library/pkg/testingutil"
+	devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data"
+	v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	"github.com/devfile/library/v2/pkg/testingutil"
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
diff --git a/pkg/devfile/parser/reader.go b/pkg/devfile/parser/reader.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 	"gopkg.in/yaml.v3"
diff --git a/pkg/devfile/parser/reader_test.go b/pkg/devfile/parser/reader_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/devfile/library/pkg/util"
+	"github.com/devfile/library/v2/pkg/util"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/devfile/parser/writer.go b/pkg/devfile/parser/writer.go
diff --git a/pkg/devfile/parser/writer_test.go b/pkg/devfile/parser/writer_test.go
diff --git a/pkg/devfile/validate/validate.go b/pkg/devfile/validate/validate.go
diff --git a/pkg/util/util.go b/pkg/util/util.go
diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
diff --git a/tests/v2/libraryTest/library_test.go b/tests/v2/libraryTest/library_test.go
diff --git a/tests/v2/utils/library/test_utils.go b/tests/v2/utils/library/test_utils.go

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ package devfile`
`17`	`17`
`18`	`18`	`import (`
`19`	`19`	`"github.com/devfile/api/v2/pkg/validation/variables"`
`20`		`- "github.com/devfile/library/pkg/devfile/parser"`
`21`		`- "github.com/devfile/library/pkg/devfile/validate"`
	`20`	`+ "github.com/devfile/library/v2/pkg/devfile/parser"`
	`21`	`+ "github.com/devfile/library/v2/pkg/devfile/validate"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// ParseFromURLAndValidate func parses the devfile data from the url`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ import (`
`25`	`25`	`"testing"`
`26`	`26`
`27`	`27`	`"github.com/devfile/api/v2/pkg/validation/variables"`
`28`		`- "github.com/devfile/library/pkg/devfile/parser"`
`29`		`- "github.com/devfile/library/pkg/devfile/parser/data/v2/common"`
	`28`	`+ "github.com/devfile/library/v2/pkg/devfile/parser"`
	`29`	`+ "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func TestParseDevfileAndValidate(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package parser`
`17`	`17`
`18`	`18`	`import (`
`19`	`19`	`v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"`
`20`		`- "github.com/devfile/library/pkg/devfile/parser/data/v2/common"`
	`20`	`+ "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`