feat: support nested structs, structured arrays, and better secret value handling in config #4727
Conversation
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
kylecarbs
approved these changes
Oct 24, 2022
codersdk/deploymentconfig.go
Outdated
Comment on lines
130
to
150
| return json.Marshal(struct { | ||
| Name string `json:"name"` | ||
| Usage string `json:"usage"` | ||
| Flag string `json:"flag"` | ||
| Shorthand string `json:"shorthand"` | ||
| Enterprise bool `json:"enterprise"` | ||
| Hidden bool `json:"hidden"` | ||
| Secret bool `json:"secret"` | ||
| Default T `json:"default"` | ||
| Value T `json:"value"` | ||
| }{ | ||
| Name: f.Name, | ||
| Usage: f.Usage, | ||
| Flag: f.Flag, | ||
| Shorthand: f.Shorthand, | ||
| Enterprise: f.Enterprise, | ||
| Hidden: f.Hidden, | ||
| Secret: f.Secret, | ||
| Default: f.Default, | ||
| Value: f.Value, | ||
| }) |
There was a problem hiding this comment.
Could we just marshal ourselves in this case?
json.Marshal(f)
There was a problem hiding this comment.
You can't! I did that first and you get an infinite loop because it just calls this marshaller again. LOL
It's exactly the structure, notice there are no mapstructure tags. The json and yaml will always stay in sync this way. I believe in the future we can implement a yaml marshaller and use it to write this struct to yaml, if for some reason we don't want to use viper for that. |
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.
What this changes:
Pathfield in config, we just use the json tags nowCODER_$INDEX_$FIELDMarshalJSONwe can make sure we never return secrets fields over the wire.