more progress

jsjoeio · jsjoeio · commit e4bd87b0c6d2 · 2022-05-12T21:28:42.000Z
diff --git a/cli/cliarg/cliarg.go b/cli/cliarg/cliarg.go
@@ -8,7 +8,7 @@
 //
 //   Error: this command accepts 'workspace' as an argument, received no arguments. Pass in 'workspace' or call command with '--help' to see an example.")
 //
-package cliflag
+package cliarg
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ func ExactNamedArg(namedArg string, customErrorMessage string) cobra.PositionalA
 	return func(cmd *cobra.Command, args []string) error {
 		expectedNumOfArgs := 1
 		if len(args) != expectedNumOfArgs {
-			return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. Pass in arg or call command with '--help' to see an example.", namedArg)
+			return fmt.Errorf("this command accepts <%s> as an argument, received no arguments. <%s>", namedArg, customErrorMessage)
 		}
 		return nil
 	}
diff --git a/cli/cliarg/cliflag_test.go b/cli/cliarg/cliflag_test.go
@@ -0,0 +1,31 @@
+package cliarg_test
+
+import (
+	"testing"
+
+	"github.com/coder/coder/cli/cliarg"
+	"github.com/coder/coder/cli/clitest"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCliarg(t *testing.T) {
+	t.Run("No errors", func(t *testing.T) {
+		namedArg := "workspace"
+		customErrorMessage := "Please call with a workspace arg"
+		fun := cliarg.ExactNamedArg(namedArg, customErrorMessage)
+		args := []string{"myWorkspace"}
+		cmd, _ := clitest.New(t, "delete", "myWorkspace")
+		var want *string = nil
+		got := fun(cmd, args)
+		require.Nil(t, want, got)
+	})
+	t.Run("Custom error message", func(t *testing.T) {
+		namedArg := "workspace"
+		customErrorMessage := "Please call with a workspace arg"
+		fun := cliarg.ExactNamedArg(namedArg, customErrorMessage)
+		var args []string
+		cmd, _ := clitest.New(t, "delete")
+		got := fun(cmd, args)
+		require.ErrorContains(t, got, customErrorMessage)
+	})
+}
