Skip to content

fix: config action output #225

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

Merged
dbolson merged 2 commits into from
Apr 30, 2024
Merged

fix: config action output #225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
138e0d8
Show output for invalid config unset action
Apr 30, 2024
87a7112
Show output for invalid config set action
Apr 30, 2024
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
32 changes: 31 additions & 1 deletion cmd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ func run() func(*cobra.Command, []string) error {
return errors.NewError("flag needs an argument: --set")
}

for i := 0; i < len(args)-1; i += 2 {
_, ok := cliflags.AllFlagsHelp()[args[i]]
if !ok {
return newErr(args[i])
}
}

rawConfig, v, err := getRawConfig()
if err != nil {
return err
Expand All @@ -122,6 +129,11 @@ func run() func(*cobra.Command, []string) error {

return writeConfig(configFile, v, setKeyFn)
case viper.IsSet(UnsetFlag):
_, ok := cliflags.AllFlagsHelp()[viper.GetString(UnsetFlag)]
if !ok {
return newErr(viper.GetString(UnsetFlag))
}

config, v, err := getConfig()
if err != nil {
return err
Expand All @@ -133,7 +145,12 @@ func run() func(*cobra.Command, []string) error {
}
}

return writeConfig(config, v, unsetKeyFn)
// TODO: show successful output

err = writeConfig(config, v, unsetKeyFn)
if err != nil {
return err
}
default:
return cmd.Help()
}
Expand Down Expand Up @@ -234,3 +251,16 @@ func writeConfig(

return nil
}

func newErr(flag string) error {
err := errors.NewError(
fmt.Sprintf(
`{
"message": "%s is not a valid configuration option"
}`,
flag,
),
)

return errors.NewError(output.CmdOutputError(flag, err))
}