WIP

mtojek · mtojek · commit 6fbb918f1361 · 2023-05-26T16:23:48.000+02:00
diff --git a/provider/parameter.go b/provider/parameter.go
@@ -26,8 +26,8 @@ type Option struct {
 }
 
 type Validation struct {
-	Min       int
-	Max       int
+	Min       *int
+	Max       *int
 	Monotonic string
 
 	Regex string
@@ -272,17 +272,14 @@ func parameterDataSource() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"min": {
-							Type:         schema.TypeInt,
-							Optional:     true,
-							Default:      0,
-							Description:  "The minimum of a number parameter.",
-							RequiredWith: []string{"validation.0.max"},
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Description: "The minimum of a number parameter.",
 						},
 						"max": {
-							Type:         schema.TypeInt,
-							Optional:     true,
-							Description:  "The maximum of a number parameter.",
-							RequiredWith: []string{"validation.0.min"},
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Description: "The maximum of a number parameter.",
 						},
 						"monotonic": {
 							Type:        schema.TypeString,
@@ -353,10 +350,10 @@ func valueIsType(typ, value string) diag.Diagnostics {
 
 func (v *Validation) Valid(typ, value string) error {
 	if typ != "number" {
-		if v.Min != 0 {
+		if v.Min != nil {
 			return fmt.Errorf("a min cannot be specified for a %s type", typ)
 		}
-		if v.Max != 0 {
+		if v.Max != nil {
 			return fmt.Errorf("a max cannot be specified for a %s type", typ)
 		}
 	}
@@ -389,10 +386,10 @@ func (v *Validation) Valid(typ, value string) error {
 		if err != nil {
 			return fmt.Errorf("value %q is not a number", value)
 		}
-		if num < v.Min {
+		if v.Min != nil && num < *v.Min {
 			return fmt.Errorf("value %d is less than the minimum %d", num, v.Min)
 		}
-		if num > v.Max {
+		if v.Max != nil && num > *v.Max {
 			return fmt.Errorf("value %d is more than the maximum %d", num, v.Max)
 		}
 		if v.Monotonic != "" && v.Monotonic != ValidationMonotonicIncreasing && v.Monotonic != ValidationMonotonicDecreasing {
diff --git a/provider/parameter_test.go b/provider/parameter_test.go
@@ -443,18 +443,18 @@ func TestValueValidatesType(t *testing.T) {
 		Regex,
 		RegexError string
 		Min,
-		Max int
+		Max *int
 		Monotonic string
 		Error     *regexp.Regexp
 	}{{
 		Name:  "StringWithMin",
 		Type:  "string",
-		Min:   1,
+		Min:   ptrNumber(1),
 		Error: regexp.MustCompile("cannot be specified"),
 	}, {
 		Name:  "StringWithMax",
 		Type:  "string",
-		Max:   1,
+		Max:   ptrNumber(1),
 		Error: regexp.MustCompile("cannot be specified"),
 	}, {
 		Name:  "NonStringWithRegex",
@@ -474,13 +474,13 @@ func TestValueValidatesType(t *testing.T) {
 		Name:  "NumberBelowMin",
 		Type:  "number",
 		Value: "0",
-		Min:   1,
+		Min:   ptrNumber(1),
 		Error: regexp.MustCompile("is less than the minimum"),
 	}, {
 		Name:  "NumberAboveMax",
 		Type:  "number",
 		Value: "1",
-		Max:   0,
+		Max:   ptrNumber(1),
 		Error: regexp.MustCompile("is more than the maximum"),
 	}, {
 		Name:  "InvalidBool",
@@ -498,23 +498,23 @@ func TestValueValidatesType(t *testing.T) {
 		Name:      "InvalidMonotonicity",
 		Type:      "number",
 		Value:     "1",
-		Min:       0,
-		Max:       2,
+		Min:       ptrNumber(0),
+		Max:       ptrNumber(2),
 		Monotonic: "foobar",
 		Error:     regexp.MustCompile(`number monotonicity can be either "increasing" or "decreasing"`),
 	}, {
 		Name:      "IncreasingMonotonicity",
 		Type:      "number",
 		Value:     "1",
-		Min:       0,
-		Max:       2,
+		Min:       ptrNumber(0),
+		Max:       ptrNumber(2),
 		Monotonic: "increasing",
 	}, {
 		Name:      "DecreasingMonotonicity",
 		Type:      "number",
 		Value:     "1",
-		Min:       0,
-		Max:       2,
+		Min:       ptrNumber(0),
+		Max:       ptrNumber(2),
 		Monotonic: "decreasing",
 	}, {
 		Name:  "ValidListOfStrings",
@@ -550,3 +550,7 @@ func TestValueValidatesType(t *testing.T) {
 		})
 	}
 }
+
+func ptrNumber(i int) *int {
+	return &i
+}
