Skip to content

Commit 24a7d19

Browse files
utam0kroboquat
utam0k
authored and
roboquat
committed
ws-manager: Update and add golden files
1 parent a7fe67d commit 24a7d19

29 files changed

+365
-2
lines changed

‎components/ws-manager/pkg/manager/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
502502
return nil
503503
}
504504

505-
// the pod phase of pending is somtimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod.
505+
// the pod phase of pending is sometimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod.
506506
if !wso.AlreadyInitializing() {
507507
result.Phase = api.WorkspacePhase_CREATING
508508
result.Message = "pod is running but init has not started yet or is not finished"

‎components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"actions": null
3+
}

‎components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z",
2727
"gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c",
2828
"gitpod/ready": "true",
29+
"gitpod.io/alreadyInitializing": "true",
2930
"gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f",
3031
"gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com",
3132
"gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=",

‎components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"gitpod/firstUserActivity": "2020-03-09T15:31:26.855961185Z",
2828
"gitpod/id": "27e46234-5004-44c1-a2e8-56d68ac3c70b",
2929
"gitpod/ready": "true",
30+
"gitpod.io/alreadyInitializing": "true",
3031
"gitpod/servicePrefix": "db334047-3c4b-49cc-a5fb-a089bff656e0",
3132
"gitpod/url": "http://db334047-3c4b-49cc-a5fb-a089bff656e0.ws-dev.cw-registry.staging.gitpod-dev.com",
3233
"gitpod/exposedPorts": "CgUIkD8YAQ==",

‎components/ws-manager/pkg/manager/testdata/status_interrupted.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"gitpod/contentInitializer": "[redacted]",
2525
"gitpod/id": "283522ed-51f1-4838-951b-0f115c0a7aae",
2626
"gitpod/ready": "true",
27+
"gitpod.io/alreadyInitializing": "true",
2728
"gitpod/servicePrefix": "b246b28e-4776-47d5-961d-10548ffac9a8",
2829
"gitpod/url": "https://b246b28e-4776-47d5-961d-10548ffac9a8.ws-eu0.gitpod-staging.com",
2930
"gitpod/exposedPorts": "CgMIjC4KAwiQPw==",

‎components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"gitpod/contentInitializer": "[redacted]",
2424
"gitpod/id": "4bf2e82d-cdc7-4764-b8ad-6973e3c4a629",
2525
"gitpod/ready": "true",
26+
"gitpod.io/alreadyInitializing": "true",
2627
"gitpod/servicePrefix": "f75a430d-331d-4977-a4dc-16939c0752e1",
2728
"gitpod/url": "http://f75a430d-331d-4977-a4dc-16939c0752e1.ws-eu.cw-gh-2720.staging.gitpod.io"
2829
}

‎components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"gitpod/customTimeout": "30m",
2626
"gitpod/id": "da9ffbf1-a12d-4a58-8593-475394eedb00",
2727
"gitpod/ready": "true",
28+
"gitpod.io/alreadyInitializing": "true",
2829
"gitpod/servicePrefix": "c0eabd01-6315-4fc4-8f60-1b008e100743",
2930
"gitpod/url": "https://c0eabd01-6315-4fc4-8f60-1b008e100743.ws-eu01.gitpod.io",
3031
"gitpod/exposedPorts": "CgUIuBcYAQ==",

‎components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"gitpod/customTimeout": "30m",
2626
"gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076",
2727
"gitpod/ready": "true",
28+
"gitpod.io/alreadyInitializing": "true",
2829
"gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc",
2930
"gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io",
3031
"gitpod/exposedPorts": "CgUIkD8YAQ==",

‎components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"gitpod/customTimeout": "30m",
2626
"gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076",
2727
"gitpod/ready": "true",
28+
"gitpod.io/alreadyInitializing": "true",
2829
"gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc",
2930
"gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io",
3031
"gitpod/exposedPorts": "CgUIkD8YAQ==",

‎components/ws-manager/pkg/manager/testdata/status_metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"gitpod/id": "foobas",
2121
"gitpod/servicePrefix": "foobas",
2222
"gitpod/url": "http://10.0.0.114:8082",
23+
"gitpod.io/alreadyInitializing": "true",
2324
"gitpod/exposedPorts": "CgMIkD8="
2425
}
2526
},

‎components/ws-manager/pkg/manager/testdata/status_ownerToken.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z",
2626
"gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c",
2727
"gitpod/ready": "true",
28+
"gitpod.io/alreadyInitializing": "true",
2829
"gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f",
2930
"gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com",
3031
"gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=",

‎components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"gitpod/id": "foobas",
2020
"gitpod/servicePrefix": "foobas",
2121
"gitpod/url": "http://10.0.0.114:8082",
22+
"gitpod.io/alreadyInitializing": "true",
2223
"gitpod/never-ready": "true"
2324
}
2425
},

‎components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"gitpod/contentInitializer": "[redacted]",
3232
"gitpod/exposedPorts": "ClEIuBciTGh0dHBzOi8vMzAwMC1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20KUwiJ0wEiTWh0dHBzOi8vMjcwMTctbGltZS1vcG9zc3VtLTNqZnRmNjVpLndzLWRldi5jdy1maXgtNjIxMy5zdGFnaW5nLmdpdHBvZC1kZXYuY29tClEIjUgiTGh0dHBzOi8vOTIyOS1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20=",
3333
"gitpod/customTimeout": "60m",
34+
"gitpod.io/alreadyInitializing": "true",
3435
"gitpod/firstUserActivity": "2021-10-14T19:11:43.983492544Z",
3536
"gitpod/id": "18f99de5-090f-4318-9759-05f5ef0277f7",
3637
"gitpod/imageSpec": "CnRldS5nY3IuaW8vZ2l0cG9kLWNvcmUtZGV2L3JlZ2lzdHJ5L3dvcmtzcGFjZS1pbWFnZXM6M2JkNWNlMTJmN2FjZDFmZjE5NDk0YTI1YWEyZmYwMWZmOWE3YjkzODU2N2M4NGQ1MmNlNmFhMGIyYmQ0MDA5MhJYZXUuZ2NyLmlvL2dpdHBvZC1jb3JlLWRldi9idWlsZC9pZGUvY29kZTpjb21taXQtNzEwN2ZiOGJkZTBiMWY5MjI2NTQwMmFkNWZhMDlhNTEwMjJiMTRkZA==",

‎components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
"timeout": "30m",
1616
"ide_image": {}
1717
},
18-
"phase": 4,
18+
"phase": 2,
1919
"conditions": {
2020
"timeout": "workspace timed out after I've meddled with this test data set",
2121
"volume_snapshot": {}
2222
},
23+
"message": "pod is running but init has not started yet or is not finished",
2324
"runtime": {
2425
"node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-tmz8",
2526
"pod_name": "ws-2513d0b4-3c18-4735-b32e-1bbdead24b78",

‎components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"gitpod/id": "foobar",
2020
"gitpod/servicePrefix": "foobar",
2121
"gitpod/url": "http://10.0.0.114:8082",
22+
"gitpod.io/alreadyInitializing": "true",
2223
"gitpod/never-ready": "true"
2324
}
2425
},

‎components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"status": {
3+
"id": "foobas",
4+
"status_version": 65536,
5+
"metadata": {
6+
"owner": "foobar",
7+
"meta_id": "metameta",
8+
"started_at": {
9+
"seconds": 1552236488
10+
}
11+
},
12+
"spec": {
13+
"workspace_image": "nginx:latest",
14+
"url": "http://10.0.0.114:8082",
15+
"ide_image": {}
16+
},
17+
"phase": 2,
18+
"conditions": {
19+
"volume_snapshot": {}
20+
},
21+
"message": "pod is running but init has not started yet or is not finished",
22+
"runtime": {
23+
"node_name": "minikube",
24+
"pod_name": "ws-foobas",
25+
"node_ip": "10.0.2.15"
26+
},
27+
"auth": {}
28+
}
29+
}

0 commit comments

Comments
 (0)