[server] don't error on project not_found #18400
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
geropl
approved these changes
Aug 1, 2023
There was a problem hiding this comment.
Code LGTM ✅
@svenefftinge Do you want me to do some testing as well or did you already do so?
svenefftinge
commented
Aug 1, 2023
| @@ -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) { | |||
There was a problem hiding this comment.
Removed these unnecessary checks, as getProject already throws that error
svenefftinge
commented
Aug 1, 2023
| if (project && project.teamId) { | ||
| metadata.setTeam(project.teamId); | ||
| } | ||
| metadata.setTeam(workspace.organizationId); |
There was a problem hiding this comment.
no need to fetch the project as we have the org id on the workspace
|
I did not, but will do when the preview env is up |
svenefftinge
force-pushed
the
se/start-ws-wo-project
branch
from
d4bb555 to
746e0b2
Compare
svenefftinge
force-pushed
the
se/start-ws-wo-project
branch
from
746e0b2 to
22ad9e3
Compare
svenefftinge
commented
Aug 1, 2023
| @@ -844,17 +844,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable { | |||
| await this.userDeletionService.deleteUser(user.id); | |||
| } | |||
|
|
|||
| private async getTeamMembersByProject(projectId: string | undefined): Promise<TeamMemberInfo[]> { | |||
There was a problem hiding this comment.
this was unnecessariuly going through project. We now have an organizationId on workspaces so I replaced these with organizationService.listMembers.
|
/unhold |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We need to handle the not_found error during when projects are actually optional, i.e. during workspace start.
Related Issue(s)
Fixes WEB-628
How to test
Documentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options
Build
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish
Installer
Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh. If enabled,with-previewandwith-large-vmwill be enabled./hold