Merge pull request #10 from choria-io/9

(#9) Improve validators for integers and floats

Author: ripienaar

forms/forms.go

@@ -397,11 +397,16 @@ func (p *processor) askFloatValue(prop Property) (float64, error) {
 
 	var ans string
 
+	validation := "isFloat(value)"
+	if prop.ValidationExpression != "" {
+		validation = fmt.Sprintf("%s && %s", validation, prop.ValidationExpression)
+	}
+
 	err = survey.AskOne(&survey.Input{
 		Message: prop.Name,
 		Help:    prop.Help,
 		Default: prop.Default,
-	}, &ans, survey.WithValidator(validator.SurveyValidator("isFloat(value)", true)))
+	}, &ans, survey.WithValidator(validator.SurveyValidator(validation, true)))
 	if err != nil {
 		return 0, err
 	}
@@ -420,11 +425,16 @@ func (p *processor) askIntValue(prop Property) (int, error) {
 
 	var ans string
 
+	validation := "isInt(value)"
+	if prop.ValidationExpression != "" {
+		validation = fmt.Sprintf("%s && %s", validation, prop.ValidationExpression)
+	}
+
 	err = survey.AskOne(&survey.Input{
 		Message: prop.Name,
 		Help:    prop.Help,
 		Default: prop.Default,
-	}, &ans, survey.WithValidator(validator.SurveyValidator("isInt(value)", true)))
+	}, &ans, survey.WithValidator(validator.SurveyValidator(validation, true)))
 	if err != nil {
 		return 0, err
 	}

internal/validator/validator.go

@@ -23,7 +23,7 @@ func FiskValidator(validation string) fisk.OptionValidator {
 		}
 
 		if !ok {
-			return fmt.Errorf("validation using %q did not pass", validation)
+			return fmt.Errorf("validation did not pass: %s", validation)
 		}
 
 		return nil
@@ -48,7 +48,7 @@ func SurveyValidator(validation string, required bool) func(any) error {
 		}
 
 		if !ok {
-			return fmt.Errorf("validation using %q did not pass", validation)
+			return fmt.Errorf("validation did not pass: %s", validation)
 		}
 
 		return nil