提交 4e91469b 作者: chenminjian

refact(cmd/config): change string option to const

License: MIT
Signed-off-by: 's avatarchenminjian <727180553@qq.com>
上级 ca77ecc7
...@@ -32,8 +32,9 @@ type ConfigField struct { ...@@ -32,8 +32,9 @@ type ConfigField struct {
} }
const ( const (
configBoolOptionName = "bool" configBoolOptionName = "bool"
configJSONOptionName = "json" configJSONOptionName = "json"
configDryRunOptionName = "dry-run"
) )
var ConfigCmd = &cmds.Command{ var ConfigCmd = &cmds.Command{
...@@ -82,7 +83,7 @@ Set the value of the 'Datastore.Path' key: ...@@ -82,7 +83,7 @@ Set the value of the 'Datastore.Path' key:
// This is a temporary fix until we move the private key out of the config file // This is a temporary fix until we move the private key out of the config file
switch strings.ToLower(key) { switch strings.ToLower(key) {
case "identity", "identity.privkey": case "identity", "identity.privkey":
return fmt.Errorf("cannot show or change private key through API") return errors.New("cannot show or change private key through API")
default: default:
} }
...@@ -207,7 +208,7 @@ func scrubValue(m map[string]interface{}, key []string) error { ...@@ -207,7 +208,7 @@ func scrubValue(m map[string]interface{}, key []string) error {
for _, k := range key[:len(key)-1] { for _, k := range key[:len(key)-1] {
foundk, val, ok := find(cur, k) foundk, val, ok := find(cur, k)
if !ok { if !ok {
return fmt.Errorf("failed to find specified key") return errors.New("failed to find specified key")
} }
if foundk != k { if foundk != k {
...@@ -309,7 +310,7 @@ var configProfileApplyCmd = &cmds.Command{ ...@@ -309,7 +310,7 @@ var configProfileApplyCmd = &cmds.Command{
Tagline: "Apply profile to config.", Tagline: "Apply profile to config.",
}, },
Options: []cmdkit.Option{ Options: []cmdkit.Option{
cmdkit.BoolOption("dry-run", "print difference between the current config and the config that would be generated"), cmdkit.BoolOption(configDryRunOptionName, "print difference between the current config and the config that would be generated"),
}, },
Arguments: []cmdkit.Argument{ Arguments: []cmdkit.Argument{
cmdkit.StringArg("profile", true, false, "The profile to apply to the config."), cmdkit.StringArg("profile", true, false, "The profile to apply to the config."),
...@@ -320,7 +321,7 @@ var configProfileApplyCmd = &cmds.Command{ ...@@ -320,7 +321,7 @@ var configProfileApplyCmd = &cmds.Command{
return fmt.Errorf("%s is not a profile", req.Arguments[0]) return fmt.Errorf("%s is not a profile", req.Arguments[0])
} }
dryRun, _ := req.Options["dry-run"].(bool) dryRun, _ := req.Options[configDryRunOptionName].(bool)
cfgRoot, err := cmdenv.GetConfigRoot(env) cfgRoot, err := cmdenv.GetConfigRoot(env)
if err != nil { if err != nil {
return err return err
...@@ -473,12 +474,12 @@ func replaceConfig(r repo.Repo, file io.Reader) error { ...@@ -473,12 +474,12 @@ func replaceConfig(r repo.Repo, file io.Reader) error {
keyF, err := getConfig(r, config.PrivKeySelector) keyF, err := getConfig(r, config.PrivKeySelector)
if err != nil { if err != nil {
return fmt.Errorf("failed to get PrivKey") return errors.New("failed to get PrivKey")
} }
pkstr, ok := keyF.Value.(string) pkstr, ok := keyF.Value.(string)
if !ok { if !ok {
return fmt.Errorf("private key in config was not a string") return errors.New("private key in config was not a string")
} }
cfg.Identity.PrivKey = pkstr cfg.Identity.PrivKey = pkstr
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论