ctlv3: error on --order or --sort-by missing

Address etcd-io#6671.
gyuho · Oct 18, 2016 · 4981faf · 4981faf
1 parent 20bdb31
commit 4981faf
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go
@@ -15,6 +15,7 @@
 package command
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -105,6 +106,13 @@ func getGetOp(cmd *cobra.Command, args []string) (string, []clientv3.OpOption) {
 		opts = append(opts, clientv3.WithRev(getRev))
 	}
 
+	if getSortOrder == "" && getSortTarget != "" {
+		ExitWithError(ExitBadArgs, errors.New("missing sort order (--order)"))
+	}
+	if getSortOrder != "" && getSortTarget == "" {
+		ExitWithError(ExitBadArgs, errors.New("missing sort target (--sort-by)"))
+	}
+
 	sortByOrder := clientv3.SortNone
 	sortOrder := strings.ToUpper(getSortOrder)
 	switch {