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.

Sign up for GitHub

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

Jump to bottom

update to latest devfile/api #79

Merged
merged 1 commit into from
Apr 9, 2021
Merged

update to latest devfile/api #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/devfile/library
go 1.13

require (
github.com/devfile/api/v2 v2.0.0-20210304212617-bfc3f501616b
github.com/devfile/api/v2 v2.0.0-20210408144711-a313872749ed
github.com/fatih/color v1.7.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/gobwas/glob v0.2.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
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-20210304212617-bfc3f501616b h1:r6Z2rXRA60eQQTdh1cJBBrj3vp9/c1rNbX42kyw2WpA=
github.com/devfile/api/v2 v2.0.0-20210304212617-bfc3f501616b/go.mod h1:Cot4snybn3qhIh48oIFi9McocnIx7zY5fFbjfrIpPvg=
github.com/devfile/api/v2 v2.0.0-20210408144711-a313872749ed h1:eTSeB23FwKwMN0kI7qB7Nq3OhfCaXkPPWUsru8TRo+o=
github.com/devfile/api/v2 v2.0.0-20210408144711-a313872749ed/go.mod h1:Cot4snybn3qhIh48oIFi9McocnIx7zY5fFbjfrIpPvg=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
4 changes: 2 additions & 2 deletions pkg/devfile/parser/configurables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func TestAddAndRemoveEnvVars(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -194,7 +194,7 @@ func testDevfileObj(fs filesystem.Filesystem) DevfileObj {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down
1,267 changes: 24 additions & 1,243 deletions pkg/devfile/parser/data/v2/2.1.0/devfileJsonSchema210.go
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions pkg/devfile/parser/data/v2/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ func TestDevfile200_AddEvents(t *testing.T) {
{
name: "successfully add the events",
currentEvents: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart1"},
},
},
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"postStart1"},
},
},
Expand All @@ -33,7 +33,7 @@ func TestDevfile200_AddEvents(t *testing.T) {
name: "successfully add the events to empty devfile event",
currentEvents: nil,
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"postStart1"},
},
},
Expand All @@ -42,12 +42,12 @@ func TestDevfile200_AddEvents(t *testing.T) {
{
name: "event already present",
currentEvents: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart1"},
},
},
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart2"},
},
},
Expand Down Expand Up @@ -86,12 +86,12 @@ func TestDevfile200_UpdateEvents(t *testing.T) {
{
name: "successfully add/update the events",
currentEvents: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart1"},
},
},
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart2"},
PostStart: []string{"postStart2"},
},
Expand All @@ -100,12 +100,12 @@ func TestDevfile200_UpdateEvents(t *testing.T) {
{
name: "successfully update the events to empty",
currentEvents: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart1"},
},
},
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{""},
},
},
Expand All @@ -114,7 +114,7 @@ func TestDevfile200_UpdateEvents(t *testing.T) {
name: "successfully add the events to empty devfile events",
currentEvents: nil,
newEvents: v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"preStart2"},
PostStart: []string{"postStart2"},
},
Expand Down
42 changes: 21 additions & 21 deletions pkg/devfile/parser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -149,7 +149,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
},
},
Expand Down Expand Up @@ -220,7 +220,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop"},
PreStop: []string{},
Expand Down Expand Up @@ -284,7 +284,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -332,7 +332,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
},
},
Expand Down Expand Up @@ -403,7 +403,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop"},
PreStop: []string{},
Expand Down Expand Up @@ -621,7 +621,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand All @@ -640,7 +640,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand All @@ -655,7 +655,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
PreStart: []string{},
PreStop: []string{},
Expand Down Expand Up @@ -745,7 +745,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -793,7 +793,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
},
},
Expand Down Expand Up @@ -864,7 +864,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop"},
PreStop: []string{},
Expand Down Expand Up @@ -928,7 +928,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop-1"},
},
},
Expand Down Expand Up @@ -976,7 +976,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop-2"},
},
Expand Down Expand Up @@ -1074,7 +1074,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop-1", "post-stop-2"},
PreStop: []string{},
Expand Down Expand Up @@ -1580,7 +1580,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -1616,7 +1616,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
},
},
Expand Down Expand Up @@ -1672,7 +1672,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PreStart: []string{"pre-start-0"},
},
},
Expand Down Expand Up @@ -1751,7 +1751,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{"post-start-0"},
PostStop: []string{"post-stop"},
PreStop: []string{},
Expand Down Expand Up @@ -2510,7 +2510,7 @@ func Test_parseParentFromRegistry(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStop: []string{"post-stop"},
},
},
Expand Down Expand Up @@ -2559,7 +2559,7 @@ func Test_parseParentFromRegistry(t *testing.T) {
},
},
Events: &v1.Events{
WorkspaceEvents: v1.WorkspaceEvents{
DevWorkspaceEvents: v1.DevWorkspaceEvents{
PostStart: []string{},
PostStop: []string{"post-stop"},
PreStop: []string{},
Expand Down
4 changes: 2 additions & 2 deletions updateApi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e

CURRENT_DIR=$(pwd)
API_PKG="github.com/devfile/api/v2"
SCHEMA_URL_MASTER="https://raw.githubusercontent.com/devfile/api/master/schemas/latest/devfile.json"
SCHEMA_URL_MASTER="https://raw.githubusercontent.com/devfile/api/main/schemas/latest/devfile.json"

# 2.0.0 devfile
SCHEMA_URL_200="https://raw.githubusercontent.com/devfile/api/2.0.x/schemas/latest/devfile.json"
Expand All @@ -31,7 +31,7 @@ trap 'onError' ERR


echo -e "${GREEN}Updating devfile/api in go.mod${NC}"
go get "${API_PKG}@master"
go get "${API_PKG}@main"

echo -e "${GREEN}Get latest schema${NC}"

Expand Down