WIP

components/dashboard/src/projects/Project.tsx

@@ -35,7 +35,26 @@ export default function () {
             const project = projects.find(p => p.name === projectName);
             if (project) {
                 setProject(project);
-                setPrebuilds(await getGitpodService().server.getPrebuilds(team.id, project.id));
+                // setPrebuilds(await getGitpodService().server.getPrebuilds(team.id, project.id));
+                setPrebuilds([{
+                    id: "123",
+                    branch: "feature-branch",
+                    cloneUrl: "http://github.com/cool-test-org/foo",
+                    startedAt: "2021-06-21T08:45:16.807Z",
+                    startedBy: "AlexTugarev",
+                    project: "lama",
+                    status: "available",
+                    teamId: "ACME"
+                }, {
+                    id: "123",
+                    branch: "feature-branch",
+                    cloneUrl: "http://github.com/cool-test-org/foo",
+                    startedAt: "2021-06-20T08:45:16.807Z",
+                    startedBy: "AlexTugarev",
+                    project: "lama",
+                    status: "available",
+                    teamId: "ACME"
+                }])
             }
         })();
     }, [team]);

components/dashboard/src/projects/Projects.tsx

@@ -29,6 +29,18 @@ export default function () {
         }
         (async () => {
             const infos = await getGitpodService().server.getProjects(team.id);
+            for (const dummy of infos) {
+                dummy.lastPrebuild = {
+                    id: "123",
+                    branch: "feature-branch",
+                    cloneUrl: "http://github.com/cool-test-org/foo",
+                    startedAt: "2021-06-20T08:45:16.807Z",
+                    startedBy: "AlexTugarev",
+                    project: "lama",
+                    status: "available",
+                    teamId: "ACME"
+                }
+            }
             setProjects(infos);
         })();
     }, [team]);

components/ee/payment-endpoint/package.json

@@ -6,7 +6,7 @@
   "docker_name": "eu.gcr.io/gitpod-dev/gitpod-payment-endpoint",
   "dependencies": {
     "@octokit/rest": "18.5.6",
-    "@octokit/webhooks": "^7.15.0",
+    "@octokit/webhooks": "7.21.0",
     "@gitpod/gitpod-db": "0.1.5",
     "@gitpod/gitpod-protocol": "0.1.5",
     "body-parser": "^1.18.2",

components/gitpod-db/src/project-db.ts

@@ -9,5 +9,6 @@ import { Project } from "@gitpod/gitpod-protocol";
 export const ProjectDB = Symbol('ProjectDB');
 export interface ProjectDB {
     findProjectsByTeam(teamId: string): Promise<Project[]>;
+    findProjectByInstallationId(installationId: string): Promise<Project | undefined>;
     createProject(name: string, cloneUrl: string, teamId: string, appInstallationId: string): Promise<Project>;
 }

components/gitpod-db/src/typeorm/entity/db-workspace.ts

@@ -24,9 +24,21 @@ export class DBWorkspace implements Workspace {
     @Index()
     ownerId: string;
 
+    @Column({
+        default: '',
+        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
+    })
+    projectId?: string;
+
     @Column("text")
     contextURL: string;
 
+    @Column({
+        default: '',
+        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
+    })
+    branch?: string;
+
     @Column()
     description: string;
 

components/gitpod-db/src/typeorm/migration/1624962141719-AddProjectIdToWorkspace.ts

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+ import {MigrationInterface, QueryRunner} from "typeorm";
+ import { tableExists, columnExists } from "./helper/helper";
+
+export class AddProjectIdToWorkspace1624962141719 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        if (await tableExists(queryRunner, "d_b_workspace")) {
+            if (!(await columnExists(queryRunner, "d_b_workspace", "projectId"))) {
+                await queryRunner.query("ALTER TABLE d_b_workspace ADD COLUMN `projectId` char(36) DEFAULT NULL, ADD COLUMN `branch` varchar(255) DEFAULT NULL");
+            }
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+    }
+
+}

components/gitpod-db/src/typeorm/project-db-impl.ts

@@ -43,4 +43,10 @@ export class ProjectDBImpl implements ProjectDB {
         await repo.save(project);
         return project;
     }
+
+    async findProjectByInstallationId(appInstallationId: string): Promise<Project | undefined> {
+        const repo = await this.getRepo();
+        const project = await repo.findOne({ appInstallationId });
+        return project;
+    }
 }

components/gitpod-db/src/typeorm/workspace-db-impl.ts

@@ -6,7 +6,7 @@
 
 import { injectable, inject } from "inversify";
 import { Repository, EntityManager, DeepPartial, UpdateQueryBuilder } from "typeorm";
-import { AbstractWorkspaceDB, MaybeWorkspace, MaybeWorkspaceInstance, WorkspaceDB, FindWorkspacesOptions, PrebuiltUpdatableAndWorkspace, WorkspaceInstanceSessionWithWorkspace, PrebuildWithWorkspace, WorkspaceAndOwner, WorkspacePortsAuthData, WorkspaceOwnerAndSoftDeleted } from "../workspace-db";
+import { MaybeWorkspace, MaybeWorkspaceInstance, WorkspaceDB, FindWorkspacesOptions, PrebuiltUpdatableAndWorkspace, WorkspaceInstanceSessionWithWorkspace, PrebuildWithWorkspace, WorkspaceAndOwner, WorkspacePortsAuthData, WorkspaceOwnerAndSoftDeleted } from "../workspace-db";
 import { Workspace, WorkspaceInstance, WorkspaceInfo, WorkspaceInstanceUser, WhitelistedRepository, Snapshot, LayoutData, PrebuiltWorkspace, RunningWorkspaceInfo, PrebuiltWorkspaceUpdatable, WorkspaceAndInstance, WorkspaceType } from "@gitpod/gitpod-protocol";
 import { TypeORM } from "./typeorm";
 import { DBWorkspace } from "./entity/db-workspace";
@@ -27,12 +27,10 @@ interface OrderBy {
 }
 
 @injectable()
-export abstract class AbstractTypeORMWorkspaceDBImpl extends AbstractWorkspaceDB {
+export abstract class AbstractTypeORMWorkspaceDBImpl implements WorkspaceDB {
 
     protected abstract getManager(): Promise<EntityManager>;
 
-    abstract transaction<T>(code: (db: WorkspaceDB) => Promise<T>): Promise<T>;
-
     protected async getWorkspaceRepo(): Promise<Repository<DBWorkspace>> {
         return await (await this.getManager()).getRepository<DBWorkspace>(DBWorkspace);
     }
@@ -80,6 +78,23 @@ export abstract class AbstractTypeORMWorkspaceDBImpl extends AbstractWorkspaceDB
         throw new Error("Could not establish connection to database!");
     }
 
+    public async transaction<T>(code: (db: WorkspaceDB) => Promise<T>): Promise<T> {
+        return code(this);
+    }
+
+    async storeInstance(instance: WorkspaceInstance): Promise<WorkspaceInstance> {
+        const inst = await this.internalStoreInstance(instance);
+        return inst;
+    }
+
+    public async findRunningInstance(workspaceId: string): Promise<MaybeWorkspaceInstance> {
+        const instance = await this.findCurrentInstance(workspaceId)
+        if (instance && instance.status.phase !== 'stopped') {
+            return instance;
+        }
+        return undefined;
+    }
+
     public async store(workspace: Workspace) {
         const workspaceRepo = await this.getWorkspaceRepo();
         const dbWorkspace = workspace as DBWorkspace;
@@ -798,6 +813,18 @@ export abstract class AbstractTypeORMWorkspaceDBImpl extends AbstractWorkspaceDB
         return <WorkspaceAndInstance>(res);
     }
 
+    async findPrebuiltWorkspacesByProject(projectId: string): Promise<PrebuiltWorkspace[]> {
+        const repo = await this.getPrebuiltWorkspaceRepo();
+
+        let query = await repo.createQueryBuilder('pws');
+        query = query.orderBy('pws.creationTime', 'ASC');
+        query = query.innerJoinAndMapOne('pws.workspace', DBWorkspace, 'ws', 'pws.buildWorkspaceId = ws.id');
+        query = query.andWhere('ws.projectId = :projectId', { projectId })
+
+        const res = await query.getMany();
+        return res;
+    }
+
 }
 
 @injectable()

components/gitpod-db/src/workspace-db.ts

@@ -5,7 +5,6 @@
  */
 
 import { DeepPartial } from 'typeorm';
-import { injectable } from 'inversify';
 
 import { Workspace, WorkspaceInfo, WorkspaceInstance, WorkspaceInstanceUser, WhitelistedRepository, Snapshot, LayoutData, PrebuiltWorkspace, PrebuiltWorkspaceUpdatable, RunningWorkspaceInfo, WorkspaceAndInstance, WorkspaceType } from '@gitpod/gitpod-protocol';
 
@@ -112,80 +111,6 @@ export interface WorkspaceDB {
     storeLayoutData(layoutData: LayoutData): Promise<LayoutData>;
 
     hardDeleteWorkspace(workspaceID: string): Promise<void>;
-}
 
-@injectable()
-export abstract class AbstractWorkspaceDB implements WorkspaceDB {
-    abstract connect(maxTries: number, timeout: number): Promise<void>;
-
-    abstract store(workspace: Workspace): Promise<Workspace>;
-    abstract updatePartial(workspaceId: string, partial: DeepPartial<Workspace>): Promise<void>;
-    abstract findById(id: string): Promise<MaybeWorkspace>;
-    abstract findByInstanceId(id: string): Promise<MaybeWorkspace>;
-    abstract find(options: FindWorkspacesOptions): Promise<WorkspaceInfo[]>;
-    abstract findWorkspacePortsAuthDataById(workspaceId: string): Promise<WorkspacePortsAuthData | undefined>;
-
-    abstract findInstanceById(workspaceInstanceId: string): Promise<MaybeWorkspaceInstance>;
-    abstract findInstances(workspaceId: string): Promise<WorkspaceInstance[]>;
-    abstract findWorkspacesByUser(userId: string): Promise<Workspace[]>;
-    abstract internalStoreInstance(instance: WorkspaceInstance): Promise<WorkspaceInstance>;
-    abstract findRegularRunningInstances(userId?: string): Promise<WorkspaceInstance[]>;
-    abstract findRunningInstancesWithWorkspaces(installation?: string, userId?: string): Promise<RunningWorkspaceInfo[]>;
-    abstract findSessionsInPeriod(userId: string, periodStart: string, periodEnd: string): Promise<WorkspaceInstanceSessionWithWorkspace[]>;
-    abstract findWorkspacesForGarbageCollection(minAgeInDays: number, limit: number): Promise<WorkspaceAndOwner[]>;
-    abstract findWorkspacesForContentDeletion(minSoftDeletedTimeInDays: number, limit: number): Promise<WorkspaceOwnerAndSoftDeleted[]>;
-    abstract findPrebuiltWorkspacesForGC(daysUnused: number, limit: number): Promise<WorkspaceAndOwner[]>
-    abstract findAllWorkspaceAndInstances(offset: number, limit: number, orderBy: keyof WorkspaceAndInstance, orderDir: "ASC" | "DESC", ownerId?: string, searchTerm?: string): Promise<{ total: number, rows: WorkspaceAndInstance[] }>;
-    abstract findWorkspaceAndInstance(id: string): Promise<WorkspaceAndInstance | undefined>;
-    abstract findAllWorkspaces(offset: number, limit: number, orderBy: keyof Workspace, orderDir: "ASC" | "DESC", ownerId?: string, searchTerm?: string, minCreationTime?: Date, maxCreationDateTime?: Date, type?: WorkspaceType): Promise<{ total: number, rows: Workspace[] }>;
-    abstract findAllWorkspaceInstances(offset: number, limit: number, orderBy: keyof WorkspaceInstance, orderDir: "ASC" | "DESC", ownerId?: string, minCreationTime?: Date, maxCreationTime?: Date, onlyRunning?: boolean, type?: WorkspaceType): Promise<{ total: number, rows: WorkspaceInstance[] }>;
-
-    public async transaction<T>(code: (db: WorkspaceDB) => Promise<T>): Promise<T> {
-        return code(this);
-    }
-
-    async storeInstance(instance: WorkspaceInstance): Promise<WorkspaceInstance> {
-        const inst = await this.internalStoreInstance(instance);
-        return inst;
-    }
-
-    abstract updateLastHeartbeat(instanceId: string, userId: string, newHeartbeat: Date, wasClosed?: boolean): Promise<void>;
-    abstract getLastOwnerHeartbeatFor(instance: WorkspaceInstance): Promise<{ lastSeen: Date, wasClosed?: boolean} | undefined>;
-    abstract getWorkspaceUsers(workspaceId: string, minLastSeen: number): Promise<WorkspaceInstanceUser[]>;
-    abstract updateInstancePartial(instanceId: string, partial: DeepPartial<WorkspaceInstance>): Promise<WorkspaceInstance>;
-
-    abstract findCurrentInstance(workspaceId: string): Promise<MaybeWorkspaceInstance>;
-
-    public async findRunningInstance(workspaceId: string): Promise<MaybeWorkspaceInstance> {
-        const instance = await this.findCurrentInstance(workspaceId)
-        if (instance && instance.status.phase !== 'stopped') {
-            return instance;
-        }
-        return undefined;
-    }
-
-    abstract isWhitelisted(repositoryUrl : string): Promise<boolean>;
-    abstract getFeaturedRepositories(): Promise<Partial<WhitelistedRepository>[]>;
-
-    abstract findSnapshotById(snapshotId: string): Promise<Snapshot | undefined>;
-    abstract findSnapshotsByWorkspaceId(workspaceId: string): Promise<Snapshot[]>;
-    abstract storeSnapshot(snapshot: Snapshot): Promise<Snapshot>;
-
-    abstract getTotalPrebuildUseSeconds(forDays: number): Promise<number | undefined>;
-    abstract storePrebuiltWorkspace(pws: PrebuiltWorkspace): Promise<PrebuiltWorkspace>;
-    abstract findPrebuiltWorkspaceByCommit(cloneURL: string, commit: string): Promise<PrebuiltWorkspace | undefined>;
-    abstract findPrebuildsWithWorkpace(cloneURL: string): Promise<PrebuildWithWorkspace[]>;
-    abstract findPrebuildByWorkspaceID(wsid: string): Promise<PrebuiltWorkspace | undefined>;
-    abstract findPrebuildByID(pwsid: string): Promise<PrebuiltWorkspace | undefined>;
-    abstract countRunningPrebuilds(cloneURL: string): Promise<number>;
-    abstract findQueuedPrebuilds(cloneURL?: string): Promise<PrebuildWithWorkspace[]>;
-    abstract attachUpdatableToPrebuild(pwsid: string, update: PrebuiltWorkspaceUpdatable): Promise<void>;
-    abstract findUpdatablesForPrebuild(pwsid: string): Promise<PrebuiltWorkspaceUpdatable[]>;
-    abstract markUpdatableResolved(updatableId: string): Promise<void>;
-    abstract getUnresolvedUpdatables(): Promise<PrebuiltUpdatableAndWorkspace[]>;
-
-    abstract findLayoutDataByWorkspaceId(workspaceId: string): Promise<LayoutData | undefined>;
-    abstract storeLayoutData(layoutData: LayoutData): Promise<LayoutData>;
-
-    abstract hardDeleteWorkspace(workspaceID: string): Promise<void>;
-}
+    findPrebuiltWorkspacesByProject(projectId: string): Promise<PrebuiltWorkspace[]>;
+}

components/gitpod-protocol/src/gitpod-service.ts

@@ -285,6 +285,8 @@ export namespace GitpodServer {
     }
     export interface CreateWorkspaceOptions {
         contextUrl: string;
+        branch?: string;
+        projectId?: string;
         mode?: CreateWorkspaceMode;
     }
     export interface StartWorkspaceOptions {

components/gitpod-protocol/src/protocol.ts

@@ -392,11 +392,14 @@ export interface Workspace {
     id: string;
     creationTime: string;
     contextURL: string;
+    branch?: string;
     description: string;
     ownerId: string;
     context: WorkspaceContext;
     config: WorkspaceConfig;
 
+    projectId?: string;
+
     /**
      * The source where to get the workspace base image from. This source is resolved
      * during workspace creation. Once a base image has been built the information in here
@@ -631,6 +634,7 @@ export type PrebuiltWorkspaceState
 export interface PrebuiltWorkspace {
     id: string;
     cloneURL: string;
+    branch?: string;
     commit: string;
     buildWorkspaceId: string;
     creationTime: string;
@@ -765,6 +769,8 @@ export namespace ExternalImageConfigFile {
 export interface WorkspaceContext {
     title: string;
     normalizedContextURL?: string;
+    branch?: string;
+    projectId?: string;
     forceCreateNewWorkspace?: boolean;
     forceImageBuild?: boolean;
 }
@@ -814,6 +820,7 @@ export namespace SnapshotContext {
 
 export interface StartPrebuildContext extends WorkspaceContext {
     actual: WorkspaceContext;
+    branch?: string;
     commitHistory?: string[];
 }
 

components/server/ee/src/prebuilds/bitbucket-app.ts

@@ -91,7 +91,7 @@ export class BitbucketApp {
             }
 
             console.log('Starting prebuild.', { contextURL })
-            const ws = await this.prebuildManager.startPrebuild({ span }, user, contextURL, data.gitCloneUrl, data.commitHash);
+            const ws = await this.prebuildManager.startPrebuild({ span }, { user }, contextURL, data.gitCloneUrl, data.commitHash);
             return ws;
         } finally {
             span.finish();