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

command: drop unused hidden flags for 'validate'

Browse Source
This commit is contained in:
Frank Schroeder 2017-10-05 17:40:31 +02:00 committed by Frank Schröder
parent 497d2702bf
commit bc78fa576a
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command/validate.go
View File

@ -5,7 +5,6 @@ import (
"strings" "strings"
"github.com/hashicorp/consul/agent/config" "github.com/hashicorp/consul/agent/config"
"github.com/hashicorp/consul/configutil"
) )
// ValidateCommand is a Command implementation that is used to // ValidateCommand is a Command implementation that is used to
@ -32,28 +31,18 @@ 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 quiet bool var quiet bool
f := c.BaseCommand.NewFlagSet(c) f := c.BaseCommand.NewFlagSet(c)
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-file",
"Path to a JSON file to read configuration from. This can be specified multiple times.")
f.Var((*configutil.AppendSliceValue)(&configFiles), "config-dir",
"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.")
f.BoolVar(&quiet, "quiet", false, f.BoolVar(&quiet, "quiet", false,
"When given, a successful run will produce no output.") "When given, a successful run will produce no output.")
c.BaseCommand.HideFlags("config-file", "config-dir")
if err := c.BaseCommand.Parse(args); err != nil { if err := c.BaseCommand.Parse(args); err != nil {
c.UI.Error(err.Error()) c.UI.Error(err.Error())
return 1 return 1
} }
if len(f.Args()) > 0 { configFiles := f.Args()
configFiles = append(configFiles, f.Args()...)
}
if len(configFiles) < 1 { if len(configFiles) < 1 {
c.UI.Error("Must specify at least one config file or directory") c.UI.Error("Must specify at least one config file or directory")
return 1 return 1