[server] don't error on project not_found

Author: svenefftinge

components/server/src/workspace/gitpod-server-impl.ts

@@ -848,7 +848,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkUser("getTeamMembersByProject");
         if (projectId) {
             const project = await this.projectsService.getProject(user.id, projectId);
-            if (project && project.teamId) {
+            if (project.teamId) {
                 return await this.organizationService.listMembers(user.id, project.teamId);
             }
         }
@@ -977,9 +977,23 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             throw new ApplicationError(ErrorCodes.PERMISSION_DENIED, "Cannot (re-)start a deleted workspace.");
         }
         const envVarsPromise = this.envVarService.resolve(workspace);
-        const projectPromise = workspace.projectId
-            ? this.projectsService.getProject(user.id, workspace.projectId)
-            : Promise.resolve(undefined);
+
+        const projectPromise = new Deferred<Project>();
+        if (workspace.projectId) {
+            try {
+                const project = await this.projectsService.getProject(user.id, workspace.projectId);
+                projectPromise.resolve(project);
+            } catch (error) {
+                if (ApplicationError.hasErrorCode(error) && error.code === ErrorCodes.NOT_FOUND) {
+                    log.info({ userId: user.id, workspaceId }, "cannot resolve project", error);
+                    projectPromise.resolve(undefined);
+                } else {
+                    throw error;
+                }
+            }
+        } else {
+            projectPromise.resolve(undefined);
+        }
 
         await mayStartPromise;
 
@@ -990,7 +1004,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             ctx,
             workspace,
             user,
-            await projectPromise,
+            await projectPromise.promise,
             await envVarsPromise,
             options,
         );
@@ -1593,9 +1607,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkAndBlockUser("getPrebuildEvents");
 
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         await this.guardProjectOperation(user, projectId, "get");
 
         const events = await this.projectsService.getPrebuildEvents(user.id, project.cloneUrl);
@@ -1612,9 +1623,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkAndBlockUser("triggerPrebuild");
 
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         await this.guardProjectOperation(user, projectId, "update");
 
         const branchDetails = !!branchName
@@ -2810,9 +2818,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     private async guardProjectOperation(user: User, projectId: string, op: ResourceAccessOp): Promise<void> {
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         // Anyone who can read a team's information (i.e. any team member) can manage team projects
         await this.guardTeamOperation(project.teamId, "get", "not_implemented");
     }
@@ -2954,10 +2959,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
         const user = await this.checkAndBlockUser("cancelPrebuild");
 
-        const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
+        await this.projectsService.getProject(user.id, projectId);
         await this.guardProjectOperation(user, projectId, "update");
 
         const prebuild = await this.workspaceDb.trace(ctx).findPrebuildByID(prebuildId);

components/server/src/workspace/headless-log-controller.ts

@@ -34,6 +34,7 @@ import { BearerAuth } from "../auth/bearer-authenticator";
 import { ProjectsService } from "../projects/projects-service";
 import { HostContextProvider } from "../auth/host-context-provider";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
+import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 
 export const HEADLESS_LOGS_PATH_PREFIX = "/headless-logs";
 export const HEADLESS_LOG_DOWNLOAD_PATH_PREFIX = "/headless-log-download";
@@ -214,9 +215,17 @@ export class HeadlessLogController {
 
         let teamMembers: TeamMemberInfo[] = [];
         if (workspace?.projectId) {
-            const p = await this.projectService.getProject(user.id, workspace.projectId);
-            if (p?.teamId) {
-                teamMembers = await this.teamDb.findMembersByTeam(p.teamId);
+            try {
+                const p = await this.projectService.getProject(user.id, workspace.projectId);
+                if (p?.teamId) {
+                    teamMembers = await this.teamDb.findMembersByTeam(p.teamId);
+                }
+            } catch (error) {
+                if (ApplicationError.hasErrorCode(error) && error.code === ErrorCodes.NOT_FOUND) {
+                    // ignore
+                } else {
+                    throw error;
+                }
             }
         }
 

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

@@ -696,10 +696,7 @@ export class WorkspaceStarter {
         metadata.setMetaId(workspace.id);
         if (workspace.projectId) {
             metadata.setProject(workspace.projectId);
-            const project = await this.projectDB.findProjectById(workspace.projectId);
-            if (project && project.teamId) {
-                metadata.setTeam(project.teamId);
-            }
+            metadata.setTeam(workspace.organizationId);
         }
 
         return metadata;