[db] Move db models to go-db module #14770

laushinka · 2022-11-17T14:38:15Z

Description

Moves DB models to components/gitpod-db/go, so that they can be used by public-api but also usage.

Changes performed in this PR:

Move all DB models from components/usage/pkg/db into components/gitpod-db/go
Created a BUILD.yaml for go
Update packages correspondingly
Update imports correspondingly

Related Issue(s)

New attempt at #14731
Requirement for #14602

How to test

Build and unit tests

Release Notes

NONE

Documentation

Werft options:

/werft with-local-preview
If enabled this will build install/preview
/werft with-preview
/werft with-large-vm
/werft with-integration-tests=all
Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh

easyCZ · 2022-11-18T11:14:24Z

@mads-hartmann We'll still need the leeway change to get this PR through. Do you have a ref for the fix so we can track, please?

andrew-farries

👍 Changes look mostly mechanical and I paired with @laushinka for some of this yesterday.

/hold for one small change.

components/gitpod-db/go/BUILD.yaml

andrew-farries · 2022-11-18T11:42:05Z

components/gitpod-db/go/dbtest/conn.go

@@ -28,16 +28,16 @@ func ConnectForTests(t *testing.T) *gorm.DB {
 		return conn
 	}

-	// These are static connection details for tests, started by `leeway components/usage:init-testdb`.
+	// These are static connection details for tests, started by `leeway components/gitpod-db:init-testdb`.


Suggested change

// These are static connection details for tests, started by `leeway components/gitpod-db:init-testdb`.

// These are static connection details for tests, started by `leeway build components/gitpod-db/go:init-testdb`.

mads-hartmann · 2022-11-18T12:39:57Z

@laushinka @easyCZ It looks like the build is fine without the Leeway change now? ☺️ I opened a PR to fix it anyway as it was indeed a bug in Leeway - @andrew-farries have a look at the PR description if you want to learn more about ephemeral packages.

andrew-farries · 2022-11-18T12:55:42Z

Thanks for the Notion doc @mads-hartmann.

If ephemeral packages are something that we intend to keep using, perhaps your PR (or a followup) could add documentation about them to leeway's README.md?

mads-hartmann · 2022-11-18T13:00:14Z

If ephemeral packages are something that we intend to keep using, perhaps your PR (or a followup) could add documentation about them to leeway's README.md?

I will try to get clarity around the future of ephemeral packages with the team and Chris. If we keep them around I will for sure update the documentation 🧡

easyCZ · 2022-11-18T13:00:54Z

@mads-hartmann I guess it's not really needed. Which raises the Q why was it needed before? The changes here are the same as in the original PR.

mads-hartmann · 2022-11-18T13:22:13Z

@easyCZ I think you're seeing the problem I'm describing in the PR. Looking at the logs of one of the failed jobs (job 12) you can see that it didn't need to rebuild components/common-go:lib(cached remotely (downloaded) components/common-go:lib) which means it wouldn't "build" the ephemeral package init-testdb. Looking at the successful build in this branch (job 24) you can see it does need to build components/gitpod-db/go:lib so the ephemeral package components/gitpod-db:dbtest-init will be built too, which means that any package that depends on components/gitpod-db/go:lib will built successfully.

So I think without the PR we'll see flaky builds depending on whether or not Leeway needs to build components/gitpod-db/go:lib or not. I'm not 100% sure on this, but it's my best guess ☺️

easyCZ · 2022-11-21T08:17:16Z

@mads-hartmann Looks like you've managed to land gitpod-io/leeway#121, what changes do we need to make to this PR to use it?

mads-hartmann · 2022-11-21T08:18:34Z

@easyCZ I'll open a PR to bump the Leeway version everywhere now. I'll ping you as soon as it's ready, and once that's in we can merge this PR ☺️

mads-hartmann · 2022-11-21T08:46:42Z

@easyCZ PR here but the main build is broken since a few hours ago, so I'm going down that rabbit hole first ☺️

mads-hartmann · 2022-11-21T09:28:14Z

@easyCZ It's in main

easyCZ · 2022-11-21T11:06:17Z

/werft run

👍 started the job as gitpod-build-lau-move-db-models-godb.27
(with .werft/ from main)

easyCZ · 2022-11-21T11:24:09Z

/unhold

roboquat added do-not-merge/work-in-progress do-not-merge/release-note-label-needed size/M size/L and removed size/M labels Nov 17, 2022

laushinka mentioned this pull request Nov 17, 2022

[common-go] Move db models to common-go #14731

Closed

4 tasks

laushinka force-pushed the lau/move-db-models-godb branch 3 times, most recently from 2d08a79 to 2c10c1b Compare November 17, 2022 23:17

easyCZ force-pushed the lau/move-db-models-godb branch from 2c10c1b to cd98843 Compare November 18, 2022 09:33

roboquat added size/XXL and removed size/L labels Nov 18, 2022

easyCZ force-pushed the lau/move-db-models-godb branch 2 times, most recently from 710aaeb to 4d3e646 Compare November 18, 2022 10:44

roboquat added release-note-none and removed do-not-merge/release-note-label-needed labels Nov 18, 2022

easyCZ force-pushed the lau/move-db-models-godb branch 4 times, most recently from 2c5a2ae to c38077e Compare November 18, 2022 11:11

easyCZ force-pushed the lau/move-db-models-godb branch from c38077e to aa94e72 Compare November 18, 2022 11:18

laushinka marked this pull request as ready for review November 18, 2022 11:27

laushinka requested review from a team November 18, 2022 11:27

roboquat removed the do-not-merge/work-in-progress label Nov 18, 2022

github-actions bot added team: SID team: webapp Issue belongs to the WebApp team team: workspace Issue belongs to the Workspace team labels Nov 18, 2022

laushinka mentioned this pull request Nov 18, 2022

Implement CreatePersonalAccessToken RPC #14602

Closed

5 tasks

andrew-farries approved these changes Nov 18, 2022

View reviewed changes

roboquat added the do-not-merge/hold label Nov 18, 2022

laushinka force-pushed the lau/move-db-models-godb branch from aa94e72 to 97ab7e2 Compare November 18, 2022 12:01

mads-hartmann mentioned this pull request Nov 18, 2022

Go: Ignore ephemeral packages when checking transitive dependencies gitpod-io/leeway#121

Merged

mads-hartmann mentioned this pull request Nov 21, 2022

Use Leeway v0.5.2 #14812

Merged

4 tasks

easyCZ force-pushed the lau/move-db-models-godb branch from 97ab7e2 to 95fe93e Compare November 21, 2022 10:39

[db] Move db models to gitpod-db/go module

b4fc228

easyCZ force-pushed the lau/move-db-models-godb branch from 95fe93e to b4fc228 Compare November 21, 2022 10:41

mrsimonemms approved these changes Nov 21, 2022

View reviewed changes

Furisto approved these changes Nov 21, 2022

View reviewed changes

roboquat removed the do-not-merge/hold label Nov 21, 2022

roboquat merged commit ee08e78 into main Nov 21, 2022

roboquat deleted the lau/move-db-models-godb branch November 21, 2022 11:37

roboquat added the deployed: webapp Meta team change is running in production label Nov 21, 2022

roboquat added the deployed: workspace Workspace team change is running in production label Dec 7, 2022

	// These are static connection details for tests, started by `leeway components/gitpod-db:init-testdb`.
	// These are static connection details for tests, started by `leeway build components/gitpod-db/go:init-testdb`.

[db] Move db models to go-db module #14770

[db] Move db models to go-db module #14770

Uh oh!

Conversation

laushinka commented Nov 17, 2022 • edited by easyCZ Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue(s)

How to test

Release Notes

Documentation

Werft options:

Uh oh!

easyCZ commented Nov 18, 2022

Uh oh!

andrew-farries left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

andrew-farries Nov 18, 2022

Choose a reason for hiding this comment

Uh oh!

laushinka Nov 18, 2022

Choose a reason for hiding this comment

Uh oh!

mads-hartmann commented Nov 18, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrew-farries commented Nov 18, 2022

Uh oh!

mads-hartmann commented Nov 18, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

easyCZ commented Nov 18, 2022

Uh oh!

mads-hartmann commented Nov 18, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

easyCZ commented Nov 21, 2022

Uh oh!

mads-hartmann commented Nov 21, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mads-hartmann commented Nov 21, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mads-hartmann commented Nov 21, 2022

Uh oh!

easyCZ commented Nov 21, 2022 • edited by werft-gitpod-dev-com bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

easyCZ commented Nov 21, 2022

Uh oh!

Uh oh!

laushinka commented Nov 17, 2022 •

edited by easyCZ

Loading

mads-hartmann commented Nov 18, 2022 •

edited by werft-gitpod-dev-com bot

Loading

mads-hartmann commented Nov 18, 2022 •

edited by werft-gitpod-dev-com bot

Loading

mads-hartmann commented Nov 18, 2022 •

edited by werft-gitpod-dev-com bot

Loading

mads-hartmann commented Nov 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

mads-hartmann commented Nov 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading

easyCZ commented Nov 21, 2022 •

edited by werft-gitpod-dev-com bot

Loading