remove duped validation

Emyrk · Emyrk · commit fbd613ec2cf4 · 2025-05-01T15:36:50.000-05:00
diff --git a/provider/parameter.go b/provider/parameter.go
@@ -410,6 +410,16 @@ func valueIsType(typ OptionType, value string) error {
 }
 
 func (v *Parameter) Valid(input *string, mode ValidationMode) (string, diag.Diagnostics) {
+	if mode != ValidationModeDefault && mode != ValidationModeTemplateImport {
+		return "", diag.Diagnostics{
+			{
+				Severity: diag.Error,
+				Summary:  "Invalid validation mode",
+				Detail:   fmt.Sprintf("validation mode %q is not supported, use %q, or %q", mode, ValidationModeDefault, ValidationModeTemplateImport),
+			},
+		}
+	}
+
 	var err error
 	var optionType OptionType
 
@@ -465,30 +475,6 @@ func (v *Parameter) Valid(input *string, mode ValidationMode) (string, diag.Diag
 		}
 	}
 
-	// TODO: Move this into 'Parameter.validValue'. It exists as another check outside because
-	// the current behavior is to always apply this validation, regardless if the param is set or not.
-	// Other validations are only applied if the parameter is set.
-	// This behavior should be standardized.
-	if len(v.Validation) == 1 {
-		empty := ""
-		validVal := value
-		if value == nil {
-			validVal = &empty
-		}
-		validCheck := &v.Validation[0]
-		err := validCheck.Valid(v.Type, *validVal)
-		if err != nil {
-			return "", diag.Diagnostics{
-				{
-					Severity:      diag.Error,
-					Summary:       fmt.Sprintf("Invalid parameter %s according to 'validation' block", strings.ToLower(v.Name)),
-					Detail:        err.Error(),
-					AttributePath: cty.Path{},
-				},
-			}
-		}
-	}
-
 	// TODO: This is a bit of a hack. The current behavior states if validation
 	//   is given, then apply validation to unset values.
 	//   This should be removed, and all values should be validated. Meaning
diff --git a/provider/testdata/parameter_table.md b/provider/testdata/parameter_table.md
@@ -9,8 +9,8 @@
 | EmptyOpts            | string,number |           |         | 1,2,3             |            |    | ""     | false    |                 |               |
 | EmptyRegex           | string        |           |         |                   | world      |    |        |          | regex error     | =             |
 | EmptyMin             | number        |           |         |                   | 1-10       |    |        |          | 1 <  < 10       | =             |
-| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | 2 <  < 5        | 2 < 1 < 5     |
-| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | regex error     | =             |
+| EmptyMinOpt          | number        |           |         | 1,2,3             | 2-5        |    |        |          | valid option    | 2 < 1 < 5     |
+| EmptyRegexOpt        | string        |           |         | "hello","goodbye" | goodbye    |    |        |          | valid option    | regex error   |
 | EmptyRegexOk         | string        |           |         |                   | .*         |    | ""     | false    |                 |               |
 |                      |               |           |         |                   |            |    |        |          |                 |               |
 |                      | Default Set   | No inputs |         |                   |            |    |        |          |                 |               |
@@ -48,7 +48,7 @@
 | NumIns=DefInv        | number        | 5         | 5       |                   | 1-3        |    |        |          | 1 < 5 < 3       | =             |
 | NumInsOpts           | number        | 3         | 5       | 1,2,3,4,5         | 1-3        |    | 3      | true     |                 | 1 < 5 < 3     |
 | NumInsNotOptsVal     | number        | 3         | 5       | 1,2,4,5           | 1-3        |    |        |          | valid option    | 1 < 4 < 3     |
-| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | 1 < 3 < 2       | 1 < 4 < 2     |
+| NumInsNotOptsInv     | number        | 3         | 5       | 1,2,4,5           | 1-2        |    |        | true     | valid option    | 1 < 4 < 2     |
 | NumInsNotOpts        | number        | 3         | 5       | 1,2,4,5           |            |    |        |          | valid option    | =             |
 | NumInsNotOpts/NoDef  | number        | 3         |         | 1,2,4,5           |            |    |        |          | valid option    | =             |
 |                      |               |           |         |                   |            |    |        |          |                 |               |
@@ -59,7 +59,7 @@
 | StrIns=DefInv        | string        | e         | e       |                   | [a-c]      |    |        |          | regex error     | =             |
 | StrInsOpts           | string        | c         | e       | a,b,c,d,e         | [a-c]      |    | c      | true     |                 | value "d"     |
 | StrInsNotOptsVal     | string        | c         | e       | a,b,d,e           | [a-c]      |    |        |          | valid option    | value "d"     |
-| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | regex error     | =             |
+| StrInsNotOptsInv     | string        | c         | e       | a,b,d,e           | [a-b]      |    |        |          | valid option    | regex error   |
 | StrInsNotOpts        | string        | c         | e       | a,b,d,e           |            |    |        |          | valid option    | =             |
 | StrInsNotOpts/NoDef  | string        | c         |         | a,b,d,e           |            |    |        |          | valid option    | =             |
 | StrInsBadVal         | string        | c         |         | a,b,c,d,e         | 1-10       |    |        |          | min cannot      | =             |
