[projects/prebuilds] get rid of findProjectByInstallationId

gitpod-io · Aug 5, 2021 · 8448f30 · 8448f30
1 parent d4c5800
commit 8448f30
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/components/gitpod-db/src/project-db.ts b/components/gitpod-db/src/project-db.ts
@@ -12,7 +12,6 @@ export interface ProjectDB {
     findProjectByCloneUrl(cloneUrl: string): Promise<Project | undefined>;
     findProjectsByCloneUrls(cloneUrls: string[]): Promise<Project[]>;
     findProjectByTeamAndName(teamId: string, projectName: string): Promise<Project | undefined>;
-    findProjectByInstallationId(installationId: string): Promise<Project | undefined>;
     findTeamProjects(teamId: string): Promise<Project[]>;
     findUserProjects(userId: string): Promise<Project[]>;
     storeProject(project: Project): Promise<Project>;

diff --git a/components/gitpod-db/src/typeorm/project-db-impl.ts b/components/gitpod-db/src/typeorm/project-db-impl.ts
@@ -50,11 +50,6 @@ export class ProjectDBImpl implements ProjectDB {
         return projects.find(p => p.name === projectName);
     }
 
-    public async findProjectByInstallationId(appInstallationId: string): Promise<Project | undefined> {
-        const repo = await this.getRepo();
-        return repo.findOne({ appInstallationId, markedDeleted: false });
-    }
-
     public async findTeamProjects(teamId: string): Promise<Project[]> {
         const repo = await this.getRepo();
         return repo.find({ teamId, markedDeleted: false });

diff --git a/components/server/ee/src/prebuilds/github-app.ts b/components/server/ee/src/prebuilds/github-app.ts
@@ -106,10 +106,16 @@ export class GithubApp {
                 return;
             }
             if (action === "renamed") {
-                const project = await this.projectDB.findProjectByInstallationId(String(installation.id))
-                if (project) {
-                    project.cloneUrl = repository.clone_url;
-                    await this.projectDB.storeProject(project);
+                // HINT(AT): This is undocumented, but the event payload contains something like
+                // "changes": { "repository": { "name": { "from": "test-repo-123" } } }
+                // To implement this in a more robust way, we'd need to store `repository.id` with the project, next to the cloneUrl.
+                const oldName = (ctx.payload as any)?.changes?.repository?.name?.from;
+                if (oldName) {
+                    const project = await this.projectDB.findProjectByCloneUrl(`https://github.com/${repository.owner.login}/${oldName}.git`)
+                    if (project) {
+                        project.cloneUrl = repository.clone_url;
+                        await this.projectDB.storeProject(project);
+                    }
                 }
             }
             // TODO(at): handle deleted as well
@@ -155,7 +161,8 @@ export class GithubApp {
 
         try {
             const installationId = ctx.payload.installation?.id;
-            const owner = installationId && (await this.findInstallationOwner(installationId));
+            const cloneURL = ctx.payload.repository.clone_url;
+            const owner = installationId && (await this.findProjectOwner(cloneURL) || (await this.findInstallationOwner(installationId)));
             if (!owner) {
                 log.info(`No installation or associated user found.`, { repo: ctx.payload.repository, installationId });
                 return;
@@ -213,7 +220,8 @@ export class GithubApp {
 
         try {
             const installationId = ctx.payload.installation?.id;
-            const owner = installationId && (await this.findInstallationOwner(installationId));
+            const cloneURL = ctx.payload.repository.clone_url;
+            const owner = installationId && (await this.findProjectOwner(cloneURL) || (await this.findInstallationOwner(installationId)));
             if (!owner) {
                 log.warn("Did not find user for installation. Someone's Gitpod experience may be broken.", { repo: ctx.payload.repository, installationId });
                 return;
@@ -329,11 +337,10 @@ export class GithubApp {
         return this.env.hostUrl.with({ pathname: '/button/open-in-gitpod.svg' }).toString();
     }
 
-    protected async findInstallationOwner(installationId: number): Promise<{user: User, project?: Project} | undefined> {
-
+    protected async findProjectOwner(cloneURL: string): Promise<{user: User, project?: Project} | undefined> {
         // Project mode
         //
-        const project = await this.projectDB.findProjectByInstallationId(String(installationId));
+        const project = await this.projectDB.findProjectByCloneUrl(cloneURL);
         if (project) {
             const owner = !!project.userId
                 ? { userId: project.userId }
@@ -346,6 +353,8 @@ export class GithubApp {
             }
         }
 
+    }
+    protected async findInstallationOwner(installationId: number): Promise<{user: User, project?: Project} | undefined> {
         // Legacy mode
         //
         const installation = await this.appInstallationDB.findInstallation("github", String(installationId));