feat: add postgres setup and migration to ftl serve
#518
Conversation
This file contains 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
wesbillman
force-pushed
the
ftl-serve-init-postgres
branch
from
274ca66 to
b959593
Compare
alecthomas
approved these changes
Oct 24, 2023
cmd/ftl/cmd_serve.go
Outdated
| select { | ||
| case <-pollCtx.Done(): | ||
| return errors.New("timed out waiting for container to be healthy") | ||
| default: |
There was a problem hiding this comment.
Use case <-time.After(100 * time.Millisecond): instead of this and the sleep below.
|
LGTM nice! |
wesbillman
force-pushed
the
ftl-serve-init-postgres
branch
2 times, most recently
from
dc7e49e to
1de7367
Compare
alecthomas
reviewed
Oct 24, 2023
cmd/ftl/cmd_serve.go
Outdated
| func setupDB(ctx context.Context) (*string, error) { | ||
| logger := log.FromContext(ctx) | ||
|
|
||
| dsn := fmt.Sprintf("postgres://postgres:secret@localhost:5433/%s?sslmode=disable", ftlDBName) |
There was a problem hiding this comment.
I think it would be a better idea to dynamically allocate the port, then retrieve it, rather than hard-coding it. Either that, or add a flag for controlling it.
alecthomas
reviewed
Oct 24, 2023
cmd/ftl/cmd_serve.go
Outdated
| "--user", "postgres", | ||
| "--restart", "always", | ||
| "-e", "POSTGRES_PASSWORD=secret", | ||
| "-p", "5433:5432", |
There was a problem hiding this comment.
Re. the above comment, changing this to -p 5432 will dynamically allocate a port. I think you could then pull the real port out of the docker inspect below.
alecthomas
reviewed
Oct 24, 2023
cmd/ftl/cmd_serve.go
Outdated
| @@ -105,6 +118,66 @@ func (s *serveCmd) Run(ctx context.Context) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func setupDB(ctx context.Context) (*string, error) { | |||
There was a problem hiding this comment.
This shouldn't be a pointer to a string, just return a string.
wesbillman
force-pushed
the
ftl-serve-init-postgres
branch
from
fd34cf6 to
bdf6d28
Compare
|
@alecthomas added some updates. Is this closer to what you were thinking? Thanks for the suggestions!! |
alecthomas
approved these changes
Oct 25, 2023
| return "", errors.WithStack(err) | ||
| } | ||
|
|
||
| dsn := fmt.Sprintf("postgres://postgres:secret@localhost:%s/%s?sslmode=disable", strings.TrimSpace(string(port)), ftlContainerName) |
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.
Fixes #499
When docker isn't running
When the database hasn't been created yet
When the database already exists
ftl serve info: Checking for FTL database info: Starting 1 controller(s) and 10 runner(s)