render error

mtojek · mtojek · commit 6d2385333fbc · 2024-02-19T16:19:47.000+01:00
diff --git a/provider/parameter.go b/provider/parameter.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/go-cty/cty"
@@ -437,13 +438,13 @@ func (v *Validation) Valid(typ, value string) error {
 	case "number":
 		num, err := strconv.Atoi(value)
 		if err != nil {
-			return validationError(v.Error, "value %q is not a number", value)
+			return takeFirstError(v.errorRendered(value), fmt.Errorf("value %q is not a number", value))
 		}
 		if !v.MinDisabled && num < v.Min {
-			return validationError(v.Error, "value %d is less than the minimum %d", num, v.Min)
+			return takeFirstError(v.errorRendered(value), fmt.Errorf("value %d is less than the minimum %d", num, v.Min))
 		}
 		if !v.MaxDisabled && num > v.Max {
-			return validationError(v.Error, "value %d is more than the maximum %d", num, v.Max)
+			return takeFirstError(v.errorRendered(value), fmt.Errorf("value %d is more than the maximum %d", num, v.Max))
 		}
 		if v.Monotonic != "" && v.Monotonic != ValidationMonotonicIncreasing && v.Monotonic != ValidationMonotonicDecreasing {
 			return fmt.Errorf("number monotonicity can be either %q or %q", ValidationMonotonicIncreasing, ValidationMonotonicDecreasing)
@@ -466,9 +467,22 @@ func ParameterEnvironmentVariable(name string) string {
 	return "CODER_PARAMETER_" + hex.EncodeToString(sum[:])
 }
 
-func validationError(customMessage, defaultMessage string, a ...any) error {
-	if customMessage != "" {
-		return fmt.Errorf(customMessage)
+func takeFirstError(errs ...error) error {
+	for _, err := range errs {
+		if err != nil {
+			return err
+		}
+	}
+	return xerrors.Errorf("developer error: error message is not provided")
+}
+
+func (v *Validation) errorRendered(value string) error {
+	if v.Error == "" {
+		return nil
 	}
-	return fmt.Errorf(defaultMessage, a...)
+	r := strings.NewReplacer(
+		"{min}", fmt.Sprintf("%d", v.Min),
+		"{max}", fmt.Sprintf("%d", v.Max),
+		"{value}", value)
+	return xerrors.Errorf(r.Replace(v.Error))
 }
