status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-11 06:16:08 +00:00
Code Issues Projects Releases Wiki Activity

Add -quiet flag to validate

Browse Source
This commit is contained in:
Kyle Havlovitz 2017-02-10 20:14:22 -05:00
parent eee5eb3fb8
commit 2aebff3bd3
No known key found for this signature in database
GPG Key ID: 8A5E6B173056AD6C
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/validate.go
View File

@ -33,6 +33,7 @@ Usage: consul validate [options] FILE_OR_DIRECTORY...
func (c *ValidateCommand) Run(args []string) int { func (c *ValidateCommand) Run(args []string) int {
var configFiles []string var configFiles []string
var quiet bool
f := c.Command.NewFlagSet(c) f := c.Command.NewFlagSet(c)
f.Var((*agent.AppendSliceValue)(&configFiles), "config-file", f.Var((*agent.AppendSliceValue)(&configFiles), "config-file",
@ -40,6 +41,8 @@ func (c *ValidateCommand) Run(args []string) int {
f.Var((*agent.AppendSliceValue)(&configFiles), "config-dir", f.Var((*agent.AppendSliceValue)(&configFiles), "config-dir",
"Path to a directory to read configuration files from. This will read every file ending in "+ "Path to a directory to read configuration files from. This will read every file ending in "+
".json as configuration in this directory in alphabetical order.") ".json as configuration in this directory in alphabetical order.")
f.BoolVar(&quiet, "quiet", false,
"When given, a successful run will produce no output.")
c.Command.HideFlags("config-file", "config-dir") c.Command.HideFlags("config-file", "config-dir")
if err := c.Command.Parse(args); err != nil { if err := c.Command.Parse(args); err != nil {
@ -61,7 +64,9 @@ func (c *ValidateCommand) Run(args []string) int {
return 1 return 1
} }
c.Ui.Output("Configuration is valid!") if !quiet {
c.Ui.Output("Configuration is valid!")
}
return 0 return 0
} }

19
command/validate_test.go
View File

@ -119,3 +119,22 @@ func TestValidateCommandSucceedOnConfigDirWithEmptyFile(t *testing.T) {
t.Fatalf("bad: %d", code) t.Fatalf("bad: %d", code)
} }
} }
func TestValidateCommandQuiet(t *testing.T) {
td, err := ioutil.TempDir("", "consul")
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.RemoveAll(td)
ui, cmd := testValidateCommand(t)
args := []string{"-quiet", td}
if code := cmd.Run(args); code != 0 {
t.Fatalf("bad: %d, %s", code, ui.ErrorWriter.String())
}
if ui.OutputWriter.String() != "<nil>" {
t.Fatalf("bad: %v", ui.OutputWriter.String())
}
}