Revert "[bridge] Fix wrong mapping of WorkspaceStatus to prebuild when "snapshot" is missing"

components/ws-manager-bridge/BUILD.yaml

@@ -4,7 +4,6 @@ packages:
     srcs:
       - "**/*.ts"
       - package.json
-      - mocha.opts
     deps:
       - components/content-service-api/typescript:lib
       - components/gitpod-db:lib
@@ -17,8 +16,7 @@ packages:
       packaging: offline-mirror
       yarnLock: ${coreYarnLockBase}/yarn.lock
       tsconfig: tsconfig.json
-      commands:
-        test: ["yarn", "test"]
+      dontTest: true
   - name: docker
     type: docker
     deps:

components/ws-manager-bridge/ee/src/bridge.ts

@@ -5,19 +5,15 @@
  */
 
 import { WorkspaceManagerBridge } from "../../src/bridge";
-import { inject, injectable } from "inversify";
+import { injectable } from "inversify";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
 import { WorkspaceStatus, WorkspaceType, WorkspacePhase } from "@gitpod/ws-manager/lib";
-import { HeadlessWorkspaceEvent } from "@gitpod/gitpod-protocol/lib/headless-workspace-log";
+import { HeadlessWorkspaceEvent, HeadlessWorkspaceEventType } from "@gitpod/gitpod-protocol/lib/headless-workspace-log";
 import { WorkspaceInstance } from "@gitpod/gitpod-protocol";
 import { log, LogContext } from "@gitpod/gitpod-protocol/lib/util/logging";
-import { PrebuildStateMapper } from "../../src/prebuild-state-mapper";
 
 @injectable()
 export class WorkspaceManagerBridgeEE extends WorkspaceManagerBridge {
-    @inject(PrebuildStateMapper)
-    protected readonly prebuildStateMapper: PrebuildStateMapper;
-
     protected async cleanupProbeWorkspace(ctx: TraceContext, status: WorkspaceStatus.AsObject | undefined) {
         if (!status) {
             return;
@@ -79,31 +75,65 @@ export class WorkspaceManagerBridgeEE extends WorkspaceManagerBridge {
             }
             prebuild.statusVersion = status.statusVersion;
 
-            const update = this.prebuildStateMapper.mapWorkspaceStatusToPrebuild(status);
-            if (update) {
-                const updatedPrebuild = {
-                    ...prebuild,
-                    ...update,
-                };
+            if (prebuild.state === "queued") {
+                // We've received an update from ws-man for this workspace, hence it must be running.
+                prebuild.state = "building";
+
+                if (writeToDB) {
+                    await this.workspaceDB.trace({ span }).storePrebuiltWorkspace(prebuild);
+                }
+                await this.messagebus.notifyHeadlessUpdate({ span }, userId, workspaceId, <HeadlessWorkspaceEvent>{
+                    type: HeadlessWorkspaceEventType.Started,
+                    workspaceID: workspaceId,
+                });
+            }
+
+            if (status.phase === WorkspacePhase.STOPPING) {
+                let headlessUpdateType: HeadlessWorkspaceEventType = HeadlessWorkspaceEventType.Aborted;
+                if (!!status.conditions!.timeout) {
+                    prebuild.state = "timeout";
+                    prebuild.error = status.conditions!.timeout;
+                    headlessUpdateType = HeadlessWorkspaceEventType.AbortedTimedOut;
+                } else if (!!status.conditions!.failed) {
+                    prebuild.state = "failed";
+                    prebuild.error = status.conditions!.failed;
+                    headlessUpdateType = HeadlessWorkspaceEventType.Failed;
+                } else if (!!status.conditions!.stoppedByRequest) {
+                    prebuild.state = "aborted";
+                    prebuild.error = "Cancelled";
+                    headlessUpdateType = HeadlessWorkspaceEventType.Aborted;
+                } else if (!!status.conditions!.headlessTaskFailed) {
+                    prebuild.state = "available";
+                    if (status.conditions!.headlessTaskFailed) prebuild.error = status.conditions!.headlessTaskFailed;
+                    prebuild.snapshot = status.conditions!.snapshot;
+                    headlessUpdateType = HeadlessWorkspaceEventType.FinishedButFailed;
+                } else if (!!status.conditions!.snapshot) {
+                    prebuild.state = "available";
+                    prebuild.snapshot = status.conditions!.snapshot;
+                    headlessUpdateType = HeadlessWorkspaceEventType.FinishedSuccessfully;
+                } else {
+                    // stopping event with no clear outcome (i.e. no snapshot yet)
+                    return;
+                }
 
-                span.setTag("updatePrebuildWorkspace.prebuild.state", updatedPrebuild.state);
-                span.setTag("updatePrebuildWorkspace.prebuild.error", updatedPrebuild.error);
+                span.setTag("updatePrebuildWorkspace.prebuild.state", prebuild.state);
+                span.setTag("updatePrebuildWorkspace.prebuild.error", prebuild.error);
 
                 if (writeToDB) {
-                    await this.workspaceDB.trace({ span }).storePrebuiltWorkspace(updatedPrebuild);
+                    await this.workspaceDB.trace({ span }).storePrebuiltWorkspace(prebuild);
                 }
 
                 // notify updates
                 // headless update
                 await this.messagebus.notifyHeadlessUpdate({ span }, userId, workspaceId, <HeadlessWorkspaceEvent>{
-                    type: update.type,
+                    type: headlessUpdateType,
                     workspaceID: workspaceId,
                 });
 
                 // prebuild info
-                const info = (await this.workspaceDB.trace({ span }).findPrebuildInfos([updatedPrebuild.id]))[0];
+                const info = (await this.workspaceDB.trace({ span }).findPrebuildInfos([prebuild.id]))[0];
                 if (info) {
-                    this.messagebus.notifyOnPrebuildUpdate({ info, status: updatedPrebuild.state });
+                    this.messagebus.notifyOnPrebuildUpdate({ info, status: prebuild.state });
                 }
             }
         } catch (e) {

components/ws-manager-bridge/package.json

@@ -6,7 +6,6 @@
   "scripts": {
     "start": "node ./dist/src/index.js",
     "start-ee": "node ./dist/ee/src/index.js",
-    "test": "mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
     "prepare": "yarn clean && yarn build",
     "build": "npx tsc",
     "build:clean": "yarn clean && yarn build",
@@ -37,15 +36,8 @@
   },
   "devDependencies": {
     "@types/amqplib": "^0.8.2",
-    "@types/chai": "^4.2.21",
     "@types/express": "^4.17.13",
     "@types/google-protobuf": "^3.7.4",
-    "@types/mocha": "^2.2.45",
-    "chai": "^4.3.4",
-    "expect": "^1.20.2",
-    "mocha": "^5.0.0",
-    "mocha-typescript": "^1.1.11",
-    "ts-node": "<7.0.0",
     "tslint": "^5.9.1",
     "typescript": "~4.4.2",
     "watch": "^1.0.2"

components/ws-manager-bridge/src/container-module.ts

@@ -33,7 +33,6 @@ import { MetaInstanceController } from "./meta-instance-controller";
 import { IClientCallMetrics } from "@gitpod/content-service/lib/client-call-metrics";
 import { PrometheusClientCallMetrics } from "@gitpod/gitpod-protocol/lib/messaging/client-call-metrics";
 import { PreparingUpdateEmulator, PreparingUpdateEmulatorFactory } from "./preparing-update-emulator";
-import { PrebuildStateMapper } from "./prebuild-state-mapper";
 
 export const containerModule = new ContainerModule((bind) => {
     bind(MessagebusConfiguration).toSelf().inSingletonScope();
@@ -81,6 +80,4 @@ export const containerModule = new ContainerModule((bind) => {
 
     bind(PreparingUpdateEmulator).toSelf().inRequestScope();
     bind(PreparingUpdateEmulatorFactory).toAutoFactory(PreparingUpdateEmulator);
-
-    bind(PrebuildStateMapper).toSelf().inSingletonScope();
 });