Skip to content
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.

Sign up for GitHub

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

Parse app config strictly by default #3629

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Parse app config strictly by default #3629

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b053c4
Parse app config strictly
saquibmian Feb 11, 2025
7b33c22
Add `ReadConfigNonStrict` as well
saquibmian Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions private/pkg/app/appext/appext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,25 @@ func BuilderWithLoggerProvider(loggerProvider LoggerProvider) BuilderOption {
// If the file does not exist, this is a no-op.
// The value should be a pointer to unmarshal into.
func ReadConfig(container NameContainer, value interface{}) error {
configFilePath := filepath.Join(container.ConfigDirPath(), configFileName)
data, err := os.ReadFile(configFilePath)
if !errors.Is(err, os.ErrNotExist) {
if err != nil {
return fmt.Errorf("could not read %s configuration file at %s: %w", container.AppName(), configFilePath, err)
}
if err := encoding.UnmarshalYAMLStrict(data, value); err != nil {
return fmt.Errorf("invalid %s configuration file: %w", container.AppName(), err)
}
}
return nil
}

// ReadConfigNonStrict reads the configuration from the YAML configuration file config.yaml
// in the configuration directory, ignoring any unknown properties.
//
// If the file does not exist, this is a no-op.
// The value should be a pointer to unmarshal into.
func ReadConfigNonStrict(container NameContainer, value interface{}) error {
configFilePath := filepath.Join(container.ConfigDirPath(), configFileName)
data, err := os.ReadFile(configFilePath)
if !errors.Is(err, os.ErrNotExist) {
Expand Down
Loading