Skip to content

Commit f89c593

Browse files
mustard-mhmustard-mh
committed
Add new cases and fix
1 parent c4c4801 commit f89c593

15 files changed

+739
-8
lines changed

‎components/public-api/typescript-common/fixtures/toWorkspace2_1.golden

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"result": {
3+
"id": "gitpodio-workspaceimage-qjvlhi8es6o",
4+
"metadata": {
5+
"ownerId": "b49148ed-6e1f-4eae-927f-1e62a3c9dab9",
6+
"organizationId": "ce36c2f8-5d43-4b1d-92f2-08cb6f0e0869",
7+
"configurationId": "af8f3b00-5a0c-4be1-89bf-52bc72b75205",
8+
"annotations": {},
9+
"name": "gitpod-io/workspace-images - main",
10+
"pinned": false,
11+
"originalContextUrl": "https://github.com/gitpod-io/workspace-images"
12+
},
13+
"spec": {
14+
"initializer": {
15+
"specs": [
16+
{
17+
"git": {
18+
"remoteUri": "https://github.com/gitpod-io/workspace-images.git",
19+
"upstreamRemoteUri": "",
20+
"targetMode": "CLONE_TARGET_MODE_UNSPECIFIED",
21+
"cloneTaget": "",
22+
"checkoutLocation": "workspace-images",
23+
"config": {
24+
"customConfig": {},
25+
"authentication": "AUTH_METHOD_UNSPECIFIED",
26+
"authUser": "",
27+
"authPassword": "",
28+
"authOts": ""
29+
}
30+
}
31+
}
32+
]
33+
},
34+
"type": "WORKSPACE_TYPE_REGULAR",
35+
"ports": [
36+
{
37+
"port": "5000",
38+
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
39+
"url": "https://5000-gitpodio-workspaceimage-qjvlhi8es6o.ws.gitpod.io",
40+
"protocol": "PROTOCOL_HTTP"
41+
}
42+
],
43+
"environmentVariables": [],
44+
"git": {
45+
"username": "",
46+
"email": ""
47+
},
48+
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
49+
"class": "g1-standard----class",
50+
"sshPublicKeys": [],
51+
"subassemblyReferences": [],
52+
"logUrl": "",
53+
"editor": {
54+
"name": "code",
55+
"version": "latest"
56+
}
57+
},
58+
"status": {
59+
"statusVersion": "1701406924",
60+
"phase": {
61+
"name": "PHASE_RUNNING",
62+
"lastTransitionTime": "2023-12-01T05:02:04.539Z"
63+
},
64+
"workspaceUrl": "https://gitpodio-workspaceimage-qjvlhi8es6o.ws.gitpod.io",
65+
"conditions": {
66+
"failed": "",
67+
"failedReason": "FAILED_REASON_UNSPECIFIED",
68+
"timeout": ""
69+
},
70+
"gitStatus": {
71+
"cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
72+
"branch": "main",
73+
"latestCommit": "fa52963fa39227bcfbf005d396eb753bf3981e40",
74+
"uncommitedFiles": [],
75+
"totalUncommitedFiles": 0,
76+
"untrackedFiles": [],
77+
"totalUntrackedFiles": 0,
78+
"unpushedCommits": [],
79+
"totalUnpushedCommits": 0
80+
},
81+
"instanceId": "e6f37fdb-dea1-4640-9e8b-8cdb04791a13"
82+
}
83+
},
84+
"err": ""
85+
}

‎components/public-api/typescript-common/fixtures/toWorkspace2_1.json

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
{
2+
"workspace": {
3+
"id": "gitpodio-workspaceimage-qjvlhi8es6o",
4+
"creationTime": "2023-12-01T04:59:09.016Z",
5+
"organizationId": "ce36c2f8-5d43-4b1d-92f2-08cb6f0e0869",
6+
"ownerId": "b49148ed-6e1f-4eae-927f-1e62a3c9dab9",
7+
"contextURL": "https://github.com/gitpod-io/workspace-images",
8+
"projectId": "af8f3b00-5a0c-4be1-89bf-52bc72b75205",
9+
"description": "gitpod-io/workspace-images - main",
10+
"context": {
11+
"isFile": false,
12+
"path": "",
13+
"title": "gitpod-io/workspace-images - main",
14+
"ref": "main",
15+
"refType": "branch",
16+
"revision": "fa52963fa39227bcfbf005d396eb753bf3981e40",
17+
"repository": {
18+
"cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
19+
"host": "github.com",
20+
"defaultBranch": "main",
21+
"name": "workspace-images",
22+
"owner": "gitpod-io",
23+
"private": false
24+
},
25+
"normalizedContextURL": "https://github.com/gitpod-io/workspace-images",
26+
"checkoutLocation": "workspace-images"
27+
},
28+
"cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
29+
"config": {
30+
"image": {
31+
"file": ".gitpod.Dockerfile",
32+
"externalSource": {
33+
"repository": {
34+
"cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
35+
"host": "github.com",
36+
"defaultBranch": "main",
37+
"name": "workspace-images",
38+
"owner": "gitpod-io",
39+
"private": false
40+
},
41+
"revision": "d7120fb6038d1d888676141e90e8f91c34fa702a"
42+
}
43+
},
44+
"ports": [
45+
{
46+
"port": 5000,
47+
"visibility": "public",
48+
"onOpen": "ignore"
49+
},
50+
{
51+
"port": 5001,
52+
"visibility": "private",
53+
"onOpen": "ignore"
54+
}
55+
],
56+
"tasks": [
57+
{
58+
"name": "install pre-commit git hooks",
59+
"init": "pre-commit install"
60+
}
61+
],
62+
"vscode": {
63+
"extensions": [
64+
"ms-azuretools.vscode-docker",
65+
"timonwong.shellcheck"
66+
]
67+
},
68+
"github": {
69+
"prebuilds": {
70+
"master": true,
71+
"branches": true,
72+
"pullRequests": true,
73+
"pullRequestsFromForks": true
74+
}
75+
},
76+
"_origin": "repo",
77+
"ideCredentials": "ideCredentials"
78+
},
79+
"imageSource": {
80+
"dockerFilePath": ".gitpod.Dockerfile",
81+
"dockerFileSource": {
82+
"repository": {
83+
"cloneUrl": "https://github.com/gitpod-io/workspace-images.git",
84+
"host": "github.com",
85+
"defaultBranch": "main",
86+
"name": "workspace-images",
87+
"owner": "gitpod-io",
88+
"private": false
89+
},
90+
"revision": "d7120fb6038d1d888676141e90e8f91c34fa702a"
91+
},
92+
"dockerFileHash": "d7120fb6038d1d888676141e90e8f91c34fa702a"
93+
},
94+
"imageNameResolved": "877922613839.dkr.ecr.eu-central-1.amazonaws.com/image-build/workspace-images:7ce05944fe76199b43aa67aa398266389d2ab348acb01ce6ccca6585be1c7aac",
95+
"baseImageNameResolved": "877922613839.dkr.ecr.eu-central-1.amazonaws.com/image-build/base-images@sha256:51b36205d2503e50f16415934d75edd9094291428b676de08e2745bbcadb51e1",
96+
"shareable": false,
97+
"type": "regular",
98+
"softDeleted": null,
99+
"deleted": false,
100+
"pinned": false
101+
},
102+
"latestInstance": {
103+
"id": "e6f37fdb-dea1-4640-9e8b-8cdb04791a13",
104+
"workspaceId": "gitpodio-workspaceimage-qjvlhi8es6o",
105+
"region": "workspace",
106+
"creationTime": "2023-12-01T04:59:09.080Z",
107+
"startedTime": "2023-12-01T05:02:04.539Z",
108+
"ideUrl": "https://gitpodio-workspaceimage-qjvlhi8es6o.ws.gitpod.io",
109+
"workspaceImage": "877922613839.dkr.ecr.eu-central-1.amazonaws.com/image-build/workspace-images:7ce05944fe76199b43aa67aa398266389d2ab348acb01ce6ccca6585be1c7aac",
110+
"status": {
111+
"phase": "running",
112+
"nodeIp": "100.64.102.149",
113+
"message": "",
114+
"podName": "ws-e6f37fdb-dea1-4640-9e8b-8cdb04791a13",
115+
"timeout": "1h0m0s",
116+
"version": 113211822,
117+
"nodeName": "ip-100-64-102-149.eu-central-1.compute.internal",
118+
"conditions": {
119+
"failed": "",
120+
"timeout": "",
121+
"deployed": true,
122+
"pullingImages": false,
123+
"stoppedByRequest": false,
124+
"firstUserActivity": "2023-12-01T05:02:06.000Z",
125+
"headlessTaskFailed": ""
126+
},
127+
"ownerToken": "ownerToken111",
128+
"exposedPorts": [
129+
{
130+
"url": "https://5000-gitpodio-workspaceimage-qjvlhi8es6o.ws.gitpod.io",
131+
"port": 5000,
132+
"protocol": "http",
133+
"visibility": "private"
134+
}
135+
]
136+
},
137+
"gitStatus": {
138+
"branch": "main",
139+
"latestCommit": "fa52963fa39227bcfbf005d396eb753bf3981e40"
140+
},
141+
"phasePersisted": "running",
142+
"deleted": false,
143+
"configuration": {
144+
"ideImage": "869456089606.dkr.ecr.eu-central-1.amazonaws.com/application/ide/code:commit-3bb09152fc5248f5b99b33b4d8a7f101aa082441",
145+
"ideImageLayers": [
146+
"869456089606.dkr.ecr.eu-central-1.amazonaws.com/application/ide/gitpod-code-web:commit-49bb715b599dce2356dd02a6ede7ae8cf10d8d12",
147+
"869456089606.dkr.ecr.eu-central-1.amazonaws.com/application/ide/code-codehelper:commit-a96456ae29513e367719ff1c720adb2c59a0bd49"
148+
],
149+
"supervisorImage": "869456089606.dkr.ecr.eu-central-1.amazonaws.com/application/supervisor:commit-be35ce16a80342b0e57d85d486544e9608044d9a",
150+
"ideConfig": {
151+
"useLatest": true,
152+
"ide": "code"
153+
},
154+
"ideSetup": {
155+
"envvars": [
156+
{
157+
"name": "GITPOD_CONFIGCAT_ENABLED",
158+
"value": "true"
159+
},
160+
{
161+
"name": "GITPOD_IDE_ALIAS",
162+
"value": "code"
163+
}
164+
],
165+
"tasks": []
166+
},
167+
"regionPreference": "",
168+
"fromBackup": false,
169+
"featureFlags": [
170+
"workspace_psi",
171+
"workspace_class_limiting"
172+
]
173+
},
174+
"imageBuildInfo": null,
175+
"workspaceClass": "g1-standard----class",
176+
"usageAttributionId": "team:ce36c2f8-5d43-4b1d-92f2-08cb6f0e0869"
177+
}
178+
}

‎components/public-api/typescript-common/fixtures/toWorkspace2_2.golden

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"result": {
3+
"id": "gitpodio-gitpod-ve5gs3cb32j",
4+
"metadata": {
5+
"ownerId": "b49148ed-6e1f-4eae-927f-1e62a3c9dab9",
6+
"organizationId": "ce36c2f8-5d43-4b1d-92f2-08cb6f0e0869",
7+
"configurationId": "1fffcdbd-f716-4185-a14f-a689bd52cd2d",
8+
"annotations": {},
9+
"name": "gitpod-io/gitpod - main",
10+
"pinned": true,
11+
"originalContextUrl": "https://github.com/gitpod-io/gitpod"
12+
},
13+
"spec": {
14+
"initializer": {
15+
"specs": [
16+
{
17+
"prebuild": {
18+
"prebuildId": "68da9714-93c0-4b7c-8579-dee70b1fbc3a"
19+
}
20+
}
21+
]
22+
},
23+
"type": "WORKSPACE_TYPE_REGULAR",
24+
"ports": [
25+
{
26+
"port": "3000",
27+
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
28+
"url": "https://3000-gitpodio-gitpod-ve5gs3cb32j.ws.gitpod.io",
29+
"protocol": "PROTOCOL_HTTP"
30+
},
31+
{
32+
"port": "3306",
33+
"admission": "ADMISSION_LEVEL_EVERYONE",
34+
"url": "https://3306-gitpodio-gitpod-ve5gs3cb32j.ws.gitpod.io",
35+
"protocol": "PROTOCOL_HTTP"
36+
}
37+
],
38+
"environmentVariables": [],
39+
"git": {
40+
"username": "",
41+
"email": ""
42+
},
43+
"admission": "ADMISSION_LEVEL_EVERYONE",
44+
"class": "g1-xlarge",
45+
"sshPublicKeys": [],
46+
"subassemblyReferences": [],
47+
"logUrl": "",
48+
"editor": {
49+
"name": "code",
50+
"version": "stable"
51+
}
52+
},
53+
"status": {
54+
"statusVersion": "1701406421",
55+
"phase": {
56+
"name": "PHASE_RUNNING",
57+
"lastTransitionTime": "2023-12-01T04:53:41.918Z"
58+
},
59+
"workspaceUrl": "https://gitpodio-gitpod-ve5gs3cb32j.ws.gitpod.io",
60+
"conditions": {
61+
"failed": "",
62+
"failedReason": "FAILED_REASON_UNSPECIFIED",
63+
"timeout": ""
64+
},
65+
"gitStatus": {
66+
"cloneUrl": "https://github.com/gitpod-io/gitpod.git",
67+
"branch": "hw/papi-refine-ws",
68+
"latestCommit": "3da336cde4a9a29e9e4dd6424bd4b791d616c735",
69+
"uncommitedFiles": [
70+
"components/public-api/generate.sh",
71+
"components/public-api/typescript-common/fixtures/toWorkspace_1.golden",
72+
"components/public-api/typescript-common/fixtures/toWorkspace_1.json",
73+
"components/public-api/typescript-common/fixtures/toWorkspace_2.golden",
74+
"components/public-api/typescript-common/fixtures/toWorkspace_2.json",
75+
"components/public-api/typescript-common/fixtures/toWorkspace_3.golden",
76+
"components/public-api/typescript-common/fixtures/toWorkspace_3.json",
77+
"components/public-api/typescript-common/fixtures/toWorkspace_4.golden",
78+
"components/public-api/typescript-common/fixtures/toWorkspace_4.json",
79+
"components/public-api/typescript-common/src/public-api-converter.spec.ts"
80+
],
81+
"totalUncommitedFiles": 10,
82+
"untrackedFiles": [],
83+
"totalUntrackedFiles": 0,
84+
"unpushedCommits": [
85+
"3da336cde: Revert \"Revert \"Refine workspace API (#19138)\" (#19172)\""
86+
],
87+
"totalUnpushedCommits": 1
88+
},
89+
"instanceId": "4b1ef455-e04c-43d3-bf5d-0d67f168c9f3"
90+
}
91+
},
92+
"err": ""
93+
}

0 commit comments

Comments
 (0)