Relax option/validation conflicts, add tests

Signed-off-by: Danny Kopping <[email protected]>

Author: dannykopping

provider/parameter.go

@@ -231,12 +231,11 @@ func parameterDataSource() *schema.Resource {
 				},
 			},
 			"option": {
-				Type:          schema.TypeList,
-				Description:   "Each \"option\" block defines a value for a user to select from.",
-				ForceNew:      true,
-				Optional:      true,
-				MaxItems:      64,
-				ConflictsWith: []string{"validation"},
+				Type:        schema.TypeList,
+				Description: "Each \"option\" block defines a value for a user to select from.",
+				ForceNew:    true,
+				Optional:    true,
+				MaxItems:    64,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"name": {
@@ -276,11 +275,10 @@ func parameterDataSource() *schema.Resource {
 				},
 			},
 			"validation": {
-				Type:          schema.TypeList,
-				MaxItems:      1,
-				Optional:      true,
-				Description:   "Validate the input of a parameter.",
-				ConflictsWith: []string{"option"},
+				Type:        schema.TypeList,
+				MaxItems:    1,
+				Optional:    true,
+				Description: "Validate the input of a parameter.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"min": {
@@ -410,6 +408,9 @@ func (v *Validation) Valid(typ, value string) error {
 		if !v.MaxDisabled {
 			return fmt.Errorf("a max cannot be specified for a %s type", typ)
 		}
+		if v.Monotonic != "" {
+			return fmt.Errorf("monotonic validation can only be specified for number types, not %s types", typ)
+		}
 	}
 	if typ != "string" && v.Regex != "" {
 		return fmt.Errorf("a regex cannot be specified for a %s type", typ)

provider/parameter_test.go

@@ -73,7 +73,7 @@ func TestParameter(t *testing.T) {
 			}
 		},
 	}, {
-		Name: "ValidationWithOptions",
+		Name: "RegexValidationWithOptions",
 		Config: `
 			data "coder_parameter" "region" {
 				name = "Region"
@@ -88,7 +88,23 @@ func TestParameter(t *testing.T) {
 				}
 			}
 			`,
-		ExpectError: regexp.MustCompile("conflicts with option"),
+		ExpectError: regexp.MustCompile("a regex cannot be specified for a number type"),
+	}, {
+		Name: "MonotonicValidationWithNonNumberType",
+		Config: `
+			data "coder_parameter" "region" {
+				name = "Region"
+				type = "string"
+				option {
+					name = "1"
+					value = "1"
+				}
+				validation {
+					monotonic = "increasing"
+				}
+			}
+			`,
+		ExpectError: regexp.MustCompile("monotonic validation can only be specified for number types, not string types"),
 	}, {
 		Name: "ValidationRegexMissingError",
 		Config: `
@@ -424,6 +440,54 @@ data "coder_parameter" "region" {
 				require.Equal(t, expected, state.Primary.Attributes[key])
 			}
 		},
+	}, {
+		Name: "NumberValidation_MonotonicWithOptions",
+		Config: `
+			data "coder_parameter" "region" {
+			  name        = "Region"
+              type        = "number"
+			  description = <<-EOF
+			  Always pick a larger region.
+			  EOF
+			  default     = 1
+
+			  option {
+				name  = "Small"
+				value = 1
+			  }
+
+			  option {
+				name  = "Medium"
+				value = 2
+			  }
+
+			  option {
+				name  = "Large"
+				value = 3
+			  }
+
+			  validation {
+			    monotonic = "increasing"
+			  }
+			}
+			`,
+		Check: func(state *terraform.ResourceState) {
+			for key, expected := range map[string]any{
+				"name":                   "Region",
+				"type":                   "number",
+				"validation.#":           "1",
+				"option.0.name":          "Small",
+				"option.0.value":         "1",
+				"option.1.name":          "Medium",
+				"option.1.value":         "2",
+				"option.2.name":          "Large",
+				"option.2.value":         "3",
+				"default":                "1",
+				"validation.0.monotonic": "increasing",
+			} {
+				require.Equal(t, expected, state.Primary.Attributes[key])
+			}
+		},
 	}, {
 		Name: "NumberValidation_Min",
 		Config: `