Add spanner emulator env var detection #574
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
ecordell
reviewed
Apr 29, 2022
| @@ -84,3 +88,15 @@ func (smd SpannerMigrationDriver) Close() error { | |||
| } | |||
|
|
|||
| var _ migrate.Driver = SpannerMigrationDriver{} | |||
|
|
|||
| func detectEmulatorSetting() (string, bool) { | |||
| for _, env := range os.Environ() { | |||
There was a problem hiding this comment.
viper knows the env prefix we use - we pass it around as programName and configure viper with it:
spicedb/pkg/cmd/server/defaults.go
Line 53 in 7bd2af5
I'm not overly familiar with viper but it seems like there should be a way to directly ask for this value instead of manually flipping through the environment variables.
Does something like viper.Get("SPANNER_EMULATOR_HOST") work? Maybe @jzelinskie has some suggestions?
samkim
force-pushed
the
spanner-emulator-config
branch
3 times, most recently
from
4f2cb84 to
5297edd
Compare
samkim
force-pushed
the
spanner-emulator-config
branch
from
5297edd to
da16644
Compare
ecordell
reviewed
May 3, 2022
| @@ -58,6 +59,11 @@ func NewSpannerDatastore(database string, opts ...Option) (datastore.Datastore, | |||
| return nil, fmt.Errorf(errUnableToInstantiate, err) | |||
| } | |||
|
|
|||
| setting, found := detectEmulatorSetting() | |||
There was a problem hiding this comment.
couldn't this be another Option on the spanner datastore (so that we don't have to read env vars here), and then re-use the implementation from the migrate command for the serve command?
samkim
force-pushed
the
spanner-emulator-config
branch
from
f6726be to
95ce218
Compare
ecordell
previously approved these changes
May 3, 2022
samkim
force-pushed
the
spanner-emulator-config
branch
from
95ce218 to
f531819
Compare
samkim
force-pushed
the
spanner-emulator-config
branch
from
f531819 to
c92578f
Compare
josephschorr
approved these changes
May 3, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Detect prefixed spanner emulator env var config and set the actual env var.