Minor refactorings, corrections

dannykopping · dannykopping · commit 6952dfd14116 · 2024-03-22T16:40:47.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/codersdk/richparameters_test.go b/codersdk/richparameters_test.go
@@ -201,13 +201,13 @@ func TestRichParameterValidation(t *testing.T) {
 
 		monotonicIncreasingNumberRichParameters := []codersdk.TemplateVersionParameter{
 			{Name: stringParameterName, Type: "string", Mutable: true},
-			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: "increasing"},
+			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: codersdk.MonotonicOrderIncreasing},
 			{Name: boolParameterName, Type: "bool", Mutable: true},
 		}
 
 		monotonicDecreasingNumberRichParameters := []codersdk.TemplateVersionParameter{
 			{Name: stringParameterName, Type: "string", Mutable: true},
-			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: "decreasing"},
+			{Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: codersdk.MonotonicOrderDecreasing},
 			{Name: boolParameterName, Type: "bool", Mutable: true},
 		}
 
diff --git a/codersdk/templateversions.go b/codersdk/templateversions.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/coder/terraform-provider-coder/provider"
 	"github.com/google/uuid"
 )
 
@@ -47,8 +48,8 @@ type TemplateVersionExternalAuth struct {
 type ValidationMonotonicOrder string
 
 const (
-	MonotonicOrderIncreasing ValidationMonotonicOrder = "increasing"
-	MonotonicOrderDecreasing ValidationMonotonicOrder = "decreasing"
+	MonotonicOrderIncreasing ValidationMonotonicOrder = provider.ValidationMonotonicIncreasing
+	MonotonicOrderDecreasing ValidationMonotonicOrder = provider.ValidationMonotonicDecreasing
 )
 
 // TemplateVersionParameter represents a parameter for a template version.
diff --git a/docs/templates/parameters.md b/docs/templates/parameters.md
@@ -233,7 +233,7 @@ monotonic numbers, and regular expressions.
 You can limit a `number` parameter to `min` and `max` boundaries.
 
 You can also specify its monotonicity as `increasing` or `decreasing` to verify
-the current and new values. Use the `monotonic` aatribute for resources that
+the current and new values. Use the `monotonic` attribute for resources that
 can't be shrunk or grown without implications, like disk volume size.
 
 ```hcl

Original file line number	Diff line number	Diff line change
`@@ -201,13 +201,13 @@ func TestRichParameterValidation(t *testing.T) {`
`201`	`201`
`202`	`202`	`monotonicIncreasingNumberRichParameters := []codersdk.TemplateVersionParameter{`
`203`	`203`	`{Name: stringParameterName, Type: "string", Mutable: true},`
`204`		`- {Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: "increasing"},`
	`204`	`+ {Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: codersdk.MonotonicOrderIncreasing},`
`205`	`205`	`{Name: boolParameterName, Type: "bool", Mutable: true},`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`monotonicDecreasingNumberRichParameters := []codersdk.TemplateVersionParameter{`
`209`	`209`	`{Name: stringParameterName, Type: "string", Mutable: true},`
`210`		`- {Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: "decreasing"},`
	`210`	`+ {Name: numberParameterName, Type: "number", Mutable: true, ValidationMin: ptr.Ref(int32(3)), ValidationMax: ptr.Ref(int32(100)), ValidationMonotonic: codersdk.MonotonicOrderDecreasing},`
`211`	`211`	`{Name: boolParameterName, Type: "bool", Mutable: true},`
`212`	`212`	`}`
`213`	`213`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"net/http"`
`9`	`9`	`"time"`
`10`	`10`
	`11`	`+ "github.com/coder/terraform-provider-coder/provider"`
`11`	`12`	`"github.com/google/uuid"`
`12`	`13`	`)`
`13`	`14`
`@@ -47,8 +48,8 @@ type TemplateVersionExternalAuth struct {`
`47`	`48`	`type ValidationMonotonicOrder string`
`48`	`49`
`49`	`50`	`const (`
`50`		`- MonotonicOrderIncreasing ValidationMonotonicOrder = "increasing"`
`51`		`- MonotonicOrderDecreasing ValidationMonotonicOrder = "decreasing"`
	`51`	`+ MonotonicOrderIncreasing ValidationMonotonicOrder = provider.ValidationMonotonicIncreasing`
	`52`	`+ MonotonicOrderDecreasing ValidationMonotonicOrder = provider.ValidationMonotonicDecreasing`
`52`	`53`	`)`
`53`	`54`
`54`	`55`	`// TemplateVersionParameter represents a parameter for a template version.`