public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

apply review suggestions

This commit is contained in:
Jan Larwig 2025-02-01 15:57:23 +01:00
parent 31a4c34726
commit 202de3a05e
No known key found for this signature in database
GPG Key ID: C2172BFA220A037A
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.go
View File

@ -70,7 +70,7 @@ func main() {
func loadConfiguration(config, yamlConfig string, extraFlags *pflag.FlagSet, args []string) (*options.Options, error) { func loadConfiguration(config, yamlConfig string, extraFlags *pflag.FlagSet, args []string) (*options.Options, error) {
opts, err := loadLegacyOptions(config, extraFlags, args) opts, err := loadLegacyOptions(config, extraFlags, args)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("couldn't load legacy options: %w", err)
} }
if yamlConfig != "" { if yamlConfig != "" {

5
pkg/apis/options/load.go
View File

@ -83,12 +83,11 @@ func Decode(input interface{}, result interface{}) error {
DecodeHook: mapstructure.ComposeDecodeHookFunc(toDurationHookFunc()), DecodeHook: mapstructure.ComposeDecodeHookFunc(toDurationHookFunc()),
Metadata: nil, // Don't track any metadata Metadata: nil, // Don't track any metadata
Result: result, // Decode the result into the prefilled options Result: result, // Decode the result into the prefilled options
TagName: "json", // Parse all fields that use the yaml tag TagName: "json", // Parse all fields that use the json tag
ZeroFields: false, // Don't clean the default values from the result map (options) ZeroFields: false, // Don't clean the default values from the result map (options)
ErrorUnused: true, // Throw an error if keys have been used that aren't mapped to any struct fields ErrorUnused: true, // Throw an error if keys have been used that aren't mapped to any struct fields
IgnoreUntaggedFields: true, // Ignore fields in structures that aren't tagged with yaml IgnoreUntaggedFields: true, // Ignore fields in structures that aren't tagged with json
}) })
if err != nil { if err != nil {
return fmt.Errorf("error creating decoder for config: %w", err) return fmt.Errorf("error creating decoder for config: %w", err)
} }