cd837b0b18
command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )
147 lines
3.6 KiB
Go
147 lines
3.6 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/consul/api"
|
|
)
|
|
|
|
// KVDeleteCommand is a Command implementation that is used to delete a key or
|
|
// prefix of keys from the key-value store.
|
|
type KVDeleteCommand struct {
|
|
BaseCommand
|
|
}
|
|
|
|
func (c *KVDeleteCommand) Help() string {
|
|
helpText := `
|
|
Usage: consul kv delete [options] KEY_OR_PREFIX
|
|
|
|
Removes the value from Consul's key-value store at the given path. If no
|
|
key exists at the path, no action is taken.
|
|
|
|
To delete the value for the key named "foo" in the key-value store:
|
|
|
|
$ consul kv delete foo
|
|
|
|
To delete all keys which start with "foo", specify the -recurse option:
|
|
|
|
$ consul kv delete -recurse foo
|
|
|
|
This will delete the keys named "foo", "food", and "foo/bar/zip" if they
|
|
existed.
|
|
|
|
` + c.BaseCommand.Help()
|
|
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *KVDeleteCommand) Run(args []string) int {
|
|
f := c.BaseCommand.NewFlagSet(c)
|
|
cas := f.Bool("cas", false,
|
|
"Perform a Check-And-Set operation. Specifying this value also requires "+
|
|
"the -modify-index flag to be set. The default value is false.")
|
|
modifyIndex := f.Uint64("modify-index", 0,
|
|
"Unsigned integer representing the ModifyIndex of the key. This is "+
|
|
"used in combination with the -cas flag.")
|
|
recurse := f.Bool("recurse", false,
|
|
"Recursively delete all keys with the path. The default value is false.")
|
|
|
|
if err := c.BaseCommand.Parse(args); err != nil {
|
|
return 1
|
|
}
|
|
|
|
key := ""
|
|
|
|
// Check for arg validation
|
|
args = f.Args()
|
|
switch len(args) {
|
|
case 0:
|
|
key = ""
|
|
case 1:
|
|
key = args[0]
|
|
default:
|
|
c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
|
|
return 1
|
|
}
|
|
|
|
// This is just a "nice" thing to do. Since pairs cannot start with a /, but
|
|
// users will likely put "/" or "/foo", lets go ahead and strip that for them
|
|
// here.
|
|
if len(key) > 0 && key[0] == '/' {
|
|
key = key[1:]
|
|
}
|
|
|
|
// If the key is empty and we are not doing a recursive delete, this is an
|
|
// error.
|
|
if key == "" && !*recurse {
|
|
c.UI.Error("Error! Missing KEY argument")
|
|
return 1
|
|
}
|
|
|
|
// ModifyIndex is required for CAS
|
|
if *cas && *modifyIndex == 0 {
|
|
c.UI.Error("Must specify -modify-index with -cas!")
|
|
return 1
|
|
}
|
|
|
|
// Specifying a ModifyIndex for a non-CAS operation is not possible.
|
|
if *modifyIndex != 0 && !*cas {
|
|
c.UI.Error("Cannot specify -modify-index without -cas!")
|
|
}
|
|
|
|
// It is not valid to use a CAS and recurse in the same call
|
|
if *recurse && *cas {
|
|
c.UI.Error("Cannot specify both -cas and -recurse!")
|
|
return 1
|
|
}
|
|
|
|
// Create and test the HTTP client
|
|
client, err := c.BaseCommand.HTTPClient()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
|
|
return 1
|
|
}
|
|
|
|
switch {
|
|
case *recurse:
|
|
if _, err := client.KV().DeleteTree(key, nil); err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error! Did not delete prefix %s: %s", key, err))
|
|
return 1
|
|
}
|
|
|
|
c.UI.Info(fmt.Sprintf("Success! Deleted keys with prefix: %s", key))
|
|
return 0
|
|
case *cas:
|
|
pair := &api.KVPair{
|
|
Key: key,
|
|
ModifyIndex: *modifyIndex,
|
|
}
|
|
|
|
success, _, err := client.KV().DeleteCAS(pair, nil)
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error! Did not delete key %s: %s", key, err))
|
|
return 1
|
|
}
|
|
if !success {
|
|
c.UI.Error(fmt.Sprintf("Error! Did not delete key %s: CAS failed", key))
|
|
return 1
|
|
}
|
|
|
|
c.UI.Info(fmt.Sprintf("Success! Deleted key: %s", key))
|
|
return 0
|
|
default:
|
|
if _, err := client.KV().Delete(key, nil); err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error deleting key %s: %s", key, err))
|
|
return 1
|
|
}
|
|
|
|
c.UI.Info(fmt.Sprintf("Success! Deleted key: %s", key))
|
|
return 0
|
|
}
|
|
}
|
|
|
|
func (c *KVDeleteCommand) Synopsis() string {
|
|
return "Removes data from the KV store"
|
|
}
|