Fix-up cmd args

Closes #821
Also uses built-in cli validators rather than inline functions

cmd/tk/env.go

@@ -47,7 +47,7 @@ var kubectlContexts = cli.PredictFunc(
 
 func envSetCmd() *cli.Command {
 	cmd := &cli.Command{
-		Use:   "set",
+		Use:   "set <path>",
 		Short: "update properties of an environment",
 		Args:  workflowArgs,
 		Predictors: complete.Flags{
@@ -234,12 +234,7 @@ func envRemoveCmd() *cli.Command {
 
 func envListCmd() *cli.Command {
 	args := workflowArgs
-	args.Validator = cli.ValidateFunc(func(args []string) error {
-		if len(args) > 1 {
-			return fmt.Errorf("expects at most 1 arg, received %v", len(args))
-		}
-		return nil
-	})
+	args.Validator = cli.ArgsRange(0, 1)
 
 	cmd := &cli.Command{
 		Use:     "list [<path>]",

cmd/tk/export.go

@@ -15,12 +15,7 @@ import (
 
 func exportCmd() *cli.Command {
 	args := workflowArgs
-	args.Validator = cli.ValidateFunc(func(args []string) error {
-		if len(args) < 2 {
-			return fmt.Errorf("expects at least 2 args, received %v", len(args))
-		}
-		return nil
-	})
+	args.Validator = cli.ArgsMin(2)
 
 	cmd := &cli.Command{
 		Use:   "export <outputDir> <path> [<path>...]",

cmd/tk/fmt.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -21,12 +20,7 @@ func fmtCmd() *cli.Command {
 		Use:   "fmt <FILES|DIRECTORIES>",
 		Short: "format Jsonnet code",
 		Args: cli.Args{
-			Validator: cli.ValidateFunc(func(args []string) error {
-				if len(args) == 0 {
-					return errors.New("at least one file or directory is required")
-				}
-				return nil
-			}),
+			Validator: cli.ArgsMin(1),
 			Predictor: complete.PredictFiles("*.*sonnet"),
 		},
 	}

cmd/tk/lint.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"errors"
-
 	"github.com/go-clix/cli"
 	"github.com/gobwas/glob"
 	"github.com/posener/complete"
@@ -15,12 +13,7 @@ func lintCmd() *cli.Command {
 		Use:   "lint <FILES|DIRECTORIES>",
 		Short: "lint Jsonnet code",
 		Args: cli.Args{
-			Validator: cli.ValidateFunc(func(args []string) error {
-				if len(args) == 0 {
-					return errors.New("at least one file or directory is required")
-				}
-				return nil
-			}),
+			Validator: cli.ArgsMin(1),
 			Predictor: complete.PredictFiles("*.*sonnet"),
 		},
 	}