Skip to content
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
2 changes: 1 addition & 1 deletion generator/overrides/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
genutils.WriteFormattedSourceFile(fileNamePart, ctx, root, func(buf *bytes.Buffer) {
buf.WriteString(`
import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
)

`)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/devfile/api
module github.com/devfile/api/v2

go 1.13

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/addtoscheme_workspaces_v1alpha2.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package apis

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/workspaces/v1alpha1/attributes_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package v1alpha1

import (
"fmt"
"github.com/devfile/api/pkg/attributes"

"github.com/devfile/api/v2/pkg/attributes"
)

func convertAttributesTo_v1alpha2(src map[string]string, dest *attributes.Attributes) {
Expand Down
5 changes: 3 additions & 2 deletions pkg/apis/workspaces/v1alpha1/commands_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package v1alpha1

import (
"encoding/json"
"github.com/devfile/api/pkg/attributes"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/attributes"

"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertCommandTo_v1alpha2(src *Command, dest *v1alpha2.Command) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/commands_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/components_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"encoding/json"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertComponentTo_v1alpha2(src *Component, dest *v1alpha2.Component) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/components_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertDevWorkspaceTo_v1alpha2(src *DevWorkspace, dest *v1alpha2.DevWorkspace) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/devworkspace_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/events_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertEventsTo_v1alpha2(src *Events, dest *v1alpha2.Events) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/events_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/parent_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"encoding/json"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertParentTo_v1alpha2(src *Parent, dest *v1alpha2.Parent) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/parent_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/plugin_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"encoding/json"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertPluginComponentTo_v1alpha2(srcComponent *Component, destComponent *v1alpha2.Component) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/projects_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"encoding/json"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
)

func convertProjectTo_v1alpha2(src *Project, dest *v1alpha2.Project) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha1/projects_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha1
import (
"testing"

"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
fuzz "github.com/google/gofuzz"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/commands.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha2

import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
runtime "k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/components.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha2

import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
runtime "k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/devfile.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha2

import (
"github.com/devfile/api/pkg/devfile"
"github.com/devfile/api/v2/pkg/devfile"
)

// Devfile describes the structure of a cloud-native workspace and development environment.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/endpoint.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha2

import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
)

// EndpointProtocol defines the application and transport protocols of the traffic that will go through this endpoint.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/projects.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha2

import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
runtime "k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/devfile/header.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package devfile

import (
attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
)

// DevfileHeader describes the structure of the devfile-specific top-level fields
Expand Down
2 changes: 1 addition & 1 deletion pkg/devfile/header_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package devfile
import (
"testing"

attributes "github.com/devfile/api/pkg/attributes"
attributes "github.com/devfile/api/v2/pkg/attributes"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/overriding/keys.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package overriding

import (
workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/hashicorp/go-multierror"
"k8s.io/apimachinery/pkg/util/sets"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/overriding/merging.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"strings"

workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/yaml"
Expand Down
4 changes: 2 additions & 2 deletions pkg/utils/overriding/overriding.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"
"strings"

workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
unions "github.com/devfile/api/pkg/utils/unions"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
unions "github.com/devfile/api/v2/pkg/utils/unions"
"k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/sets"
strategicpatch "k8s.io/apimachinery/pkg/util/strategicpatch"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/overriding/overriding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/json"
yamlMachinery "k8s.io/apimachinery/pkg/util/yaml"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/unions/normalize.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package unions
import (
"reflect"

workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/mitchellh/reflectwalk"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/unions/normalize_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package unions
import (
"testing"

workspaces "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
workspaces "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
"github.com/stretchr/testify/assert"
)

Expand Down