Allow PG* env vars as an alternative to DATABASE_URL
#256
+150
−99
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
brandur
force-pushed
the
brandur-pg-vars
branch
from
0f3a7d2 to
17621f6
Compare
brandur
commented
Dec 24, 2024
| @@ -1,9 +1,6 @@ | |||
| name: CI | |||
|
|
|||
| env: | |||
| # A suitable URL for the test database. | |||
| DATABASE_URL: postgres://postgres:[email protected]:5432/river_dev?sslmode=disable | |||
There was a problem hiding this comment.
This wasn't needed anywhere so I took it out so that the env is cleaner for tests where we want to work with it (i.e. we don't have to unset DATABASE_URL before testing something).
Accept the standard set of `PG*` env vars as an alternative to database configuration (e.g. `PGHOST`, `PGDATABASE`, etc.). This is mostly driven by having done something similar for the CLI in [1], but was also requested in #249. This turns out to be quite easy to do because pgx does all the heavy lifting. As noted in [1], a bonus of this is that it adds some additional configuration options that aren't very easily doable right now, for example around the use of an SSL certificate to connect to Postgres. We get automatic support for these vars: * `PGSSLCERT` * `PGSSLKEY` * `PGSSLROOTCERT` * `PGSSLPASSWORD` As part of this I also ended up rearranging some things in `main.go`. Not strongly married to this design, but the idea is to get it into a place where we can write tests for it, which previously wasn't possible. Fixes #249. [1] riverqueue/river#702
brandur
force-pushed
the
brandur-pg-vars
branch
from
17621f6 to
109c363
Compare
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.
Accept the standard set of
PG*env vars as an alternative to databaseconfiguration (e.g.
PGHOST,PGDATABASE, etc.). This is mostly drivenby having done something similar for the CLI in [1], but was also
requested in #249. This turns out to be quite easy to do because pgx
does all the heavy lifting.
As noted in [1], a bonus of this is that it adds some additional
configuration options that aren't very easily doable right now, for
example around the use of an SSL certificate to connect to Postgres. We
get automatic support for these vars:
PGSSLCERTPGSSLKEYPGSSLROOTCERTPGSSLPASSWORDAs part of this I also ended up rearranging some things in
main.go.Not strongly married to this design, but the idea is to get it into a
place where we can write tests for it, which previously wasn't possible.
Fixes #249.
[1] riverqueue/river#702