Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated imports to reflect the org change of repo #13

Merged
merged 4 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
module github.com/cli-playground/devfile-parser
module github.com/devfile/parser

go 1.14

require (
github.com/docker/docker v1.13.1
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0 // indirect
github.com/fatih/color v1.9.0
github.com/fsnotify/fsnotify v1.4.7
github.com/ghodss/yaml v1.0.0
github.com/gobwas/glob v0.2.3
Expand All @@ -15,6 +11,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/spf13/afero v1.3.2
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.6
k8s.io/apimachinery v0.18.6
Expand Down
22 changes: 8 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
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/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
Expand All @@ -33,6 +26,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
Expand All @@ -52,15 +46,12 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand All @@ -78,13 +69,16 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/afero v1.3.2 h1:GDarE4TJQI52kYSbSAmLiId1Elfj+xgSDqrUZxFhxlU=
github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
Expand All @@ -103,7 +97,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 h1:HmbHVPwrPEKPGLAcHSrMe6+hqSUlvZU0rab6x5EXfGU=
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -117,6 +110,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"fmt"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser"
devfileParser "github.com/cli-playground/devfile-parser/pkg/devfile/parser"
"github.com/devfile/parser/pkg/devfile/parser"
devfileParser "github.com/devfile/parser/pkg/devfile/parser"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/apiVersion.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
"github.com/devfile/parser/pkg/devfile/parser/data"
"github.com/pkg/errors"
"k8s.io/klog"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/content_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/testingutil/filesystem"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions pkg/devfile/parser/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package parser
import (
"fmt"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/cli-playground/devfile-parser/pkg/util"
"github.com/devfile/parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/util"
"k8s.io/klog"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/testingutil/filesystem"
)

func TestPopulateFromBytes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/fs.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package parser

import "github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
import "github.com/devfile/parser/pkg/testingutil/filesystem"

// GetFs returns the filesystem object
func (d *DevfileCtx) GetFs() filesystem.Filesystem {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parser
import (
"fmt"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
"github.com/devfile/parser/pkg/devfile/parser/data"
"github.com/pkg/errors"
"github.com/xeipuuv/gojsonschema"
"k8s.io/klog"
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/context/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package parser
import (
"testing"

v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/1.0.0/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version100
import (
"strings"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

func (d *Devfile100) GetMetadata() common.DevfileMetadata {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.0.0/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version200
import (
"strings"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

// GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.0.0/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version200
import (
"testing"

common "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
common "github.com/devfile/parser/pkg/devfile/parser/data/common"
)

func TestGetCommands(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.0.0/types.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package version200

import "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
import "github.com/devfile/parser/pkg/devfile/parser/data/common"

// CommandGroupType describes the kind of command group.
// +kubebuilder:validation:Enum=build;run;test;debug
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.1.0/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version210
import (
"strings"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

// GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.1.0/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version210
import (
"testing"

common "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
common "github.com/devfile/parser/pkg/devfile/parser/data/common"
)

func TestGetCommands(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/2.1.0/types.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package version210

import "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
import "github.com/devfile/parser/pkg/devfile/parser/data/common"

// CommandGroupType describes the kind of command group.
// +kubebuilder:validation:Enum=build;run;test;debug
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
)

func TestNewDevfileData(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/parser/data/interface.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

// DevfileData is an interface that defines functions for Devfile data operations
Expand Down
6 changes: 3 additions & 3 deletions pkg/devfile/parser/data/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package data
import (
"reflect"

v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
v200 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.0.0"
v210 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.1.0"
v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
v200 "github.com/devfile/parser/pkg/devfile/parser/data/2.0.0"
v210 "github.com/devfile/parser/pkg/devfile/parser/data/2.1.0"
)

// SupportedApiVersions stores the supported devfile API versions
Expand Down
8 changes: 4 additions & 4 deletions pkg/devfile/parser/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package parser
import (
"encoding/json"

devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
"github.com/cli-playground/devfile-parser/pkg/devfile/validate"
"github.com/cli-playground/devfile-parser/pkg/errors"
devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
"github.com/devfile/parser/pkg/devfile/parser/data"
"github.com/devfile/parser/pkg/devfile/validate"
"github.com/devfile/parser/pkg/errors"
)

// ParseDevfile func validates the devfile integrity.
Expand Down
4 changes: 2 additions & 2 deletions pkg/devfile/parser/types.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package parser

import (
devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
"github.com/devfile/parser/pkg/devfile/parser/data"
)

// Default filenames for create devfile
Expand Down
6 changes: 3 additions & 3 deletions pkg/devfile/parser/writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package parser
import (
"testing"

devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
"github.com/devfile/parser/pkg/testingutil/filesystem"
)

func TestWriteJsonDevfile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/validate/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package validate
import (
"fmt"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

// Errors
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/validate/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
)

func TestValidateComponents(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/devfile/validate/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package validate
import (
"reflect"

"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
"k8s.io/klog"

v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
v200 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.0.0"
v210 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.1.0"
v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
v200 "github.com/devfile/parser/pkg/devfile/parser/data/2.0.0"
v210 "github.com/devfile/parser/pkg/devfile/parser/data/2.1.0"
)

// ValidateDevfileData validates whether sections of devfile are odo compatible
Expand Down
4 changes: 2 additions & 2 deletions pkg/testingutil/devfile.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package testingutil

import (
"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
versionsCommon "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
"github.com/devfile/parser/pkg/devfile/parser/data/common"
versionsCommon "github.com/devfile/parser/pkg/devfile/parser/data/common"
)

// TestDevfileData is a convenience data type used to mock up a devfile configuration
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/file_indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"time"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/testingutil/filesystem"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/file_indexer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"testing"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/testingutil/filesystem"
)

func TestCheckGitIgnoreFile(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
"github.com/devfile/parser/pkg/testingutil/filesystem"
"github.com/gobwas/glob"
"github.com/google/go-github/github"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ func TestDownloadInMemory(t *testing.T) {
}{
{
name: "Case 1: valid URL",
url: "https://github.com/cli-playground/devfile-parser/blob/master/tests/examples/source/devfiles/nodejs/devfile.yaml",
url: "https://github.com/devfile/parser/blob/master/devfile.yaml",
want: true,
},
{
Expand Down