Skip to content

Commit 3a0b7e5

Browse files
yangcao77yangcao77
committed
update pkg name
Signed-off-by: Stephanie <[email protected]>
1 parent b0befbe commit 3a0b7e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+84
-83
lines changed

Diff for: ‎go.sum

+1
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ github.com/devfile/api/v2 v2.0.0-20220117162434-6e6e6a8bc14c/go.mod h1:d99eTN6Qx
294294
github.com/devfile/api/v2 v2.2.0 h1:3Mwl/dtT508oU4pNt/v4G8vqvjoZqi9LOInXCNwKMoc=
295295
github.com/devfile/api/v2 v2.2.0/go.mod h1:dN7xFrOVG+iPqn4UKGibXLd5oVsdE8XyK9OEb5JL3aI=
296296
github.com/devfile/library v1.2.1-0.20211104222135-49d635cb492f/go.mod h1:uFZZdTuRqA68FVe/JoJHP92CgINyQkyWnM2Qyiim+50=
297+
github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de h1:jImHtiAxjyul1UkPmf6C3EMS5wqNz+k84LKkCXkeqws=
297298
github.com/devfile/library v1.2.1-0.20220308191614-f0f7e11b17de/go.mod h1:GSPfJaBg0+bBjBHbwBE5aerJLH6tWGQu2q2rHYd9czM=
298299
github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e/go.mod h1:iRPBxs+ZjfLEduVXpCCIOzdD2588Zv9OCs/CcXMcCCY=
299300
github.com/devfile/registry-support/index/generator v0.0.0-20220527155645-8328a8a883be h1:tCdIUbJ1eZV/jRa1gjs3dPZsbTjRibDqwRqIK4HCI9k=

Diff for: ‎main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"reflect"
2222
"strings"
2323

24-
devfilepkg "github.com/devfile/library/pkg/devfile"
25-
"github.com/devfile/library/pkg/devfile/parser"
26-
v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
27-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
24+
devfilepkg "github.com/devfile/library/v2/pkg/devfile"
25+
"github.com/devfile/library/v2/pkg/devfile/parser"
26+
v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
27+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2828
)
2929

3030
func main() {

Diff for: ‎pkg/devfile/generator/generators.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"fmt"
2020

2121
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
22-
"github.com/devfile/library/pkg/devfile/parser"
23-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
24-
"github.com/devfile/library/pkg/util"
22+
"github.com/devfile/library/v2/pkg/devfile/parser"
23+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
24+
"github.com/devfile/library/v2/pkg/util"
2525
buildv1 "github.com/openshift/api/build/v1"
2626
imagev1 "github.com/openshift/api/image/v1"
2727
routev1 "github.com/openshift/api/route/v1"

Diff for: ‎pkg/devfile/generator/generators_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828

2929
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
3030
"github.com/devfile/api/v2/pkg/attributes"
31-
"github.com/devfile/library/pkg/devfile/parser"
32-
"github.com/devfile/library/pkg/devfile/parser/data"
33-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
34-
"github.com/devfile/library/pkg/testingutil"
35-
"github.com/devfile/library/pkg/util"
31+
"github.com/devfile/library/v2/pkg/devfile/parser"
32+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
33+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
34+
"github.com/devfile/library/v2/pkg/testingutil"
35+
"github.com/devfile/library/v2/pkg/util"
3636
"github.com/golang/mock/gomock"
3737

3838
corev1 "k8s.io/api/core/v1"

Diff for: ‎pkg/devfile/generator/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424

2525
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
26-
"github.com/devfile/library/pkg/devfile/parser"
27-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
26+
"github.com/devfile/library/v2/pkg/devfile/parser"
27+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2828
buildv1 "github.com/openshift/api/build/v1"
2929
routev1 "github.com/openshift/api/route/v1"
3030
appsv1 "k8s.io/api/apps/v1"

Diff for: ‎pkg/devfile/generator/utils_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"testing"
2525

2626
"github.com/devfile/api/v2/pkg/attributes"
27-
"github.com/devfile/library/pkg/devfile/parser"
28-
"github.com/devfile/library/pkg/devfile/parser/data"
29-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
30-
"github.com/devfile/library/pkg/testingutil"
27+
"github.com/devfile/library/v2/pkg/devfile/parser"
28+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
29+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
30+
"github.com/devfile/library/v2/pkg/testingutil"
3131
"github.com/golang/mock/gomock"
3232
buildv1 "github.com/openshift/api/build/v1"
3333

Diff for: ‎pkg/devfile/parse.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package devfile
1717

1818
import (
1919
"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"
2222
)
2323

2424
// ParseFromURLAndValidate func parses the devfile data from the url

Diff for: ‎pkg/devfile/parse_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"testing"
2626

2727
"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"
3030
)
3131

3232
func TestParseDevfileAndValidate(t *testing.T) {

Diff for: ‎pkg/devfile/parser/configurables.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package parser
1717

1818
import (
1919
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"
2121
)
2222

2323
const (

Diff for: ‎pkg/devfile/parser/context/apiVersion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
"github.com/devfile/library/pkg/devfile/parser/data"
23+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
2424
"github.com/pkg/errors"
2525
"k8s.io/klog"
2626
)

Diff for: ‎pkg/devfile/parser/context/content.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"bytes"
2020
"unicode"
2121

22-
"github.com/devfile/library/pkg/util"
22+
"github.com/devfile/library/v2/pkg/util"
2323
"github.com/pkg/errors"
2424
"k8s.io/klog"
2525
"sigs.k8s.io/yaml"

Diff for: ‎pkg/devfile/parser/context/content_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22-
"github.com/devfile/library/pkg/testingutil/filesystem"
22+
"github.com/devfile/library/v2/pkg/testingutil/filesystem"
2323
)
2424

2525
const (

Diff for: ‎pkg/devfile/parser/context/context.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"path/filepath"
2323
"strings"
2424

25-
"github.com/devfile/library/pkg/testingutil/filesystem"
26-
"github.com/devfile/library/pkg/util"
25+
"github.com/devfile/library/v2/pkg/testingutil/filesystem"
26+
"github.com/devfile/library/v2/pkg/util"
2727
"k8s.io/klog"
2828
)
2929

Diff for: ‎pkg/devfile/parser/context/fakecontext.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package parser
1717

18-
import "github.com/devfile/library/pkg/testingutil/filesystem"
18+
import "github.com/devfile/library/v2/pkg/testingutil/filesystem"
1919

2020
func FakeContext(fs filesystem.Filesystem, absPath string) DevfileCtx {
2121
return DevfileCtx{

Diff for: ‎pkg/devfile/parser/context/fs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package parser
1717

18-
import "github.com/devfile/library/pkg/testingutil/filesystem"
18+
import "github.com/devfile/library/v2/pkg/testingutil/filesystem"
1919

2020
// GetFs returns the filesystem object
2121
func (d *DevfileCtx) GetFs() filesystem.Filesystem {

Diff for: ‎pkg/devfile/parser/context/schema.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package parser
1818
import (
1919
"fmt"
2020

21-
"github.com/devfile/library/pkg/devfile/parser/data"
21+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
2222
"github.com/pkg/errors"
2323
"github.com/xeipuuv/gojsonschema"
2424
"k8s.io/klog"

Diff for: ‎pkg/devfile/parser/context/schema_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/stretchr/testify/assert"
2020
"testing"
2121

22-
v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
22+
v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
2323
)
2424

2525
const (

Diff for: ‎pkg/devfile/parser/data/helper_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"strings"
2121
"testing"
2222

23-
v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
24-
v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
23+
v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
24+
v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
2525
)
2626

2727
func TestNewDevfileData(t *testing.T) {

Diff for: ‎pkg/devfile/parser/data/interface.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2020
"github.com/devfile/api/v2/pkg/attributes"
2121
devfilepkg "github.com/devfile/api/v2/pkg/devfile"
22-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
22+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2323
)
2424

2525
// Generate mock interfaces for DevfileData by executing the following cmd in pkg/devfile/parser/data

Diff for: ‎pkg/devfile/parser/data/mock_interface.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎pkg/devfile/parser/data/v2/commands.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v2
1818
import (
1919
"fmt"
2020
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
21-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
21+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2222
"reflect"
2323
"strings"
2424
)

Diff for: ‎pkg/devfile/parser/data/v2/commands_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2525
"github.com/devfile/api/v2/pkg/attributes"
26-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
26+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2727
"github.com/stretchr/testify/assert"
2828
)
2929

Diff for: ‎pkg/devfile/parser/data/v2/components.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
24-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
24+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2525
)
2626

2727
// GetComponents returns the slice of Component objects parsed from the Devfile

Diff for: ‎pkg/devfile/parser/data/v2/components_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2525
"github.com/devfile/api/v2/pkg/attributes"
26-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
27-
"github.com/devfile/library/pkg/testingutil"
26+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
27+
"github.com/devfile/library/v2/pkg/testingutil"
2828
"github.com/stretchr/testify/assert"
2929
)
3030

Diff for: ‎pkg/devfile/parser/data/v2/containers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
v1alpha2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
24-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
24+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2525
corev1 "k8s.io/api/core/v1"
2626
)
2727

Diff for: ‎pkg/devfile/parser/data/v2/events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v2
1818
import (
1919
"fmt"
2020
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
21-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
21+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2222
"strings"
2323
)
2424

Diff for: ‎pkg/devfile/parser/data/v2/projects.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v2
1818
import (
1919
"fmt"
2020
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
21-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
21+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2222
"reflect"
2323
"strings"
2424
)

Diff for: ‎pkg/devfile/parser/data/v2/projects_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2424
"github.com/devfile/api/v2/pkg/attributes"
25-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
25+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2626
"github.com/kylelemons/godebug/pretty"
2727
"github.com/stretchr/testify/assert"
2828
)

Diff for: ‎pkg/devfile/parser/data/v2/volumes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121

2222
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
23-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
23+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2424
)
2525

2626
// AddVolumeMounts adds the volume mounts to the specified container component

Diff for: ‎pkg/devfile/parser/data/v2/volumes_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020

2121
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
22-
"github.com/devfile/library/pkg/testingutil"
22+
"github.com/devfile/library/v2/pkg/testingutil"
2323
"github.com/stretchr/testify/assert"
2424
)
2525

Diff for: ‎pkg/devfile/parser/data/versions.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package data
1818
import (
1919
"reflect"
2020

21-
v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
22-
v200 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.0.0"
23-
v210 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.1.0"
24-
v220 "github.com/devfile/library/pkg/devfile/parser/data/v2/2.2.0"
21+
v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
22+
v200 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.0.0"
23+
v210 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.1.0"
24+
v220 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2/2.2.0"
2525
)
2626

2727
// SupportedApiVersions stores the supported devfile API versions

Diff for: ‎pkg/devfile/parser/devfileobj.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package parser
1717

1818
import (
19-
devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
20-
"github.com/devfile/library/pkg/devfile/parser/data"
19+
devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
20+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
2121
)
2222

2323
// Default filenames for create devfile

Diff for: ‎pkg/devfile/parser/parse.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"path"
2828
"strings"
2929

30-
devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
31-
"github.com/devfile/library/pkg/devfile/parser/data"
32-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
33-
"github.com/devfile/library/pkg/util"
30+
devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
31+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
32+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
33+
"github.com/devfile/library/v2/pkg/util"
3434
"k8s.io/apimachinery/pkg/types"
3535
"k8s.io/client-go/tools/clientcmd"
3636
"k8s.io/klog"

Diff for: ‎pkg/devfile/parser/parse_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2222
"github.com/devfile/api/v2/pkg/attributes"
2323
devfilepkg "github.com/devfile/api/v2/pkg/devfile"
24-
devfileCtx "github.com/devfile/library/pkg/devfile/parser/context"
25-
"github.com/devfile/library/pkg/devfile/parser/data"
26-
v2 "github.com/devfile/library/pkg/devfile/parser/data/v2"
27-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
28-
"github.com/devfile/library/pkg/testingutil"
24+
devfileCtx "github.com/devfile/library/v2/pkg/devfile/parser/context"
25+
"github.com/devfile/library/v2/pkg/devfile/parser/data"
26+
v2 "github.com/devfile/library/v2/pkg/devfile/parser/data/v2"
27+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
28+
"github.com/devfile/library/v2/pkg/testingutil"
2929
"github.com/kylelemons/godebug/pretty"
3030
"github.com/stretchr/testify/assert"
3131
"io/ioutil"

Diff for: ‎pkg/devfile/parser/reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"io"
2222

23-
"github.com/devfile/library/pkg/util"
23+
"github.com/devfile/library/v2/pkg/util"
2424
"github.com/pkg/errors"
2525
"github.com/spf13/afero"
2626
"gopkg.in/yaml.v3"

Diff for: ‎pkg/devfile/parser/reader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"reflect"
2323
"testing"
2424

25-
"github.com/devfile/library/pkg/util"
25+
"github.com/devfile/library/v2/pkg/util"
2626
"github.com/spf13/afero"
2727
"github.com/stretchr/testify/assert"
2828
)

Diff for: ‎pkg/devfile/parser/writer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package parser
1818
import (
1919
v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
2020
apiAttributes "github.com/devfile/api/v2/pkg/attributes"
21-
"github.com/devfile/library/pkg/devfile/parser/data/v2/common"
21+
"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
2222
"sigs.k8s.io/yaml"
2323

24-
"github.com/devfile/library/pkg/testingutil/filesystem"
24+
"github.com/devfile/library/v2/pkg/testingutil/filesystem"
2525
"github.com/pkg/errors"
2626
"k8s.io/klog"
2727
)

0 commit comments

Comments
 (0)