Skip to content

Commit

Permalink
cmd: initialize config fields before use (#100)
Browse files Browse the repository at this point in the history
Signed-off-by: Ayaz Badouraly <ayaz.badouraly@datadoghq.com>
  • Loading branch information
badouralix committed Mar 29, 2023
1 parent b26cfb8 commit 7f8bfab
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmd/yamlfmt/config.go
Expand Up @@ -175,7 +175,7 @@ func validatePath(path string) error {
}

func makeCommandConfigFromData(configData map[string]any) (*command.Config, error) {
var config *command.Config
config := command.NewConfig()
err := mapstructure.Decode(configData, &config)
if err != nil {
return nil, err
Expand Down Expand Up @@ -222,7 +222,7 @@ func makeCommandConfigFromData(configData map[string]any) (*command.Config, erro
config.Exclude = append(config.Exclude, flagExclude...)
config.Extensions = append(config.Extensions, flagExtensions...)

return config, nil
return &config, nil
}

func parseFormatterConfigFlag(flagValues []string) (map[string]any, error) {
Expand Down
11 changes: 11 additions & 0 deletions command/command.go
Expand Up @@ -40,6 +40,11 @@ type FormatterConfig struct {
FormatterSettings map[string]any `mapstructure:",remain"`
}

// NewFormatterConfig returns an empty formatter config with all fields initialized.
func NewFormatterConfig() FormatterConfig {
return FormatterConfig{FormatterSettings: make(map[string]any)}
}

type Config struct {
Extensions []string `mapstructure:"extensions"`
Include []string `mapstructure:"include"`
Expand All @@ -49,6 +54,12 @@ type Config struct {
FormatterConfig *FormatterConfig `mapstructure:"formatter,omitempty"`
}

// NewConfig returns an empty config with all fields initialized.
func NewConfig() Config {
formatterConfig := NewFormatterConfig()
return Config{FormatterConfig: &formatterConfig}
}

type Command struct {
Operation Operation
Registry *yamlfmt.Registry
Expand Down

0 comments on commit 7f8bfab

Please sign in to comment.