mirror of https://github.com/status-im/consul.git
command: drop deprecated 'configtest' command
'configtest' has been replaced with 'validate'
This commit is contained in:
Frank Schroeder
Frank Schröder
parent
8e361beb7a
commit
ce0d03c46a
|
|
@ -69,15 +69,6 @@ func init() {
|
||||||
}, nil
|
}, nil
|
||||||
},
|
},
|
||||||
|
|
||||||
"configtest": func() (cli.Command, error) {
|
|
||||||
return &ConfigTestCommand{
|
|
||||||
BaseCommand: BaseCommand{
|
|
||||||
Flags: FlagSetNone,
|
|
||||||
UI: ui,
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
},
|
|
||||||
|
|
||||||
"event": func() (cli.Command, error) {
|
"event": func() (cli.Command, error) {
|
||||||
return &EventCommand{
|
return &EventCommand{
|
||||||
BaseCommand: BaseCommand{
|
BaseCommand: BaseCommand{
|
||||||
|
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
package command
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/hashicorp/consul/agent/config"
|
|
||||||
"github.com/hashicorp/consul/configutil"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ConfigTestCommand is a Command implementation that is used to
|
|
||||||
// verify config files
|
|
||||||
type ConfigTestCommand struct {
|
|
||||||
BaseCommand
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *ConfigTestCommand) Help() string {
|
|
||||||
helpText := `
|
|
||||||
Usage: consul configtest [options]
|
|
||||||
|
|
||||||
DEPRECATED. Use the 'consul validate' command instead.
|
|
||||||
|
|
||||||
Performs a basic sanity test on Consul configuration files. For each file
|
|
||||||
or directory given, the configtest command will attempt to parse the
|
|
||||||
contents just as the "consul agent" command would, and catch any errors.
|
|
||||||
This is useful to do a test of the configuration only, without actually
|
|
||||||
starting the agent.
|
|
||||||
|
|
||||||
Returns 0 if the configuration is valid, or 1 if there are problems.
|
|
||||||
|
|
||||||
` + c.BaseCommand.Help()
|
|
||||||
|
|
||||||
return strings.TrimSpace(helpText)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *ConfigTestCommand) Run(args []string) int {
|
|
||||||
var configFiles []string
|
|
||||||
|
|
||||||
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.")
|
|
||||||
|
|
||||||
if err := c.BaseCommand.Parse(args); err != nil {
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(configFiles) <= 0 {
|
|
||||||
c.UI.Error("Must specify config using -config-file or -config-dir")
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
b, err := config.NewBuilder(config.Flags{ConfigFiles: configFiles})
|
|
||||||
if err != nil {
|
|
||||||
c.UI.Error(fmt.Sprintf("Config validation failed: %v", err.Error()))
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
if _, err := b.BuildAndValidate(); err != nil {
|
|
||||||
c.UI.Error(fmt.Sprintf("Config validation failed: %v", err.Error()))
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *ConfigTestCommand) Synopsis() string {
|
|
||||||
return "DEPRECATED. Use the validate command instead"
|
|
||||||
}
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
package command
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/hashicorp/consul/testutil"
|
|
||||||
"github.com/mitchellh/cli"
|
|
||||||
)
|
|
||||||
|
|
||||||
func testConfigTestCommand(t *testing.T) (*cli.MockUi, *ConfigTestCommand) {
|
|
||||||
ui := cli.NewMockUi()
|
|
||||||
return ui, &ConfigTestCommand{
|
|
||||||
BaseCommand: BaseCommand{
|
|
||||||
UI: ui,
|
|
||||||
Flags: FlagSetNone,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigTestCommand_implements(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
var _ cli.Command = &ConfigTestCommand{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigTestCommandFailOnEmptyFile(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
tmpFile := testutil.TempFile(t, "consul")
|
|
||||||
defer os.RemoveAll(tmpFile.Name())
|
|
||||||
|
|
||||||
_, cmd := testConfigTestCommand(t)
|
|
||||||
|
|
||||||
args := []string{
|
|
||||||
"-config-file", tmpFile.Name(),
|
|
||||||
}
|
|
||||||
|
|
||||||
if code := cmd.Run(args); code == 0 {
|
|
||||||
t.Fatalf("bad: %d", code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigTestCommandSucceedOnMinimalConfigFile(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
td := testutil.TempDir(t, "consul")
|
|
||||||
defer os.RemoveAll(td)
|
|
||||||
|
|
||||||
fp := filepath.Join(td, "config.json")
|
|
||||||
err := ioutil.WriteFile(fp, []byte(`{"bind_addr":"10.0.0.1", "data_dir": "`+td+`"}`), 0644)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("err: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, cmd := testConfigTestCommand(t)
|
|
||||||
|
|
||||||
args := []string{
|
|
||||||
"-config-file", fp,
|
|
||||||
}
|
|
||||||
|
|
||||||
if code := cmd.Run(args); code != 0 {
|
|
||||||
t.Fatalf("bad: %d", code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfigTestCommandSucceedOnMinimalConfigDir(t *testing.T) {
|
|
||||||
t.Parallel()
|
|
||||||
td := testutil.TempDir(t, "consul")
|
|
||||||
defer os.RemoveAll(td)
|
|
||||||
|
|
||||||
err := ioutil.WriteFile(filepath.Join(td, "config.json"), []byte(`{"bind_addr":"10.0.0.1", "data_dir": "`+td+`"}`), 0644)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("err: %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
_, cmd := testConfigTestCommand(t)
|
|
||||||
|
|
||||||
args := []string{
|
|
||||||
"-config-dir", td,
|
|
||||||
}
|
|
||||||
|
|
||||||
if code := cmd.Run(args); code != 0 {
|
|
||||||
t.Fatalf("bad: %d", code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue