diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-03-01 12:25:05 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-03-01 13:09:16 +0100 |
| commit | c7b8d8cc6f3f1a791643b47ec655e7cb9a02b1e3 (patch) | |
| tree | 64c8ab3626b309731b8e02b8985ea0e885bfede4 /client | |
| parent | a997a80721071cd4c99ddc96d3d8b05c59a7f139 (diff) | |
Support setting quiet option through config
Diffstat (limited to 'client')
| -rw-r--r-- | client/go/cmd/config.go | 6 | ||||
| -rw-r--r-- | client/go/cmd/config_test.go | 3 | ||||
| -rw-r--r-- | client/go/cmd/root.go | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/client/go/cmd/config.go b/client/go/cmd/config.go index 3891ef0524d..e6fd1d93c1a 100644 --- a/client/go/cmd/config.go +++ b/client/go/cmd/config.go @@ -304,6 +304,12 @@ func (c *Config) Set(option, value string) error { viper.Set(option, value) return nil } + case quietFlag: + switch value { + case "true", "false": + viper.Set(option, value) + return nil + } case apiKeyFileFlag: viper.Set(option, value) return nil diff --git a/client/go/cmd/config_test.go b/client/go/cmd/config_test.go index 2f0ccbb29e1..2183de6b2f2 100644 --- a/client/go/cmd/config_test.go +++ b/client/go/cmd/config_test.go @@ -38,6 +38,9 @@ func TestConfig(t *testing.T) { assertConfigCommand(t, "", homeDir, "config", "set", "wait", "60") assertConfigCommandErr(t, "Error: wait option must be an integer >= 0, got \"foo\"\n", homeDir, "config", "set", "wait", "foo") assertConfigCommand(t, "wait = 60\n", homeDir, "config", "get", "wait") + + assertConfigCommand(t, "", homeDir, "config", "set", "quiet", "true") + assertConfigCommand(t, "", homeDir, "config", "set", "quiet", "false") } func assertConfigCommand(t *testing.T, expected, homeDir string, args ...string) { diff --git a/client/go/cmd/root.go b/client/go/cmd/root.go index 114d6150284..7b4a492faf4 100644 --- a/client/go/cmd/root.go +++ b/client/go/cmd/root.go @@ -82,16 +82,15 @@ func isTerminal() bool { } func configureOutput() error { - if quietArg { - stdout = ioutil.Discard - } - log.SetFlags(0) // No timestamps - log.SetOutput(stdout) - config, err := LoadConfig() if err != nil { return err } + if quiet, _ := config.Get(quietFlag); quiet == "true" { + stdout = ioutil.Discard + } + log.SetFlags(0) // No timestamps + log.SetOutput(stdout) colorValue, _ := config.Get(colorFlag) colorize := false switch colorValue { |