Remove default configuration and add fallback configuration #142
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
samcoe
commented
Oct 24, 2023
williammartin
requested changes
Oct 24, 2023
| @@ -89,7 +89,7 @@ func optionsNeedResolution(opts ClientOptions) bool { | |||
| } | |||
|
|
|||
| func resolveOptions(opts ClientOptions) (ClientOptions, error) { | |||
| cfg, _ := config.Read() | |||
| cfg, _ := config.Read(nil) | |||
There was a problem hiding this comment.
It's kind of a shame with this pattern that we end up passing nil around everywhere. Oh well.
There was a problem hiding this comment.
Agreed. Open to better suggestions if you have them.
There was a problem hiding this comment.
The only reasonable one I have is using variadic functional opts. Everything else is a much bigger change than I think we would want to tackle.
|
|
||
| if tt.fallback != nil { | ||
| // Assert that load returns an equivalent copy of fallvback. | ||
| assert.Equal(t, tt.fallback.entries.String(), cfg.entries.String()) |
There was a problem hiding this comment.
Man, I totally get why the yaml Node has a slice for content now rather than a map, it's so it can always marshal in a stable order!
williammartin
approved these changes
Oct 24, 2023
This was referenced Oct 24, 2023
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.
This PR removes the knowledge of a default configuration from
go-ghand replaces it with the ability to supply a fallback configuration to theconfig.Readfunction. This removes application level knowledge fromgo-ghand allows us to push it back intogh. One decision I made was that the fallback configuration would not be used unless bothconfig.ymlandhosts.ymlwere not found, previously the default configuration would be used wheneverconfig.ymlwas not found. This change feels appropriate as we are now treatingconfig.ymlandhosts.ymlas one single configuration and hides the details that they are actually two separate files from the caller.config.Readwhich is exported, but in located in theconfigpackage which is only meant for use insideghand has a warning about non-backwards compatible changes.