coder · mtojek · Jun 2, 2023 · Jun 1, 2023 · Jun 1, 2023 · Jun 1, 2023
diff --git a/codersdk/richparameters.go b/codersdk/richparameters.go
@@ -78,22 +78,24 @@ func ValidateWorkspaceBuildParameter(richParameter TemplateVersionParameter, bui
 		return nil
 	}
 
-	validation := &provider.Validation{
-		Min:       ptrInt(richParameter.ValidationMin),
-		Max:       ptrInt(richParameter.ValidationMax),
-		Regex:     richParameter.ValidationRegex,
-		Error:     richParameter.ValidationError,
-		Monotonic: string(richParameter.ValidationMonotonic),
+	var min, max int
+	if richParameter.ValidationMin != nil {
+		min = int(*richParameter.ValidationMin)
+	}
+	if richParameter.ValidationMax != nil {
+		max = int(*richParameter.ValidationMax)
 	}
-	return validation.Valid(richParameter.Type, value)
-}
 
-func ptrInt(number *int32) *int {
-	if number == nil {
-		return nil
+	validation := &provider.Validation{
+		Min:         min,
+		Max:         max,
+		MinDisabled: richParameter.ValidationMin == nil,
+		MaxDisabled: richParameter.ValidationMax == nil,
+		Regex:       richParameter.ValidationRegex,
+		Error:       richParameter.ValidationError,
+		Monotonic:   string(richParameter.ValidationMonotonic),
 	}
-	n := int(*number)
-	return &n
+	return validation.Valid(richParameter.Type, value)
 }
 
 func findBuildParameter(params []WorkspaceBuildParameter, parameterName string) (*WorkspaceBuildParameter, bool) {

diff --git a/codersdk/richparameters_test.go b/codersdk/richparameters_test.go
@@ -187,6 +187,18 @@ func TestRichParameterValidation(t *testing.T) {
 			{Name: boolParameterName, Type: "bool", Mutable: true},
 		}
 
+		numberRichParametersMinOnly := []codersdk.TemplateVersionParameter{
+			{Name: stringParameterName, Type: "string", Mutable: true},
+			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(5))},
+			{Name: boolParameterName, Type: "bool", Mutable: true},
+		}
+
+		numberRichParametersMaxOnly := []codersdk.TemplateVersionParameter{
+			{Name: stringParameterName, Type: "string", Mutable: true},
+			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMax: ptr.Ref(int32(5))},
+			{Name: boolParameterName, Type: "bool", Mutable: true},
+		}
+
 		monotonicIncreasingNumberRichParameters := []codersdk.TemplateVersionParameter{
 			{Name: stringParameterName, Type: "string", Mutable: true},
 			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(10)), ValidationMonotonic: "increasing"},
@@ -232,6 +244,14 @@ func TestRichParameterValidation(t *testing.T) {
 			{numberParameterName, "10", true, numberRichParameters},
 			{numberParameterName, "11", false, numberRichParameters},
 
+			{numberParameterName, "4", false, numberRichParametersMinOnly},
+			{numberParameterName, "5", true, numberRichParametersMinOnly},
+			{numberParameterName, "6", true, numberRichParametersMinOnly},
+
+			{numberParameterName, "4", true, numberRichParametersMaxOnly},
+			{numberParameterName, "5", true, numberRichParametersMaxOnly},
+			{numberParameterName, "6", false, numberRichParametersMaxOnly},
+
 			{numberParameterName, "6", false, monotonicIncreasingNumberRichParameters},
 			{numberParameterName, "7", true, monotonicIncreasingNumberRichParameters},
 			{numberParameterName, "8", true, monotonicIncreasingNumberRichParameters},

diff --git a/go.mod b/go.mod
@@ -75,7 +75,7 @@ require (
 	github.com/codeclysm/extract v2.2.0+incompatible
 	github.com/coder/flog v1.1.0
 	github.com/coder/retry v1.4.0
-	github.com/coder/terraform-provider-coder v0.8.1
+	github.com/coder/terraform-provider-coder v0.8.2
 	github.com/coder/wgtunnel v0.1.5
 	github.com/coreos/go-oidc/v3 v3.6.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf

diff --git a/go.sum b/go.sum
@@ -336,8 +336,8 @@ github.com/coder/ssh v0.0.0-20230421140225-04bb837133e1 h1:LBw76rEDuhNJyohve11mb
 github.com/coder/ssh v0.0.0-20230421140225-04bb837133e1/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
 github.com/coder/tailscale v0.0.0-20230522123520-74712221d00f h1:F0Xr1d8h8dAHn7tab1HXuzYFkcjmCydnEfdMbkOhlVk=
 github.com/coder/tailscale v0.0.0-20230522123520-74712221d00f/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
-github.com/coder/terraform-provider-coder v0.8.1 h1:i/LhvFi+Ei0gL+h4GItJfwtxjcITTlQhS+R8J+0vRo8=
-github.com/coder/terraform-provider-coder v0.8.1/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
+github.com/coder/terraform-provider-coder v0.8.2 h1:EPhkdpsNd8fcg6eqpAQr+W1eRrEAMtugoqujoTK4O6o=
+github.com/coder/terraform-provider-coder v0.8.2/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
 github.com/coder/wgtunnel v0.1.5 h1:WP3sCj/3iJ34eKvpMQEp1oJHvm24RYh0NHbj1kfUKfs=
 github.com/coder/wgtunnel v0.1.5/go.mod h1:bokoUrHnUFY4lu9KOeSYiIcHTI2MO1KwqumU4DPDyJI=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=

diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -483,8 +483,35 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa
 		if len(param.Validation) == 1 {
 			protoParam.ValidationRegex = param.Validation[0].Regex
 			protoParam.ValidationError = param.Validation[0].Error
-			protoParam.ValidationMax = ptrInt32(param.Validation[0].Max)
-			protoParam.ValidationMin = ptrInt32(param.Validation[0].Min)
+
+			validationAttributeValues, ok := resource.AttributeValues["validation"]
+			if ok {
+				validationAttributeValuesArr, ok := validationAttributeValues.([]interface{})
+				if ok {
+					validationAttributeValuesMapStr, ok := validationAttributeValuesArr[0].(map[string]interface{})
+					if ok {
+						// Backward compatibility with terraform-coder-plugin < v0.8.2:
+						// * "min_disabled" and "max_disabled" are not available yet
+						// * "min" and "max" are required to be specified together
+						if _, ok = validationAttributeValuesMapStr["min_disabled"]; !ok {
+							if param.Validation[0].Min != 0 || param.Validation[0].Max != 0 {
+								param.Validation[0].MinDisabled = false
+								param.Validation[0].MaxDisabled = false
+							} else {
+								param.Validation[0].MinDisabled = true
+								param.Validation[0].MaxDisabled = true
+							}
+						}
+					}
+				}
+			}
+
+			if !param.Validation[0].MaxDisabled {
+				protoParam.ValidationMax = PtrInt32(param.Validation[0].Max)
+			}
+			if !param.Validation[0].MinDisabled {
+				protoParam.ValidationMin = PtrInt32(param.Validation[0].Min)
+			}
 			protoParam.ValidationMonotonic = param.Validation[0].Monotonic
 		}
 		if len(param.Option) > 0 {
@@ -527,12 +554,8 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa
 	}, nil
 }
 
-func ptrInt32(number *int) *int32 {
-	var n int32
-	if number == nil {
-		return &n
-	}
-	n = int32(*number)
+func PtrInt32(number int) *int32 {
+	n := int32(number)
 	return &n
 }
 

diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -323,6 +323,83 @@ func TestConvertResources(t *testing.T) {
 				Type:         "string",
 				Description:  "blah blah",
 				DefaultValue: "ok",
+			}, {
+				Name:          "number_example_min_max",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: terraform.PtrInt32(3),
+				ValidationMax: terraform.PtrInt32(6),
+			}, {
+				Name:          "number_example_min_zero",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: terraform.PtrInt32(0),
+				ValidationMax: terraform.PtrInt32(6),
+			}, {
+				Name:          "number_example_max_zero",
+				Type:          "number",
+				DefaultValue:  "-2",
+				ValidationMin: terraform.PtrInt32(-3),
+				ValidationMax: terraform.PtrInt32(0),
+			}, {
+				Name:          "number_example",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: nil,
+				ValidationMax: nil,
+			}},
+		},
+		"rich-parameters-validation": {
+			resources: []*proto.Resource{{
+				Name: "dev",
+				Type: "null_resource",
+				Agents: []*proto.Agent{{
+					Name:                         "dev",
+					OperatingSystem:              "windows",
+					ShutdownScriptTimeoutSeconds: 300,
+					StartupScriptTimeoutSeconds:  300,
+					Architecture:                 "arm64",
+					Auth:                         &proto.Agent_Token{},
+					LoginBeforeReady:             true,
+					ConnectionTimeoutSeconds:     120,
+				}},
+			}},
+			parameters: []*proto.RichParameter{{
+				Name:          "number_example_min_max",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: terraform.PtrInt32(3),
+				ValidationMax: terraform.PtrInt32(6),
+			}, {
+				Name:          "number_example_min",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: terraform.PtrInt32(3),
+				ValidationMax: nil,
+			}, {
+				Name:          "number_example_min_zero",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: terraform.PtrInt32(0),
+				ValidationMax: nil,
+			}, {
+				Name:          "number_example_max",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: nil,
+				ValidationMax: terraform.PtrInt32(6),
+			}, {
+				Name:          "number_example_max_zero",
+				Type:          "number",
+				DefaultValue:  "-3",
+				ValidationMin: nil,
+				ValidationMax: terraform.PtrInt32(0),
+			}, {
+				Name:          "number_example",
+				Type:          "number",
+				DefaultValue:  "4",
+				ValidationMin: nil,
+				ValidationMax: nil,
 			}},
 		},
 		"git-auth-providers": {

diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf
@@ -0,0 +1,69 @@
+terraform {
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = "0.8.2"
+    }
+  }
+}
+
+data "coder_parameter" "number_example_min_max" {
+  name    = "number_example_min_max"
+  type    = "number"
+  default = 4
+  validation {
+    min = 3
+    max = 6
+  }
+}
+
+data "coder_parameter" "number_example_min" {
+  name    = "number_example_min"
+  type    = "number"
+  default = 4
+  validation {
+    min = 3
+  }
+}
+
+data "coder_parameter" "number_example_min_zero" {
+  name    = "number_example_min_zero"
+  type    = "number"
+  default = 4
+  validation {
+    min = 0
+  }
+}
+
+data "coder_parameter" "number_example_max" {
+  name    = "number_example_max"
+  type    = "number"
+  default = 4
+  validation {
+    max = 6
+  }
+}
+
+data "coder_parameter" "number_example_max_zero" {
+  name    = "number_example_max_zero"
+  type    = "number"
+  default = -3
+  validation {
+    max = 0
+  }
+}
+
+data "coder_parameter" "number_example" {
+  name    = "number_example"
+  type    = "number"
+  default = 4
+}
+
+resource "coder_agent" "dev" {
+  os   = "windows"
+  arch = "arm64"
+}
+
+resource "null_resource" "dev" {
+  depends_on = [coder_agent.dev]
+}
diff --git a/...ioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot b/...ioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot