Skip to content

Commit

Permalink
Fix admin dashboard convert failed case (#19192)
Browse files Browse the repository at this point in the history 
* Add test cases

* Fix admin dashboard convert case
  • Loading branch information
@mustard-mh
mustard-mh authored Dec 5, 2023
1 parent 74528b9 commit 17397ad
Show file tree
Hide file tree
Showing 8 changed files with 496 additions and 4 deletions.
94 changes: 94 additions & 0 deletions components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_1.golden
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"result": {
"id": "balabala-wd-id",
"metadata": {
"ownerId": "ownerId",
"organizationId": "organizationId",
"configurationId": "",
"annotations": {},
"name": "description",
"pinned": true,
"originalContextUrl": "https://github.com/gitpod-io/contextURL"
},
"spec": {
"initializer": {
"specs": [
{
"git": {
"remoteUri": "https://github.com/gitpod-io/contextURL.git",
"upstreamRemoteUri": "",
"targetMode": "CLONE_TARGET_MODE_UNSPECIFIED",
"cloneTaget": "",
"checkoutLocation": "contextUrl",
"config": {
"customConfig": {},
"authentication": "AUTH_METHOD_UNSPECIFIED",
"authUser": "",
"authPassword": "",
"authOts": ""
}
}
}
]
},
"type": "WORKSPACE_TYPE_REGULAR",
"ports": [
{
"port": "8080",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "https://8080-balabala-ws-id.ws-us106.gitpod.io",
"protocol": "PROTOCOL_HTTP"
},
{
"port": "3306",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "https://3306-balabala-ws-id.ws-us106.gitpod.io",
"protocol": "PROTOCOL_HTTP"
}
],
"environmentVariables": [],
"git": {
"username": "",
"email": ""
},
"timeout": {
"disconnected": "1800s"
},
"admission": "ADMISSION_LEVEL_EVERYONE",
"class": "g1-standard",
"sshPublicKeys": [],
"subassemblyReferences": [],
"logUrl": "",
"editor": {
"name": "code",
"version": "stable"
}
},
"status": {
"statusVersion": "1701586489",
"phase": {
"name": "PHASE_STOPPED",
"lastTransitionTime": "2023-12-03T06:54:49.619Z"
},
"workspaceUrl": "https://balabala-ws-id.ws-us106.gitpod.io",
"conditions": {
"failed": "",
"failedReason": "FAILED_REASON_UNSPECIFIED",
"timeout": ""
},
"gitStatus": {
"cloneUrl": "https://github.com/gitpod-io/contextURL.git",
"branch": "master",
"latestCommit": "revision",
"uncommitedFiles": [],
"totalUncommitedFiles": 0,
"untrackedFiles": [],
"totalUntrackedFiles": 0,
"unpushedCommits": [],
"totalUnpushedCommits": 0
},
"instanceId": "instanceId"
}
},
"err": ""
}
149 changes: 149 additions & 0 deletions components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
{
"organizationId": "organizationId",
"ownerId": "ownerId",
"contextURL": "https://github.com/gitpod-io/contextURL",
"description": "description",
"context": {
"isFile": false,
"path": "",
"title": "contextTitle",
"ref": "master",
"refType": "branch",
"revision": "revision",
"repository": {
"cloneUrl": "https://github.com/gitpod-io/contextURL.git",
"host": "github.com",
"name": "contextURL",
"owner": "gitpod-io",
"private": true
},
"normalizedContextURL": "https://github.com/gitpod-io/contextURL",
"checkoutLocation": "contextUrl"
},
"cloneUrl": "https://github.com/gitpod-io/contextURL.git",
"config": {
"image": "mach4/gitpod-wordpress:delta",
"ports": [
{
"port": 8080,
"onOpen": "notify"
},
{
"port": 3306,
"onOpen": "ignore"
}
],
"vscode": {
"extensions": [
"felixfbecker.php-debug",
"felixfbecker.php-intellisense",
"aaron-bond.better-comments"
]
},
"_origin": "repo",
"_featureFlags": [],
"ideCredentials": "ideCredentials"
},
"imageSource": {
"baseImageResolved": "mach4/gitpod-wordpress:delta"
},
"imageNameResolved": "eu.gcr.io/gitpod-dev/workspace-images:e4ac1036c2a8779f05f6707d3d716d7759f0d9d199d4810b9fd2abffdae92355",
"baseImageNameResolved": "docker.io/mach4/gitpod-wordpress@sha256:995aff430a51e6183874bc76c46bfc662c711a8cd21be1f0797e6296fc05231d",
"shareable": true,
"type": "regular",
"softDeleted": null,
"deleted": false,
"pinned": true,
"workspaceId": "balabala-wd-id",
"region": "us106",
"startedTime": "2023-12-03T04:20:04.988Z",
"stoppingTime": "2023-12-03T06:52:09.819Z",
"stoppedTime": "2023-12-03T06:54:49.619Z",
"ideUrl": "https://balabala-ws-id.ws-us106.gitpod.io",
"workspaceImage": "eu.gcr.io/gitpod-dev/workspace-images:e4ac1036c2a8779f05f6707d3d716d7759f0d9d199d4810b9fd2abffdae92355",
"status": {
"phase": "stopped",
"nodeIp": "10.10.0.158",
"message": "",
"podName": "ws-d839da0f-8f67-456c-81fc-3b590b547aba",
"timeout": "30m0s",
"version": 43227381,
"nodeName": "workspace-ws-us106-pool-8rc7",
"conditions": {
"failed": "",
"timeout": "",
"deployed": true,
"pullingImages": false,
"stoppedByRequest": true,
"firstUserActivity": "2023-12-03T04:20:06.000Z",
"headlessTaskFailed": ""
},
"ownerToken": "ownerToken",
"exposedPorts": [
{
"url": "https://8080-balabala-ws-id.ws-us106.gitpod.io",
"port": 8080,
"protocol": "http",
"visibility": "private"
},
{
"url": "https://3306-balabala-ws-id.ws-us106.gitpod.io",
"port": 3306,
"protocol": "http",
"visibility": "private"
}
]
},
"gitStatus": {
"branch": "master",
"latestCommit": "1eb84119dedc91c54b28c538332d5deec76f4415",
"untrackedFiles": [
".vscode/settings.json"
],
"uncommitedFiles": [
".htaccess"
],
"totalUntrackedFiles": 79,
"totalUncommitedFiles": 2
},
"phasePersisted": "stopped",
"configuration": {
"ideImage": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-3bb09152fc5248f5b99b33b4d8a7f101aa082441",
"ideImageLayers": [
"eu.gcr.io/gitpod-core-dev/build/ide/gitpod-code-web:commit-49bb715b599dce2356dd02a6ede7ae8cf10d8d12",
"eu.gcr.io/gitpod-core-dev/build/ide/code-codehelper:commit-a96456ae29513e367719ff1c720adb2c59a0bd49"
],
"supervisorImage": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-be35ce16a80342b0e57d85d486544e9608044d9a",
"ideConfig": {
"useLatest": false,
"ide": "code"
},
"ideSetup": {
"envvars": [
{
"name": "GITPOD_CONFIGCAT_ENABLED",
"value": "true"
},
{
"name": "GITPOD_IDE_ALIAS",
"value": "code"
}
],
"tasks": []
},
"regionPreference": "north-america",
"fromBackup": true,
"featureFlags": [
"registry_facade",
"workspace_connection_limiting",
"workspace_class_limiting"
]
},
"imageBuildInfo": null,
"workspaceClass": "g1-standard",
"usageAttributionId": "team:usageAttributionId",
"instanceId": "instanceId",
"workspaceCreationTime": "2022-08-21T15:26:33.843Z",
"instanceCreationTime": "2023-12-03T04:18:51.343Z",
"phase": "stopped"
}
105 changes: 105 additions & 0 deletions components/public-api/typescript-common/fixtures/toWorkspace3_adminPage_2.golden
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"result": {
"id": "longlong-650a-413a-b5ed-aaaaa",
"metadata": {
"ownerId": "ownerId",
"organizationId": "organizationId",
"configurationId": "",
"annotations": {},
"name": "empty",
"pinned": true,
"originalContextUrl": "https://github.com/gitpod-io/empty"
},
"spec": {
"initializer": {
"specs": [
{
"git": {
"remoteUri": "https://github.com/gitpod-io/empty.git",
"upstreamRemoteUri": "",
"targetMode": "CLONE_TARGET_MODE_UNSPECIFIED",
"cloneTaget": "",
"checkoutLocation": "",
"config": {
"customConfig": {},
"authentication": "AUTH_METHOD_UNSPECIFIED",
"authUser": "",
"authPassword": "",
"authOts": ""
}
}
}
]
},
"type": "WORKSPACE_TYPE_REGULAR",
"ports": [
{
"port": "8080",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "",
"protocol": "PROTOCOL_HTTP"
},
{
"port": "8081",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "",
"protocol": "PROTOCOL_HTTP"
},
{
"port": "8082",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "",
"protocol": "PROTOCOL_HTTP"
},
{
"port": "8083",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "",
"protocol": "PROTOCOL_HTTP"
},
{
"port": "3306",
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"url": "",
"protocol": "PROTOCOL_HTTP"
}
],
"environmentVariables": [],
"git": {
"username": "",
"email": ""
},
"admission": "ADMISSION_LEVEL_OWNER_ONLY",
"class": "",
"sshPublicKeys": [],
"subassemblyReferences": [],
"logUrl": ""
},
"status": {
"statusVersion": "1576178411",
"phase": {
"name": "PHASE_STOPPED",
"lastTransitionTime": "2019-12-12T19:20:11.821Z"
},
"workspaceUrl": "https://longlong-650a-413a-b5ed-aaaaa.ws-us02.gitpod.io",
"conditions": {
"failed": "",
"failedReason": "FAILED_REASON_UNSPECIFIED",
"timeout": "workspace timed out after period of inactivity took longer than 00h30m"
},
"gitStatus": {
"cloneUrl": "https://github.com/gitpod-io/empty.git",
"branch": "master",
"latestCommit": "revision",
"uncommitedFiles": [],
"totalUncommitedFiles": 0,
"untrackedFiles": [],
"totalUntrackedFiles": 0,
"unpushedCommits": [],
"totalUnpushedCommits": 0
},
"instanceId": "instanceId"
}
},
"err": ""
}
Loading

0 comments on commit 17397ad

Please sign in to comment.