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.

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

cmd: initialize config fields before use #100

Merged
merged 1 commit into from Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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