chore: bad default values should throw errors

Author: Emyrk

cli/clidisplay/resources.go

@@ -77,9 +77,13 @@ func Parameters(writer io.Writer, params []types.Parameter, files map[string]*hc
 		//} else {
 		//	strVal = value.GoString()
 		//}
+		dp := p.DisplayName
+		if p.DisplayName == "" {
+			dp = p.Name
+		}
 
 		tableWriter.AppendRow(table.Row{
-			fmt.Sprintf("(%s) %s: %s\n%s", p.DisplayName, p.Name, p.Description, formatOptions(selections, p.Options)),
+			fmt.Sprintf("(%s) %s: %s\n%s", dp, p.Name, p.Description, formatOptions(selections, p.Options)),
 		})
 
 		if hcl.Diagnostics(p.Diagnostics).HasErrors() {

extract/parameter.go

@@ -173,6 +173,12 @@ func ParameterFromBlock(block *terraform.Block) (*types.Parameter, hcl.Diagnosti
 		}
 	}
 
+	if !diags.HasErrors() {
+		// Only do this validation if the parameter is valid, as if some errors
+		// exist, then this is likely to fail be excess information.
+		diags = diags.Extend(p.Valid())
+	}
+
 	usageDiags := ParameterUsageDiagnostics(p)
 	if usageDiags.HasErrors() {
 		p.FormType = provider.ParameterFormTypeError
@@ -243,7 +249,6 @@ func ParameterValidationFromBlock(block *terraform.Block) (types.ParameterValida
 		Min:       nullableInteger(block, "min"),
 		Max:       nullableInteger(block, "max"),
 		Monotonic: nullableString(block, "monotonic"),
-		Invalid:   nullableBoolean(block, "invalid"),
 	}
 
 	return p, diags

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/aquasecurity/trivy v0.58.2
 	github.com/coder/guts v1.0.2-0.20250227211802-139809366a22
 	github.com/coder/serpent v0.10.0
-	github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0
+	github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0.0.20250414140516-f66adaca2adf
 	github.com/coder/websocket v1.8.13
 	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/google/uuid v1.6.0

go.sum

@@ -718,8 +718,8 @@ github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx
 github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc=
 github.com/coder/serpent v0.10.0 h1:ofVk9FJXSek+SmL3yVE3GoArP83M+1tX+H7S4t8BSuM=
 github.com/coder/serpent v0.10.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
-github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0 h1:NPt2+FVr+2QJoxrta5ZwyTaxocWMEKdh2WpIumffxfM=
-github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
+github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0.0.20250414140516-f66adaca2adf h1:h0ZMBLv/NiHeMWANSiUKHZkuxti4zIWCGXAXYF0tuJQ=
+github.com/coder/terraform-provider-coder/v2 v2.4.0-pre0.0.20250414140516-f66adaca2adf/go.mod h1:X28s3rz+aEM5PkBKvk3xcUrQFO2eNPjzRChUg9wb70U=
 github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
 github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=

types/convert.go

@@ -0,0 +1,73 @@
+package types
+
+import (
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
+	"github.com/coder/terraform-provider-coder/v2/provider"
+)
+
+func providerValidations(vals []*ParameterValidation) []provider.Validation {
+	cpy := make([]provider.Validation, 0, len(vals))
+	for _, val := range vals {
+		cpy = append(cpy, providerValidation(val))
+	}
+	return cpy
+}
+
+func providerValidation(v *ParameterValidation) provider.Validation {
+	return provider.Validation{
+		Min:         int(orZero(v.Min)),
+		MinDisabled: v.Min == nil,
+		Max:         int(orZero(v.Max)),
+		MaxDisabled: v.Max == nil,
+		Monotonic:   orZero(v.Monotonic),
+		Regex:       orZero(v.Regex),
+		Error:       v.Error,
+	}
+}
+
+func providerOptions(opts []*ParameterOption) []provider.Option {
+	cpy := make([]provider.Option, 0, len(opts))
+	for _, opt := range opts {
+		cpy = append(cpy, providerOption(opt))
+	}
+	return cpy
+}
+
+func providerOption(opt *ParameterOption) provider.Option {
+	return provider.Option{
+		Name:        opt.Name,
+		Description: opt.Description,
+		Value:       opt.Value.AsString(),
+		Icon:        opt.Icon,
+	}
+}
+
+func hclDiagnostics(diagnostics diag.Diagnostics) hcl.Diagnostics {
+	cpy := make(hcl.Diagnostics, 0, len(diagnostics))
+	for _, d := range diagnostics {
+		cpy = append(cpy, hclDiagnostic(d))
+	}
+	return cpy
+}
+
+func hclDiagnostic(d diag.Diagnostic) *hcl.Diagnostic {
+	sev := hcl.DiagInvalid
+	switch d.Severity {
+	case diag.Error:
+		sev = hcl.DiagError
+	case diag.Warning:
+		sev = hcl.DiagWarning
+	}
+	return &hcl.Diagnostic{
+		Severity:    sev,
+		Summary:     d.Summary,
+		Detail:      d.Detail,
+		Subject:     nil,
+		Context:     nil,
+		Expression:  nil,
+		EvalContext: nil,
+		Extra:       nil,
+	}
+}

types/enum.go

@@ -3,9 +3,12 @@ package types
 import (
 	"fmt"
 	"strings"
+
+	"github.com/coder/terraform-provider-coder/v2/provider"
 )
 
-type ParameterType string
+// TODO: Just use the provider type directly.
+type ParameterType provider.OptionType
 
 const (
 	ParameterTypeString     ParameterType = "string"

types/parameter.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/aquasecurity/trivy/pkg/iac/terraform"
+	"github.com/hashicorp/hcl/v2"
 	"github.com/zclconf/go-cty/cty"
 
 	"github.com/coder/terraform-provider-coder/v2/provider"
@@ -73,24 +74,16 @@ type ParameterValidation struct {
 	Min       *int64  `json:"validation_min"`
 	Max       *int64  `json:"validation_max"`
 	Monotonic *string `json:"validation_monotonic"`
-	Invalid   *bool   `json:"validation_invalid"`
 }
 
 // Valid takes the type of the value and the value itself and returns an error
 // if the value is invalid.
-func (v ParameterValidation) Valid(typ string, value string) error {
+func (v *ParameterValidation) Valid(typ string, value string) error {
 	// TODO: Validate typ is the enum?
 	// Use the provider.Validation struct to validate the value to be
 	// consistent with the provider.
-	return (&provider.Validation{
-		Min:         int(orZero(v.Min)),
-		MinDisabled: v.Min == nil,
-		Max:         int(orZero(v.Max)),
-		MaxDisabled: v.Max == nil,
-		Monotonic:   orZero(v.Monotonic),
-		Regex:       orZero(v.Regex),
-		Error:       v.Error,
-	}).Valid(provider.OptionType(typ), value)
+	pv := providerValidation(v)
+	return (&pv).Valid(provider.OptionType(typ), value)
 }
 
 type ParameterOption struct {
@@ -100,6 +93,31 @@ type ParameterOption struct {
 	Icon        string    `json:"icon"`
 }
 
+func (r *ParameterData) Valid() hcl.Diagnostics {
+	diag := (&provider.Parameter{
+		Name:        r.Name,
+		DisplayName: r.DisplayName,
+		Description: r.Description,
+		Type:        provider.OptionType(r.Type),
+		FormType:    r.FormType,
+		Mutable:     r.Mutable,
+		Default:     r.DefaultValue.AsString(),
+		Icon:        r.Icon,
+		Option:      providerOptions(r.Options),
+		Validation:  providerValidations(r.Validations),
+		Optional:    false,
+		Order:       int(r.Order),
+		Ephemeral:   r.Ephemeral,
+	}).Valid()
+
+	if diag.HasError() {
+		// TODO: We can take the attr path and decorate the error with
+		//   source information.
+		return hclDiagnostics(diag)
+	}
+	return nil
+}
+
 // CtyType returns the cty.Type for the ParameterData.
 // A fixed set of types are supported.
 func (r *ParameterData) CtyType() (cty.Type, error) {