[db/server] Link workspaces and projects

Co-authored-by: Jan Keromnes <[email protected]>

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

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

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

@@ -27,6 +27,12 @@ export class DBWorkspace implements Workspace {
     @Column("text")
     contextURL: string;
 
+    @Column({
+        default: '',
+        transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED
+    })
+    projectId?: string;
+
     @Column()
     description: string;
 

components/gitpod-db/src/typeorm/migration/1626422169862-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 { columnExists, tableExists } from "./helper/helper";
+
+export class AddProjectIdToWorkspace1626422169862 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)");
+            }
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+    }
+
+}

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

@@ -24,29 +24,36 @@ export class ProjectDBImpl implements ProjectDB {
         return (await this.getEntityManager()).getRepository<DBProject>(DBProject);
     }
 
+    async findProjectByCloneUrl(cloneUrl: string): Promise<Project | undefined> {
+        const repo = await this.getRepo();
+        return repo.findOne({ cloneUrl: cloneUrl.toLowerCase() });
+    }
+
+    async findProjectByInstallationId(appInstallationId: string): Promise<Project | undefined> {
+        const repo = await this.getRepo();
+        return repo.findOne({ appInstallationId });
+    }
+
     public async findProjectsByTeam(teamId: string): Promise<Project[]> {
         const repo = await this.getRepo();
         return repo.find({ teamId });
     }
 
     public async createProject(name: string, cloneUrl: string, teamId: string, appInstallationId: string): Promise<Project> {
         const repo = await this.getRepo();
+        if (repo.findOne({ cloneUrl: cloneUrl.toLowerCase() })) {
+            throw new Error('A project with the same clone URL already exists');
+        }
 
         const project: Project = {
             id: uuidv4(),
             name,
             teamId,
-            cloneUrl,
+            cloneUrl: cloneUrl.toLowerCase(),
             appInstallationId,
             creationTime: new Date().toISOString(),
         }
         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-protocol/src/protocol.ts

@@ -394,6 +394,7 @@ export interface Workspace {
     contextURL: string;
     description: string;
     ownerId: string;
+    projectId?: string;
     context: WorkspaceContext;
     config: WorkspaceConfig;
 

components/server/ee/src/workspace/workspace-factory.ts

@@ -166,6 +166,7 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
                 type: "regular",
                 creationTime: new Date().toISOString(),
                 contextURL: normalizedContextURL,
+                projectId: context.prebuiltWorkspace.projectId,
                 description: this.getDescription(context),
                 ownerId: user.id,
                 context: <WorkspaceContext & WithSnapshot & WithPrebuild>{

components/server/src/workspace/workspace-factory.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { DBWithTracing, TracedWorkspaceDB, WorkspaceDB } from '@gitpod/gitpod-db/lib';
+import { DBWithTracing, TracedWorkspaceDB, WorkspaceDB, ProjectDB } from '@gitpod/gitpod-db/lib';
 import { CommitContext, IssueContext, PullRequestContext, Repository, SnapshotContext, User, Workspace, WorkspaceConfig, WorkspaceContext, WorkspaceProbeContext } from '@gitpod/gitpod-protocol';
 import { ErrorCodes } from '@gitpod/gitpod-protocol/lib/messaging/error';
 import { generateWorkspaceID } from '@gitpod/gitpod-protocol/lib/util/generate-workspace-id';
@@ -19,6 +19,7 @@ import { ImageSourceProvider } from './image-source-provider';
 export class WorkspaceFactory {
 
     @inject(TracedWorkspaceDB) protected readonly db: DBWithTracing<WorkspaceDB>;
+    @inject(ProjectDB) protected readonly projectDB: ProjectDB;
     @inject(ConfigProvider) protected configProvider: ConfigProvider;
     @inject(ImageSourceProvider) protected imageSourceProvider: ImageSourceProvider;
 
@@ -135,7 +136,10 @@ export class WorkspaceFactory {
         const span = TraceContext.startSpan("createForCommit", ctx);
 
         try {
-            const config = await this.configProvider.fetchConfig({span}, user, context);
+            const [ config, project ] = await Promise.all([
+                this.configProvider.fetchConfig({ span }, user, context),
+                this.projectDB.findProjectByCloneUrl(context.repository.cloneUrl),
+            ]);
             const imageSource = await this.imageSourceProvider.getImageSource(ctx, user, context, config);
 
             const id = await generateWorkspaceID();
@@ -144,6 +148,7 @@ export class WorkspaceFactory {
                 type: "regular",
                 creationTime: new Date().toISOString(),
                 contextURL: normalizedContextURL,
+                projectId: project?.id,
                 description: this.getDescription(context),
                 ownerId: user.id,
                 context,