ws-manager: Update and add golden files

gitpod-io · Dec 28, 2022 · 24a7d19 · 24a7d19
1 parent a7fe67d
commit 24a7d19
Show file tree

Hide file tree

Showing 29 changed files with 365 additions and 2 deletions.
diff --git a/components/ws-manager/pkg/manager/status.go b/components/ws-manager/pkg/manager/status.go
@@ -502,7 +502,7 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
 			return nil
 		}
 
-		// the pod phase of pending is somtimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod.
+		// the pod phase of pending is sometimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod.
 		if !wso.AlreadyInitializing() {
 			result.Phase = api.WorkspacePhase_CREATING
 			result.Message = "pod is running but init has not started yet or is not finished"

diff --git a/components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden b/components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden
@@ -0,0 +1,3 @@
+{
+    "actions": null
+}
diff --git a/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json b/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json
@@ -26,6 +26,7 @@
         "gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z",
         "gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f",
         "gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com",
         "gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=",

diff --git a/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json b/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json
@@ -27,6 +27,7 @@
         "gitpod/firstUserActivity": "2020-03-09T15:31:26.855961185Z",
         "gitpod/id": "27e46234-5004-44c1-a2e8-56d68ac3c70b",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "db334047-3c4b-49cc-a5fb-a089bff656e0",
         "gitpod/url": "http://db334047-3c4b-49cc-a5fb-a089bff656e0.ws-dev.cw-registry.staging.gitpod-dev.com",
         "gitpod/exposedPorts": "CgUIkD8YAQ==",

diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted.json b/components/ws-manager/pkg/manager/testdata/status_interrupted.json
@@ -24,6 +24,7 @@
         "gitpod/contentInitializer": "[redacted]",
         "gitpod/id": "283522ed-51f1-4838-951b-0f115c0a7aae",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "b246b28e-4776-47d5-961d-10548ffac9a8",
         "gitpod/url": "https://b246b28e-4776-47d5-961d-10548ffac9a8.ws-eu0.gitpod-staging.com",
         "gitpod/exposedPorts": "CgMIjC4KAwiQPw==",

diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json b/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json
@@ -23,6 +23,7 @@
         "gitpod/contentInitializer": "[redacted]",
         "gitpod/id": "4bf2e82d-cdc7-4764-b8ad-6973e3c4a629",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "f75a430d-331d-4977-a4dc-16939c0752e1",
         "gitpod/url": "http://f75a430d-331d-4977-a4dc-16939c0752e1.ws-eu.cw-gh-2720.staging.gitpod.io"
       }

diff --git a/...ents/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json b/...ents/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json
@@ -25,6 +25,7 @@
         "gitpod/customTimeout": "30m",
         "gitpod/id": "da9ffbf1-a12d-4a58-8593-475394eedb00",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "c0eabd01-6315-4fc4-8f60-1b008e100743",
         "gitpod/url": "https://c0eabd01-6315-4fc4-8f60-1b008e100743.ws-eu01.gitpod.io",
         "gitpod/exposedPorts": "CgUIuBcYAQ==",

diff --git a/...manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json b/...manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json
@@ -25,6 +25,7 @@
         "gitpod/customTimeout": "30m",
         "gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc",
         "gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io",
         "gitpod/exposedPorts": "CgUIkD8YAQ==",

diff --git a/...ager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json b/...ager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json
@@ -25,6 +25,7 @@
         "gitpod/customTimeout": "30m",
         "gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc",
         "gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io",
         "gitpod/exposedPorts": "CgUIkD8YAQ==",

diff --git a/components/ws-manager/pkg/manager/testdata/status_metadata.json b/components/ws-manager/pkg/manager/testdata/status_metadata.json
@@ -20,6 +20,7 @@
         "gitpod/id": "foobas",
         "gitpod/servicePrefix": "foobas",
         "gitpod/url": "http://10.0.0.114:8082",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/exposedPorts": "CgMIkD8="
       }
     },

diff --git a/components/ws-manager/pkg/manager/testdata/status_ownerToken.json b/components/ws-manager/pkg/manager/testdata/status_ownerToken.json
@@ -25,6 +25,7 @@
         "gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z",
         "gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c",
         "gitpod/ready": "true",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f",
         "gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com",
         "gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=",

diff --git a/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json b/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json
@@ -19,6 +19,7 @@
         "gitpod/id": "foobas",
         "gitpod/servicePrefix": "foobas",
         "gitpod/url": "http://10.0.0.114:8082",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/never-ready": "true"
       }
     },

diff --git a/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json b/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json
@@ -31,6 +31,7 @@
         "gitpod/contentInitializer": "[redacted]",
         "gitpod/exposedPorts": "ClEIuBciTGh0dHBzOi8vMzAwMC1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20KUwiJ0wEiTWh0dHBzOi8vMjcwMTctbGltZS1vcG9zc3VtLTNqZnRmNjVpLndzLWRldi5jdy1maXgtNjIxMy5zdGFnaW5nLmdpdHBvZC1kZXYuY29tClEIjUgiTGh0dHBzOi8vOTIyOS1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20=",
         "gitpod/customTimeout": "60m",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/firstUserActivity": "2021-10-14T19:11:43.983492544Z",
         "gitpod/id": "18f99de5-090f-4318-9759-05f5ef0277f7",
         "gitpod/imageSpec": "CnRldS5nY3IuaW8vZ2l0cG9kLWNvcmUtZGV2L3JlZ2lzdHJ5L3dvcmtzcGFjZS1pbWFnZXM6M2JkNWNlMTJmN2FjZDFmZjE5NDk0YTI1YWEyZmYwMWZmOWE3YjkzODU2N2M4NGQ1MmNlNmFhMGIyYmQ0MDA5MhJYZXUuZ2NyLmlvL2dpdHBvZC1jb3JlLWRldi9idWlsZC9pZGUvY29kZTpjb21taXQtNzEwN2ZiOGJkZTBiMWY5MjI2NTQwMmFkNWZhMDlhNTEwMjJiMTRkZA==",

diff --git a/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden b/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden
@@ -15,11 +15,12 @@
             "timeout": "30m",
             "ide_image": {}
         },
-        "phase": 4,
+        "phase": 2,
         "conditions": {
             "timeout": "workspace timed out after I've meddled with this test data set",
             "volume_snapshot": {}
         },
+        "message": "pod is running but init has not started yet or is not finished",
         "runtime": {
             "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-tmz8",
             "pod_name": "ws-2513d0b4-3c18-4735-b32e-1bbdead24b78",

diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json
@@ -19,6 +19,7 @@
         "gitpod/id": "foobar",
         "gitpod/servicePrefix": "foobar",
         "gitpod/url": "http://10.0.0.114:8082",
+        "gitpod.io/alreadyInitializing": "true",
         "gitpod/never-ready": "true"
       }
     },

diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden
@@ -0,0 +1,29 @@
+{
+    "status": {
+        "id": "foobas",
+        "status_version": 65536,
+        "metadata": {
+            "owner": "foobar",
+            "meta_id": "metameta",
+            "started_at": {
+                "seconds": 1552236488
+            }
+        },
+        "spec": {
+            "workspace_image": "nginx:latest",
+            "url": "http://10.0.0.114:8082",
+            "ide_image": {}
+        },
+        "phase": 2,
+        "conditions": {
+            "volume_snapshot": {}
+        },
+        "message": "pod is running but init has not started yet or is not finished",
+        "runtime": {
+            "node_name": "minikube",
+            "pod_name": "ws-foobas",
+            "node_ip": "10.0.2.15"
+        },
+        "auth": {}
+    }
+}