fix ability to mix/merge json env variables with env_nested_delimiter… #3640
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
added 2 commits
January 7, 2022 18:54
|
please review |
samuelcolvin
reviewed
Aug 5, 2022
| try: | ||
| env_val = settings.__config__.json_loads(env_val) | ||
| except JSONDecodeError: | ||
| ... |
| if env_val: | ||
| try: | ||
| env_val = settings.__config__.json_loads(env_val) | ||
| except JSONDecodeError: |
There was a problem hiding this comment.
Suggested change
| except JSONDecodeError: | |
| except ValueError: |
More consistent to just use ValueError
| env_var[last_key] = env_val | ||
|
|
||
| if env_val: | ||
| try: |
There was a problem hiding this comment.
The problem here is we're calling json.loads on every field which:
- could have some weird side effects - e.g. you want
"foobar"butjson_loadsconverts it tofoobar - It could effect performance
We could:
- not do this and document it?
- check if
env_valstarts with{or[and only parse json in that case
|
please update. |
|
I think this overlaps a lot with #4216, but that solution is more complete, even that we're deferring to V2. |
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.
Change Summary
fix ability to mix/merge json env variables with variables defined according to env_nested_delimiter
Related issue number
Found a corner-case when we are mixing 2 types of nested environment variables definition.
#3159
Checklist
changes/<pull request or issue id>-<github username>.mdfile added describing change(see changes/README.md for details)