respect env values over non-zero fields under SetDefaultsForZeroValuesOnly#420
Open
c-tonneslan wants to merge 1 commit into
Open
Conversation
…sOnly SetDefaultsForZeroValuesOnly is about defaults: an env var that's actually set should still take precedence over an already-populated struct field. The previous check treated any non-empty value the same way, so an explicit override via the environment was silently dropped the moment the destination field was non-zero. Plumb the isDefault flag (which getOr already computes) out of get() and only skip setting when the value came from a default. Real env values keep flowing through. Fixes caarlos0#364. Signed-off-by: Charlie Tonneslan <cst0520@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 #364.
`SetDefaultsForZeroValuesOnly` is about defaults: an env var that's actually set in the environment should still take precedence over an already-populated field. The previous check treated any non-empty value the same way, so:
```go
type Config struct {
Username string `env:"USERNAME" envDefault:"admin"`
}
cfg := Config{Username: "root"}
env.ParseWithOptions(&cfg, env.Options{
Environment: map[string]string{"USERNAME": "user1"},
SetDefaultsForZeroValuesOnly: true,
})
// got: "root"
// want: "user1"
```
Plumb the `isDefault` flag (which `getOr` already computes) out of `get()` and only skip setting when the value came from a default. Real env values keep flowing through. Existing `TestSetDefaultsForZeroValuesOnly` cases still pass.
Added `TestSetDefaultsForZeroValuesOnly_EnvOverridesNonZero` for the regression.