fix: Throw error on empty env variable#499
Merged
kodiakhq[bot] merged 3 commits intomainfrom Dec 14, 2022
Merged
Conversation
⏱️ Benchmark resultsComparing with dd5f008
|
disq
reviewed
Dec 14, 2022
| envVar := envRegex.FindSubmatch(match)[1] | ||
| content, ok := os.LookupEnv(string(envVar)) | ||
| if !ok { | ||
| expandErr = fmt.Errorf("env variable %s not found", envVar) |
Member
There was a problem hiding this comment.
Are we ok with existing but empty env variables? From Lookupenv godoc:
If the variable is present in the environment the value (which may be empty) is returned and the boolean is true.
Contributor
Author
There was a problem hiding this comment.
I think this is the intended behaviour and why I used lookupEnv rather then getEnv and compare with empty string.
erezrokah
approved these changes
Dec 14, 2022
Member
erezrokah
left a comment
There was a problem hiding this comment.
Added one comment, but can also be done in a future PR
| return fmt.Errorf("failed to expand file variable in file %s: %w", path, err) | ||
| } | ||
| data = []byte(os.ExpandEnv(string(data))) | ||
| data, err = expandEnv(data) |
Member
There was a problem hiding this comment.
Maybe we could just use Expand with a custom function?
https://pkg.go.dev/os#Expand
This would remove the need for both regular expressions
Member
|
Also maybe we can report all missing envs/files and not just the last one |
kodiakhq bot
pushed a commit
that referenced
this pull request
Dec 14, 2022
🤖 I have created a release *beep* *boop* --- ## [1.12.3](v1.12.2...v1.12.3) (2022-12-14) ### Bug Fixes * Throw error on empty env variable ([#499](#499)) ([4b77cf5](4b77cf5)) * Validate json strings and handle empty strings ([#497](#497)) ([dd5f008](dd5f008)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
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
3 participants
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.
Closes #289