feat: use secrets instead of env vars for DSNs #1483
Merged
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
Open
deniseli
force-pushed
the
dli/letstrythisagain
branch
from
fd79ddc to
92a20c8
Compare
alecthomas
reviewed
May 14, 2024
| tmpDir := t.TempDir() | ||
|
|
||
| cwd, err := os.Getwd() | ||
| assert.NoError(t, err) | ||
|
|
||
| rootDir := internal.GitRoot("") | ||
|
|
||
| if ftlConfigPath != "" { | ||
| t.Setenv("FTL_CONFIG", filepath.Join(tmpDir, ftlConfigPath)) |
There was a problem hiding this comment.
Let's use a path into the testdata directory instead of one relative to the tmpDir. Otherwise we have a chicken and egg situation where the config can't be loaded until the module is copied over, and the config itself is used by FTL during startup.
There was a problem hiding this comment.
Also add a comment to run describing the above.
There was a problem hiding this comment.
ah good point, done on both counts
|
|
||
| // DatabasesFromSecrets finds DSNs in environment variables and creates a map of databases. | ||
| // | ||
| // Environment variables should be in the format FTL_POSTGRES_DSN__<MODULENAME>_<DBNAME> |
There was a problem hiding this comment.
This comment is no longer accurate.
There was a problem hiding this comment.
whoops, thanks for catching that
| // FTL_DSN_<MODULE>_<DBNAME> | ||
| parts := strings.Split(sName, "_") | ||
| if len(parts) != 4 { | ||
| return nil, fmt.Errorf("invalid DSN secret key %q should have format FTL_DSN_MODULE_DBNAME", sName) |
There was a problem hiding this comment.
Use FTL_DSN_<MODULE>_<DBNAME> in the error so it's clear what parts are variable.
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 #1427
database/ftl-project.toml was written using:
This PR only works thanks to this earlier PR: #1472