consul: Enable a recursive delete of all keys

command/agent/kvs_endpoint.go

@@ -112,9 +112,6 @@ func (s *HTTPServer) KVSPut(resp http.ResponseWriter, req *http.Request, args *s
 
 // KVSPut handles a DELETE request
 func (s *HTTPServer) KVSDelete(resp http.ResponseWriter, req *http.Request, args *structs.KeyRequest) (interface{}, error) {
-	if missingKey(resp, args) {
-		return nil, nil
-	}
 	applyReq := structs.KVSRequest{
 		Datacenter: args.Datacenter,
 		Op:         structs.KVSDelete,
@@ -127,6 +124,8 @@ func (s *HTTPServer) KVSDelete(resp http.ResponseWriter, req *http.Request, args
 	params := req.URL.Query()
 	if _, ok := params["recurse"]; ok {
 		applyReq.Op = structs.KVSDeleteTree
+	} else if missingKey(resp, args) {
+		return nil, nil
 	}
 
 	// Make the RPC

consul/kvs_endpoint.go

@@ -21,7 +21,7 @@ func (k *KVS) Apply(args *structs.KVSRequest, reply *bool) error {
 	defer metrics.MeasureSince([]string{"consul", "kvs", "apply"}, time.Now())
 
 	// Verify the args
-	if args.DirEnt.Key == "" {
+	if args.DirEnt.Key == "" && args.Op != structs.KVSDeleteTree {
 		return fmt.Errorf("Must provide key")
 	}
 

consul/state_store.go

@@ -773,11 +773,14 @@ func (s *StateStore) KVSDelete(index uint64, key string) error {
 
 // KVSDeleteTree is used to delete all keys with a given prefix
 func (s *StateStore) KVSDeleteTree(index uint64, prefix string) error {
+	if prefix == "" {
+		return s.kvsDeleteWithIndex(index, "id")
+	}
 	return s.kvsDeleteWithIndex(index, "id_prefix", prefix)
 }
 
 // kvsDeleteWithIndex does a delete with either the id or id_prefix
-func (s *StateStore) kvsDeleteWithIndex(index uint64, tableIndex, val string) error {
+func (s *StateStore) kvsDeleteWithIndex(index uint64, tableIndex string, parts ...string) error {
 	// Start a new txn
 	tx, err := s.kvsTable.StartTxn(false, nil)
 	if err != nil {
@@ -785,7 +788,7 @@ func (s *StateStore) kvsDeleteWithIndex(index uint64, tableIndex, val string) er
 	}
 	defer tx.Abort()
 
-	num, err := s.kvsTable.DeleteTxn(tx, tableIndex, val)
+	num, err := s.kvsTable.DeleteTxn(tx, tableIndex, parts...)
 	if err != nil {
 		return err
 	}