Skip to content

Commit c4c4801

Browse files
mustard-mhmustard-mh
committed
Update to workspace cases
1 parent 3da336c commit c4c4801

File tree

10 files changed

+650
-440
lines changed

10 files changed

+650
-440
lines changed

‎components/public-api/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ protoc_buf_generate
3636
update_license
3737

3838
# Run end-of-file-fixer
39-
git ls-files -- 'typescript/*.ts' | xargs pre-commit run end-of-file-fixer --files
39+
git ls-files -- 'typescript/*.ts' | xargs pre-commit run end-of-file-fixer --files || true
4040

4141
yarn --cwd typescript build

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

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
{
22
"result": {
33
"id": "akosyakov-parceldemo-4crqn25qlwi",
4-
"prebuild": false,
5-
"organizationId": "ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0",
6-
"name": "akosyakov/parcel-demo - master",
7-
"pinned": false,
4+
"metadata": {
5+
"ownerId": "827df1c8-d42d-4a69-bc38-64089af1f711",
6+
"organizationId": "ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0",
7+
"name": "akosyakov/parcel-demo - master",
8+
"originalContextUrl": "https://github.com/akosyakov/parcel-demo"
9+
},
10+
"spec": {
11+
"initializer": {
12+
"specs": [
13+
{
14+
"git": {
15+
"remoteUri": "https://github.com/akosyakov/parcel-demo",
16+
"checkoutLocation": "parcel-demo",
17+
"config": {}
18+
}
19+
}
20+
]
21+
},
22+
"type": "WORKSPACE_TYPE_REGULAR",
23+
"git": {},
24+
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
25+
"class": "g1-standard",
26+
"editor": {
27+
"name": "code",
28+
"version": "stable"
29+
}
30+
},
831
"status": {
32+
"statusVersion": "1697487504",
933
"phase": {
1034
"name": "PHASE_CREATING",
1135
"lastTransitionTime": "2023-10-16T20:18:24.923Z"
1236
},
13-
"message": "",
1437
"workspaceUrl": "https://akosyakov-parceldemo-4crqn25qlwi.ws-dev.ak-public-26583c8c5c.preview.gitpod-dev.com",
38+
"conditions": {},
1539
"gitStatus": {
1640
"cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
1741
"branch": "master",
18-
"latestCommit": "60dbf818194082ef1a368bacd49cfd25a34c9256",
19-
"uncommitedFiles": [],
20-
"totalUncommitedFiles": 0,
21-
"untrackedFiles": [],
22-
"totalUntrackedFiles": 0,
23-
"unpushedCommits": [],
24-
"totalUnpushedCommits": 0
42+
"latestCommit": "60dbf818194082ef1a368bacd49cfd25a34c9256"
2543
},
26-
"ports": [],
27-
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
28-
"instanceId": "226695b4-f10a-471a-a219-9b657645bf78",
29-
"conditions": {
30-
"failed": "",
31-
"timeout": ""
32-
}
33-
},
34-
"additionalEnvironmentVariables": [],
35-
"region": "dev",
36-
"workspaceClass": "g1-standard",
37-
"editor": {
38-
"name": "code",
39-
"version": "stable"
40-
},
41-
"contextUrl": "https://github.com/akosyakov/parcel-demo",
42-
"prebuildId": ""
44+
"instanceId": "226695b4-f10a-471a-a219-9b657645bf78"
45+
}
4346
},
4447
"err": ""
4548
}

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

Lines changed: 107 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,118 @@
11
{
2-
"workspace": {
3-
"id": "akosyakov-parceldemo-4crqn25qlwi",
4-
"creationTime": "2023-10-16T20:18:24.859Z",
5-
"organizationId": "ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0",
6-
"ownerId": "827df1c8-d42d-4a69-bc38-64089af1f711",
7-
"contextURL": "https://github.com/akosyakov/parcel-demo",
8-
"description": "akosyakov/parcel-demo - master",
9-
"context": {
10-
"isFile": false,
11-
"path": "",
12-
"title": "akosyakov/parcel-demo - master",
13-
"ref": "master",
14-
"refType": "branch",
15-
"revision": "60dbf818194082ef1a368bacd49cfd25a34c9256",
16-
"repository": {
17-
"cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
18-
"host": "github.com",
19-
"defaultBranch": "master",
20-
"name": "parcel-demo",
21-
"owner": "akosyakov",
22-
"private": false
23-
},
24-
"normalizedContextURL": "https://github.com/akosyakov/parcel-demo",
25-
"checkoutLocation": "parcel-demo"
26-
},
27-
"cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
28-
"config": {
29-
"tasks": [
30-
{
31-
"init": "yarn",
32-
"command": "yarn serve"
2+
"arg1": {
3+
"workspace": {
4+
"id": "akosyakov-parceldemo-4crqn25qlwi",
5+
"creationTime": "2023-10-16T20:18:24.859Z",
6+
"organizationId": "ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0",
7+
"ownerId": "827df1c8-d42d-4a69-bc38-64089af1f711",
8+
"contextURL": "https://github.com/akosyakov/parcel-demo",
9+
"description": "akosyakov/parcel-demo - master",
10+
"context": {
11+
"isFile": false,
12+
"path": "",
13+
"title": "akosyakov/parcel-demo - master",
14+
"ref": "master",
15+
"refType": "branch",
16+
"revision": "60dbf818194082ef1a368bacd49cfd25a34c9256",
17+
"repository": {
18+
"cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
19+
"host": "github.com",
20+
"defaultBranch": "master",
21+
"name": "parcel-demo",
22+
"owner": "akosyakov",
23+
"private": false
3324
},
34-
{
35-
"command": "gp open index.js\ngp preview $(gp url 1234)\n",
36-
"openMode": "split-right"
37-
}
38-
],
39-
"_origin": "repo",
40-
"image": "docker.io/gitpod/workspace-full:latest",
41-
"vscode": {
42-
"extensions": []
43-
}
44-
},
45-
"imageSource": {
46-
"baseImageResolved": "docker.io/gitpod/workspace-full:latest"
47-
},
48-
"imageNameResolved": "eu.gcr.io/gitpod-core-dev/build/workspace-images:d6d9404137cc976d4da4d450474cb515bc0512281a3649c1cab9309ba7caee65",
49-
"baseImageNameResolved": "docker.io/gitpod/workspace-full@sha256:10d6ab95512fe70bf6274976b19f94327570559e3d29f4b1cb01735b6fe534bb",
50-
"shareable": false,
51-
"type": "regular",
52-
"softDeleted": null,
53-
"deleted": false,
54-
"pinned": false
55-
},
56-
"latestInstance": {
57-
"id": "226695b4-f10a-471a-a219-9b657645bf78",
58-
"workspaceId": "akosyakov-parceldemo-4crqn25qlwi",
59-
"region": "dev",
60-
"creationTime": "2023-10-16T20:18:24.923Z",
61-
"ideUrl": "https://akosyakov-parceldemo-4crqn25qlwi.ws-dev.ak-public-26583c8c5c.preview.gitpod-dev.com",
62-
"status": {
63-
"phase": "creating",
64-
"message": "",
65-
"timeout": "30m0s",
66-
"version": 220880,
67-
"conditions": {
68-
"failed": "",
69-
"timeout": "",
70-
"deployed": true,
71-
"pullingImages": false,
72-
"stoppedByRequest": false,
73-
"headlessTaskFailed": ""
74-
},
75-
"exposedPorts": []
76-
},
77-
"gitStatus": null,
78-
"phasePersisted": "creating",
79-
"deleted": false,
80-
"configuration": {
81-
"ideImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-e77f3a07ea76bbb404d3f6bf4af36269afc45df1",
82-
"ideImageLayers": [
83-
"eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-49bb715b599dce2356dd02a6ede7ae8cf10d8d12",
84-
"eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:commit-18a48e2ccb779a268355d2b58a167c73de023547"
85-
],
86-
"supervisorImage": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-cda78d5706672b9a41e15d84a128cdb24357ad87",
87-
"ideConfig": {
88-
"useLatest": false,
89-
"ide": "code"
25+
"normalizedContextURL": "https://github.com/akosyakov/parcel-demo",
26+
"checkoutLocation": "parcel-demo"
9027
},
91-
"ideSetup": {
92-
"envvars": [
28+
"cloneUrl": "https://github.com/akosyakov/parcel-demo.git",
29+
"config": {
30+
"tasks": [
9331
{
94-
"name": "GITPOD_CONFIGCAT_ENABLED",
95-
"value": "true"
32+
"init": "yarn",
33+
"command": "yarn serve"
9634
},
9735
{
98-
"name": "GITPOD_IDE_ALIAS",
99-
"value": "code"
36+
"command": "gp open index.js\ngp preview $(gp url 1234)\n",
37+
"openMode": "split-right"
10038
}
10139
],
102-
"tasks": []
40+
"_origin": "repo",
41+
"image": "docker.io/gitpod/workspace-full:latest",
42+
"vscode": {
43+
"extensions": []
44+
}
10345
},
104-
"regionPreference": "",
105-
"fromBackup": false,
106-
"featureFlags": [
107-
"workspace_connection_limiting",
108-
"workspace_class_limiting"
109-
]
46+
"imageSource": {
47+
"baseImageResolved": "docker.io/gitpod/workspace-full:latest"
48+
},
49+
"imageNameResolved": "eu.gcr.io/gitpod-core-dev/build/workspace-images:d6d9404137cc976d4da4d450474cb515bc0512281a3649c1cab9309ba7caee65",
50+
"baseImageNameResolved": "docker.io/gitpod/workspace-full@sha256:10d6ab95512fe70bf6274976b19f94327570559e3d29f4b1cb01735b6fe534bb",
51+
"shareable": false,
52+
"type": "regular",
53+
"softDeleted": null,
54+
"deleted": false,
55+
"pinned": false
11056
},
111-
"imageBuildInfo": null,
112-
"workspaceClass": "g1-standard",
113-
"usageAttributionId": "team:ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0"
114-
}
57+
"latestInstance": {
58+
"id": "226695b4-f10a-471a-a219-9b657645bf78",
59+
"workspaceId": "akosyakov-parceldemo-4crqn25qlwi",
60+
"region": "dev",
61+
"creationTime": "2023-10-16T20:18:24.923Z",
62+
"ideUrl": "https://akosyakov-parceldemo-4crqn25qlwi.ws-dev.ak-public-26583c8c5c.preview.gitpod-dev.com",
63+
"status": {
64+
"phase": "creating",
65+
"message": "",
66+
"timeout": "30m0s",
67+
"version": 220880,
68+
"conditions": {
69+
"failed": "",
70+
"timeout": "",
71+
"deployed": true,
72+
"pullingImages": false,
73+
"stoppedByRequest": false,
74+
"headlessTaskFailed": ""
75+
},
76+
"exposedPorts": []
77+
},
78+
"gitStatus": null,
79+
"phasePersisted": "creating",
80+
"deleted": false,
81+
"configuration": {
82+
"ideImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-e77f3a07ea76bbb404d3f6bf4af36269afc45df1",
83+
"ideImageLayers": [
84+
"eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-49bb715b599dce2356dd02a6ede7ae8cf10d8d12",
85+
"eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:commit-18a48e2ccb779a268355d2b58a167c73de023547"
86+
],
87+
"supervisorImage": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-cda78d5706672b9a41e15d84a128cdb24357ad87",
88+
"ideConfig": {
89+
"useLatest": false,
90+
"ide": "code"
91+
},
92+
"ideSetup": {
93+
"envvars": [
94+
{
95+
"name": "GITPOD_CONFIGCAT_ENABLED",
96+
"value": "true"
97+
},
98+
{
99+
"name": "GITPOD_IDE_ALIAS",
100+
"value": "code"
101+
}
102+
],
103+
"tasks": []
104+
},
105+
"regionPreference": "",
106+
"fromBackup": false,
107+
"featureFlags": [
108+
"workspace_connection_limiting",
109+
"workspace_class_limiting"
110+
]
111+
},
112+
"imageBuildInfo": null,
113+
"workspaceClass": "g1-standard",
114+
"usageAttributionId": "team:ec76db37-9a48-4e2d-a78e-0ec7d2b4d2c0"
115+
}
116+
},
117+
"arg2": null
115118
}

0 commit comments

Comments
 (0)