Skip to content

Commit 67970d3

Browse files
akosyakoviQQBot
akosyakov
authored and
iQQBot
committed
add referrer tests
1 parent 23b8f48 commit 67970d3

22 files changed

+156
-6
lines changed

‎components/ide-service/pkg/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ type WorkspaceConfig struct {
209209
}
210210

211211
func (s *IDEServiceServer) resolveReferrerIDE(wsCtx *WorkspaceContext, chosenIDEName string) (ideName string, ideOption config.IDEOption) {
212-
if wsCtx == nil || wsCtx.Referrer == "" || wsCtx.ReferrerIde == "" {
212+
if wsCtx == nil || wsCtx.Referrer == "" {
213213
return
214214
}
215215

‎components/ide-service/pkg/server/testdata/resolve_ws_config_imagebuild.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9"
1111
},
1212
"Err": ""
13-
}
13+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_prebuild.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9"
1111
},
1212
"Err": ""
13-
}
13+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.golden

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"Resp": {
3+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
4+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
5+
"ide_image_layers": [
6+
"eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
7+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
8+
],
9+
"referer_ide": "intellij"
10+
},
11+
"Err": ""
12+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\"}",
3+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
4+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.golden

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"Resp": {
3+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
4+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
5+
"ide_image_layers": [
6+
"eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
7+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
8+
],
9+
"referer_ide": "goland"
10+
},
11+
"Err": ""
12+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_goland.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\",\"referrerIde\":\"goland\"}",
3+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
4+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.golden

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"Resp": {
3+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
4+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
5+
"ide_image_layers": [
6+
"eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
7+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
8+
],
9+
"referer_ide": "intellij"
10+
},
11+
"Err": ""
12+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\",\"referrerIde\":\"invalid\"}",
3+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
4+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.golden

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"Resp": {
3+
"envvars": [
4+
{
5+
"name": "GITPOD_IDE_ALIAS",
6+
"value": "code"
7+
}
8+
],
9+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
10+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
11+
"ide_image_layers": [
12+
"eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
13+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
14+
],
15+
"referer_ide": "intellij"
16+
},
17+
"Err": ""
18+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\",\"referrerIde\":\"invalid\"}",
3+
"ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"code\",\"useLatestVersion\":false}",
4+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
5+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.golden

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"Resp": {
3+
"envvars": [
4+
{
5+
"name": "GITPOD_IDE_ALIAS",
6+
"value": "code-desktop"
7+
}
8+
],
9+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
10+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
11+
"ide_image_layers": [
12+
"eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
13+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
14+
],
15+
"referer_ide": "intellij"
16+
},
17+
"Err": ""
18+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_code_desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\",\"referrerIde\":\"invalid\"}",
3+
"ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"code-desktop\",\"useLatestVersion\":false}",
4+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
5+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.golden

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"Resp": {
3+
"envvars": [
4+
{
5+
"name": "GITPOD_IDE_ALIAS",
6+
"value": "goland"
7+
}
8+
],
9+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
10+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
11+
"ide_image_layers": [
12+
"eu.gcr.io/gitpod-core-dev/build/ide/goland:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
13+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
14+
],
15+
"referer_ide": "goland"
16+
},
17+
"Err": ""
18+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_gw_invalid_with_goland.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"jetbrains-gateway\",\"referrerIde\":\"invalid\"}",
3+
"ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"goland\",\"useLatestVersion\":false}",
4+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
5+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid.golden

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"Resp": {
3+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
4+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9"
5+
},
6+
"Err": ""
7+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"invalid\"}",
3+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
4+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.golden

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"Resp": {
3+
"envvars": [
4+
{
5+
"name": "GITPOD_IDE_ALIAS",
6+
"value": "intellij"
7+
}
8+
],
9+
"supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
10+
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
11+
"ide_image_layers": [
12+
"eu.gcr.io/gitpod-core-dev/build/ide/intellij:commit-9a6c79a91b2b1f583d5bcb7f9f1ef54ee977e0df",
13+
"eu.gcr.io/gitpod-core-dev/build/ide/jb-backend-plugin:commit-b38092639d1783a1957894ddd4f492b3cdc9794a"
14+
]
15+
},
16+
"Err": ""
17+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_referrer_invalid_with_intellij.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\",\"referrer\":\"invalid\"}",
3+
"ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"intellij\",\"useLatestVersion\":false}",
4+
"workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
5+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_regular_code.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9"
1111
},
1212
"Err": ""
13-
}
13+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
]
1515
},
1616
"Err": ""
17-
}
17+
}

‎components/ide-service/pkg/server/testdata/resolve_ws_config_regular_intellij_latest.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
]
1515
},
1616
"Err": ""
17-
}
17+
}

0 commit comments

Comments
 (0)