[server] migrate ws without usageattribution #17485
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
svenefftinge
commented
May 3, 2023
| // we need to update old workspaces on the fly that didn't get an orgId because we lack attribution on their instances. | ||
| // this can be removed eventually. | ||
| if (user.additionalData?.isMigratedToTeamOnlyAttribution) { | ||
| try { |
There was a problem hiding this comment.
this runs the same tested code, but just to be sure is wrapped in try-catch.
svenefftinge
commented
May 3, 2023
| async updateWorkspacesOrganizationId(workspaces: WorkspaceInfo[], userOrgId: string): Promise<WorkspaceInfo[]> { | ||
| return await Promise.all( | ||
| workspaces.map(async (ws) => { | ||
| if (!ws.workspace.organizationId) { |
There was a problem hiding this comment.
It only doies something on workspaces without an organizationId. So should be fast in other cases.
svenefftinge
commented
May 3, 2023
| @@ -158,4 +158,41 @@ describe("Migration Service", () => { | |||
| const teams = await teamDB.findTeamsByUser(user.id); | |||
| expect(teams[0].name).to.be.eq("X Organization"); | |||
| }); | |||
|
|
|||
| it("should update 'organizationId' for workspace without attributionId", async () => { | |||
There was a problem hiding this comment.
This test fails without the addition in the migration code
svenefftinge
commented
May 3, 2023
| throw new ResponseError(ErrorCodes.NOT_FOUND, "Workspace not found."); | ||
| } | ||
| return ws; | ||
| if (!workspace.organizationId && this.user?.additionalData?.isMigratedToTeamOnlyAttribution) { | ||
| try { |
There was a problem hiding this comment.
try-catch here as well. Also only runs for workspaces without orgId and after migration
|
/unhold |
AlexTugarev
reviewed
May 3, 2023
| log.info({ userId: this.user.id }, "Updating workspace without orgId."); | ||
| const userOrg = await this.userToTeamMigrationService.getUserOrganization(this.user); | ||
| const latestInstance = await this.workspaceDb.trace({}).findCurrentInstance(workspace.id); | ||
| this.userToTeamMigrationService.updateWorkspacesOrganizationId( |
There was a problem hiding this comment.
Missing await? Or is this supposed to be not awaited on?
#17489 to fix the build
roboquat
added
deployed: webapp
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
In the migration we didn't anticipate that we have only updated usageAttribuitionIds for workspace instances from last June until now.
This change makes sure that workspaces get an orgId oin migration and because we already have executed many migrations we unfortunately also need to fix this on the fly.
Related Issue(s)
Fixes #17482
Fixes WEB-294
How to test
Documentation
Preview status
gitpod:summary
Build Options:
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish Options
Installer Options
Add desired feature flags to the end of the line above, space separated
Preview Environment Options:
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/hold