-
Notifications
You must be signed in to change notification settings - Fork 950
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: make iterateTLSConfig only work for TLS config #2057
Conversation
|
Signed-off-by: Ace-Tang <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2057 +/- ##
==========================================
+ Coverage 59.05% 64.11% +5.06%
==========================================
Files 202 202
Lines 15494 15494
==========================================
+ Hits 9150 9934 +784
+ Misses 5233 4321 -912
- Partials 1111 1239 +128
|
@@ -169,7 +169,7 @@ func (cfg *Config) MergeConfigurations(flagSet *pflag.FlagSet) error { | |||
} | |||
|
|||
fileFlags := make(map[string]interface{}, 0) | |||
iterateConfig(origin, fileFlags) | |||
iterateTLSConfig(origin, fileFlags) | |||
|
|||
// check if invalid or unknown flag exist in config file | |||
if err = getUnknownFlags(flagSet, fileFlags); err != nil { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in your commit, the UnknownFlags
is only for TLS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iterateTLSConfig
function is to make TLS value from map become a new key-value
{
"TLS": {
"a": "b"
}
} ->
{
"a": "b"
}
as for other config, they will stay same, so do you got the point? @fuweid
ping @Ace-Tang |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Signed-off-by: Ace-Tang [email protected]
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews