Added prompt validation

Author: bmonkman

internal/context/init.go

@@ -128,6 +128,7 @@ func getProjectNamePrompt() PromptHandler {
 			Default: "",
 		},
 		NoCondition,
+		NoValidation,
 	}
 }
 
@@ -140,6 +141,7 @@ func getProjectPrompts(projectName string, modules map[string]moduleconfig.Modul
 				Default: "y",
 			},
 			NoCondition,
+			SpecificValueValidation("y", "n"),
 		},
 		"GithubRootOrg": {
 			moduleconfig.Parameter{
@@ -148,6 +150,7 @@ func getProjectPrompts(projectName string, modules map[string]moduleconfig.Modul
 				Default: "github.com/",
 			},
 			KeyMatchCondition("ShouldPushRepositories", "y"),
+			NoValidation,
 		},
 		"GithubPersonalToken": {
 			moduleconfig.Parameter{
@@ -156,6 +159,7 @@ func getProjectPrompts(projectName string, modules map[string]moduleconfig.Modul
 				Default: globalconfig.GetUserCredentials(projectName).AccessToken,
 			},
 			KeyMatchCondition("ShouldPushRepositories", "y"),
+			NoValidation,
 		},
 	}
 
@@ -169,6 +173,7 @@ func getProjectPrompts(projectName string, modules map[string]moduleconfig.Modul
 				Default: module.OutputDir,
 			},
 			NoCondition,
+			NoValidation,
 		}
 	}
 

internal/context/prompts.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
+	"strings"
 
 	"github.com/commitdev/zero/internal/config/moduleconfig"
 	"github.com/commitdev/zero/pkg/util/exit"
@@ -15,17 +16,34 @@ import (
 type PromptHandler struct {
 	moduleconfig.Parameter
 	Condition func(map[string]string) bool
+	Validate  func(string) error
 }
 
 func NoCondition(map[string]string) bool {
 	return true
 }
+
 func KeyMatchCondition(key string, value string) func(map[string]string) bool {
 	return func(param map[string]string) bool {
 		return param[key] == value
 	}
 }
 
+func NoValidation(string) error {
+	return nil
+}
+
+func SpecificValueValidation(values ...string) func(string) error {
+	return func(checkValue string) error {
+		for _, allowedValue := range values {
+			if checkValue == allowedValue {
+				return nil
+			}
+		}
+		return fmt.Errorf("Please choose one of %s", strings.Join(values, "/"))
+	}
+}
+
 // TODO: validation / allow prompt retry ...etc
 func (p PromptHandler) GetParam(projectParams map[string]string) string {
 	var err error
@@ -40,7 +58,7 @@ func (p PromptHandler) GetParam(projectParams map[string]string) string {
 		} else if p.Parameter.Value != "" {
 			result = p.Parameter.Value
 		} else {
-			err, result = promptParameter(p.Parameter)
+			err, result = promptParameter(p)
 		}
 		if err != nil {
 			exit.Fatal("Exiting prompt:  %v\n", err)
@@ -51,7 +69,8 @@ func (p PromptHandler) GetParam(projectParams map[string]string) string {
 	return ""
 }
 
-func promptParameter(param moduleconfig.Parameter) (error, string) {
+func promptParameter(prompt PromptHandler) (error, string) {
+	param := prompt.Parameter
 	label := param.Label
 	if param.Label == "" {
 		label = param.Field
@@ -72,6 +91,7 @@ func promptParameter(param moduleconfig.Parameter) (error, string) {
 			Label:     label,
 			Default:   defaultValue,
 			AllowEdit: true,
+			Validate:  prompt.Validate,
 		}
 		result, err = prompt.Run()
 	}
@@ -119,6 +139,7 @@ func PromptModuleParams(moduleConfig moduleconfig.ModuleConfig, parameters map[s
 		promptHandler := PromptHandler{
 			promptConfig,
 			NoCondition,
+			NoValidation,
 		}
 		result := promptHandler.GetParam(parameters)
 

internal/context/prompts_test.go

@@ -20,6 +20,7 @@ func TestGetParam(t *testing.T) {
 		prompt := context.PromptHandler{
 			param,
 			context.NoCondition,
+			context.NoValidation,
 		}
 
 		result := prompt.GetParam(projectParams)
@@ -35,6 +36,7 @@ func TestGetParam(t *testing.T) {
 		prompt := context.PromptHandler{
 			param,
 			context.NoCondition,
+			context.NoValidation,
 		}
 
 		result := prompt.GetParam(map[string]string{
@@ -52,6 +54,7 @@ func TestGetParam(t *testing.T) {
 		prompt := context.PromptHandler{
 			param,
 			context.NoCondition,
+			context.NoValidation,
 		}
 
 		result := prompt.GetParam(projectParams)